Skip to content

Commit 48c0e41

Browse files
Doha2012pivovarit
Doha2012
authored and
pivovarit
committed
fix commons-logging issue (eugenp#1714)
* 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 * minor fix * minor fix * minor fix * cleanup generated files * fix commons-logging issue
1 parent c4d9be1 commit 48c0e41

8 files changed

Lines changed: 9 additions & 63 deletions

File tree

‎cdi/pom.xml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,7 @@
1111
<dependency>
1212
<groupId>org.springframework</groupId>
1313
<artifactId>spring-core</artifactId>
14-
<version>${spring.version}</version>
15-
<exclusions>
16-
<exclusion>
17-
<artifactId>commons-logging</artifactId>
18-
<groupId>commons-logging</groupId>
19-
</exclusion>
20-
</exclusions>
14+
<version>${spring.version}</version>
2115
</dependency>
2216
<dependency>
2317
<groupId>org.springframework</groupId>

‎mapstruct/pom.xml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,7 @@
3131
<dependency>
3232
<groupId>org.springframework</groupId>
3333
<artifactId>spring-context</artifactId>
34-
<version>${springframework.version}</version>
35-
<exclusions>
36-
<exclusion>
37-
<artifactId>commons-logging</artifactId>
38-
<groupId>commons-logging</groupId>
39-
</exclusion>
40-
</exclusions>
34+
<version>${springframework.version}</version>
4135
</dependency>
4236
<dependency>
4337
<groupId>org.springframework</groupId>

‎rest-assured/pom.xml‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -144,13 +144,7 @@
144144
<dependency>
145145
<groupId>org.apache.httpcomponents</groupId>
146146
<artifactId>httpclient</artifactId>
147-
<version>${httpclient.version}</version>
148-
<exclusions>
149-
<exclusion>
150-
<artifactId>commons-logging</artifactId>
151-
<groupId>commons-logging</groupId>
152-
</exclusion>
153-
</exclusions>
147+
<version>${httpclient.version}</version>
154148
</dependency>
155149

156150
<dependency>
@@ -183,13 +177,7 @@
183177
<dependency>
184178
<groupId>com.github.fge</groupId>
185179
<artifactId>json-schema-core</artifactId>
186-
<version>${json-schema-core.version}</version>
187-
<exclusions>
188-
<exclusion>
189-
<artifactId>commons-logging</artifactId>
190-
<groupId>commons-logging</groupId>
191-
</exclusion>
192-
</exclusions>
180+
<version>${json-schema-core.version}</version>
193181
</dependency>
194182
<dependency>
195183
<groupId>junit</groupId>

‎spring-akka/pom.xml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,7 @@
1111

1212
<dependency>
1313
<groupId>org.springframework</groupId>
14-
<artifactId>spring-context</artifactId>
15-
<exclusions>
16-
<exclusion>
17-
<artifactId>commons-logging</artifactId>
18-
<groupId>commons-logging</groupId>
19-
</exclusion>
20-
</exclusions>
14+
<artifactId>spring-context</artifactId>
2115
</dependency>
2216

2317
<dependency>

‎spring-hibernate3/pom.xml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,7 @@
1313
<dependency>
1414
<groupId>org.springframework</groupId>
1515
<artifactId>spring-context</artifactId>
16-
<version>${org.springframework.version}</version>
17-
<exclusions>
18-
<exclusion>
19-
<artifactId>commons-logging</artifactId>
20-
<groupId>commons-logging</groupId>
21-
</exclusion>
22-
</exclusions>
16+
<version>${org.springframework.version}</version>
2317
</dependency>
2418

2519
<!-- persistence -->

‎spring-integration/pom.xml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,7 @@
9595
<dependency>
9696
<groupId>org.springframework.integration</groupId>
9797
<artifactId>spring-integration-core</artifactId>
98-
<version>${spring.integration.version}</version>
99-
<exclusions>
100-
<exclusion>
101-
<artifactId>commons-logging</artifactId>
102-
<groupId>commons-logging</groupId>
103-
</exclusion>
104-
</exclusions>
98+
<version>${spring.integration.version}</version>
10599
</dependency>
106100
<dependency>
107101
<groupId>javax.activation</groupId>

‎spring-mvc-velocity/pom.xml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,7 @@
2525
<dependency>
2626
<groupId>org.springframework</groupId>
2727
<artifactId>spring-core</artifactId>
28-
<version>${org.springframework.version}</version>
29-
<exclusions>
30-
<exclusion>
31-
<artifactId>commons-logging</artifactId>
32-
<groupId>commons-logging</groupId>
33-
</exclusion>
34-
</exclusions>
28+
<version>${org.springframework.version}</version>
3529
</dependency>
3630
<dependency>
3731
<groupId>org.springframework</groupId>

‎spring-spel/pom.xml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,7 @@
3030
<dependency>
3131
<groupId>org.springframework</groupId>
3232
<artifactId>spring-context</artifactId>
33-
<version>${springframework.version}</version>
34-
<exclusions>
35-
<exclusion>
36-
<artifactId>commons-logging</artifactId>
37-
<groupId>commons-logging</groupId>
38-
</exclusion>
39-
</exclusions>
33+
<version>${springframework.version}</version>
4034
</dependency>
4135
<dependency>
4236
<groupId>org.springframework</groupId>

0 commit comments

Comments
 (0)