Skip to content

Commit 2d1379a

Browse files
Doha2012pivovarit
authored andcommitted
fix dependency issues (eugenp#1691)
* upgrade to spring boot 1.5.2 * add full update to REST API * modify ratings controller * upgrade herold * fix integration test * fix integration test * minor fix * fix integration test * fix integration test * minor cleanup * minor cleanup * remove log4j properties * use standard logbook.xml * remove log4j dependencies * remove commons-logging * merge * fix conflict * exclude commons-logging dependency * cleanup * minor fix * minor fix * fix dependency issues * Revert "fix dependency issues" This reverts commit 83bf1f9. * fix dependency issues
1 parent bc6bcc3 commit 2d1379a

File tree

3 files changed

+3
-21
lines changed

3 files changed

+3
-21
lines changed

libraries/pom.xml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -136,13 +136,7 @@
136136
<dependency>
137137
<groupId>org.apache.httpcomponents</groupId>
138138
<artifactId>httpclient</artifactId>
139-
<version>${httpclient.version}</version>
140-
<exclusions>
141-
<exclusion>
142-
<artifactId>commons-logging</artifactId>
143-
<groupId>commons-logging</groupId>
144-
</exclusion>
145-
</exclusions>
139+
<version>${httpclient.version}</version>
146140
</dependency>
147141
<dependency>
148142
<groupId>commons-io</groupId>

log4j2/pom.xml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,7 @@
4343
<dependency>
4444
<groupId>org.apache.commons</groupId>
4545
<artifactId>commons-dbcp2</artifactId>
46-
<version>${commons-dbcp2.version}</version>
47-
<exclusions>
48-
<exclusion>
49-
<artifactId>commons-logging</artifactId>
50-
<groupId>commons-logging</groupId>
51-
</exclusion>
52-
</exclusions>
46+
<version>${commons-dbcp2.version}</version>
5347
</dependency>
5448

5549
<!-- This is used for testing only. -->

spring-state-machine/pom.xml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,7 @@
2424
<dependency>
2525
<groupId>org.springframework</groupId>
2626
<artifactId>spring-test</artifactId>
27-
<version>4.3.7.RELEASE</version>
28-
<exclusions>
29-
<exclusion>
30-
<artifactId>commons-logging</artifactId>
31-
<groupId>commons-logging</groupId>
32-
</exclusion>
33-
</exclusions>
27+
<version>4.3.7.RELEASE</version>
3428
</dependency>
3529
<dependency>
3630
<groupId>junit</groupId>

0 commit comments

Comments
 (0)