Skip to content

Commit 5e1e320

Browse files
Doha2012pivovarit
Doha2012
authored and
pivovarit
committed
exclude commons-logging dependency (eugenp#1686)
* 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
1 parent 699cf9d commit 5e1e320

File tree

69 files changed

+499
-17
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+499
-17
lines changed

‎apache-cxf/cxf-jaxrs-implementation/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,12 @@
5454
<groupId>org.apache.httpcomponents</groupId>
5555
<artifactId>httpclient</artifactId>
5656
<version>${httpclient.version}</version>
57+
<exclusions>
58+
<exclusion>
59+
<artifactId>commons-logging</artifactId>
60+
<groupId>commons-logging</groupId>
61+
</exclusion>
62+
</exclusions>
5763
</dependency>
5864
</dependencies>
5965
</project>

‎apache-cxf/cxf-spring/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@
2424
<groupId>org.springframework</groupId>
2525
<artifactId>spring-context</artifactId>
2626
<version>${spring.version}</version>
27+
<exclusions>
28+
<exclusion>
29+
<artifactId>commons-logging</artifactId>
30+
<groupId>commons-logging</groupId>
31+
</exclusion>
32+
</exclusions>
2733
</dependency>
2834
<dependency>
2935
<groupId>org.springframework</groupId>

‎apache-fop/pom.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@
7373
<groupId>org.apache.avalon.framework</groupId>
7474
<artifactId>avalon-framework-impl</artifactId>
7575
</exclusion>
76+
<exclusion>
77+
<artifactId>commons-logging</artifactId>
78+
<groupId>commons-logging</groupId>
79+
</exclusion>
7680
</exclusions>
7781
</dependency>
7882

@@ -85,6 +89,12 @@
8589
<groupId>avalon-framework</groupId>
8690
<artifactId>avalon-framework-impl</artifactId>
8791
<version>${avalon-framework.version}</version>
92+
<exclusions>
93+
<exclusion>
94+
<artifactId>commons-logging</artifactId>
95+
<groupId>commons-logging</groupId>
96+
</exclusion>
97+
</exclusions>
8898
</dependency>
8999

90100
<dependency>

‎apache-poi/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,12 @@
4242
<groupId>org.jxls</groupId>
4343
<artifactId>jxls-jexcel</artifactId>
4444
<version>${jexcel.version}</version>
45+
<exclusions>
46+
<exclusion>
47+
<artifactId>commons-logging</artifactId>
48+
<groupId>commons-logging</groupId>
49+
</exclusion>
50+
</exclusions>
4551
</dependency>
4652
</dependencies>
4753
</project>

‎apache-thrift/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@
1919
<groupId>org.apache.thrift</groupId>
2020
<artifactId>libthrift</artifactId>
2121
<version>${thrift.version}</version>
22+
<exclusions>
23+
<exclusion>
24+
<artifactId>commons-logging</artifactId>
25+
<groupId>commons-logging</groupId>
26+
</exclusion>
27+
</exclusions>
2228
</dependency>
2329

2430
<dependency>

‎apache-velocity/pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<dependency>
3939
<groupId>org.apache.velocity</groupId>
4040
<artifactId>velocity-tools</artifactId>
41-
<version>${velocity-tools-version}</version>
41+
<version>${velocity-tools-version}</version>
4242
</dependency>
4343
<dependency>
4444
<groupId>org.slf4j</groupId>
@@ -55,6 +55,12 @@
5555
<artifactId>httpclient</artifactId>
5656
<version>${org.apache.httpcomponents.version}</version>
5757
<scope>test</scope>
58+
<exclusions>
59+
<exclusion>
60+
<artifactId>commons-logging</artifactId>
61+
<groupId>commons-logging</groupId>
62+
</exclusion>
63+
</exclusions>
5864
</dependency>
5965
</dependencies>
6066
<build>

‎aspectj/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<dependency>
5959
<groupId>org.springframework</groupId>
6060
<artifactId>spring-core</artifactId>
61-
<version>4.3.4.RELEASE</version>
61+
<version>4.3.4.RELEASE</version>
6262
</dependency>
6363
<dependency>
6464
<groupId>cglib</groupId>

‎aws/pom.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,24 @@
1919
<groupId>com.amazonaws</groupId>
2020
<artifactId>aws-lambda-java-core</artifactId>
2121
<version>${aws-lambda-java-core.version}</version>
22+
<exclusions>
23+
<exclusion>
24+
<artifactId>commons-logging</artifactId>
25+
<groupId>commons-logging</groupId>
26+
</exclusion>
27+
</exclusions>
2228
</dependency>
2329

2430
<dependency>
2531
<groupId>com.amazonaws</groupId>
2632
<artifactId>aws-lambda-java-events</artifactId>
2733
<version>${aws-lambda-java-events.version}</version>
34+
<exclusions>
35+
<exclusion>
36+
<artifactId>commons-logging</artifactId>
37+
<groupId>commons-logging</groupId>
38+
</exclusion>
39+
</exclusions>
2840
</dependency>
2941

3042
<dependency>

‎cdi/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@
1212
<groupId>org.springframework</groupId>
1313
<artifactId>spring-core</artifactId>
1414
<version>${spring.version}</version>
15+
<exclusions>
16+
<exclusion>
17+
<artifactId>commons-logging</artifactId>
18+
<groupId>commons-logging</groupId>
19+
</exclusion>
20+
</exclusions>
1521
</dependency>
1622
<dependency>
1723
<groupId>org.springframework</groupId>

‎core-java/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,12 @@
171171
<groupId>org.owasp.esapi</groupId>
172172
<artifactId>esapi</artifactId>
173173
<version>2.1.0.1</version>
174+
<exclusions>
175+
<exclusion>
176+
<artifactId>commons-logging</artifactId>
177+
<groupId>commons-logging</groupId>
178+
</exclusion>
179+
</exclusions>
174180
</dependency>
175181

176182
</dependencies>

‎couchbase-sdk/pom.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,23 @@
2222
<groupId>org.springframework</groupId>
2323
<artifactId>spring-context</artifactId>
2424
<version>${spring-framework.version}</version>
25+
<exclusions>
26+
<exclusion>
27+
<artifactId>commons-logging</artifactId>
28+
<groupId>commons-logging</groupId>
29+
</exclusion>
30+
</exclusions>
2531
</dependency>
2632
<dependency>
2733
<groupId>org.springframework</groupId>
2834
<artifactId>spring-context-support</artifactId>
2935
<version>${spring-framework.version}</version>
36+
<exclusions>
37+
<exclusion>
38+
<artifactId>commons-logging</artifactId>
39+
<groupId>commons-logging</groupId>
40+
</exclusion>
41+
</exclusions>
3042
</dependency>
3143

3244
<!-- Logging with SLF4J & LogBack -->

‎hbase/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@
2828
<groupId>org.apache.hbase</groupId>
2929
<artifactId>hbase-client</artifactId>
3030
<version>${hbase.version}</version>
31+
<exclusions>
32+
<exclusion>
33+
<artifactId>commons-logging</artifactId>
34+
<groupId>commons-logging</groupId>
35+
</exclusion>
36+
</exclusions>
3137
</dependency>
3238
<dependency>
3339
<groupId>org.apache.hbase</groupId>

‎httpclient/pom.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,12 @@
4141
<groupId>org.apache.httpcomponents</groupId>
4242
<artifactId>fluent-hc</artifactId>
4343
<version>${httpclient.version}</version>
44+
<exclusions>
45+
<exclusion>
46+
<artifactId>commons-logging</artifactId>
47+
<groupId>commons-logging</groupId>
48+
</exclusion>
49+
</exclusions>
4450
</dependency>
4551

4652
<dependency>
@@ -59,6 +65,12 @@
5965
<groupId>org.apache.httpcomponents</groupId>
6066
<artifactId>httpasyncclient</artifactId>
6167
<version>${httpasyncclient.version}</version> <!-- 4.0.2 --> <!-- 4.1-beta1 -->
68+
<exclusions>
69+
<exclusion>
70+
<artifactId>commons-logging</artifactId>
71+
<groupId>commons-logging</groupId>
72+
</exclusion>
73+
</exclusions>
6274
</dependency>
6375

6476
<!-- logging -->

‎hystrix/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,12 @@
5656
<groupId>com.netflix.hystrix</groupId>
5757
<artifactId>hystrix-core</artifactId>
5858
<version>${hystrix-core.version}</version>
59+
<exclusions>
60+
<exclusion>
61+
<artifactId>commons-logging</artifactId>
62+
<groupId>commons-logging</groupId>
63+
</exclusion>
64+
</exclusions>
5965
</dependency>
6066
<dependency>
6167
<groupId>com.netflix.hystrix</groupId>

‎image-processing/pom.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,23 @@
1717
<groupId>net.imagej</groupId>
1818
<artifactId>ij</artifactId>
1919
<version>${ij.version}</version>
20+
<exclusions>
21+
<exclusion>
22+
<artifactId>commons-logging</artifactId>
23+
<groupId>commons-logging</groupId>
24+
</exclusion>
25+
</exclusions>
2026
</dependency>
2127
<dependency>
2228
<groupId>org.openimaj</groupId>
2329
<artifactId>core-image</artifactId>
2430
<version>${core-image.version}</version>
31+
<exclusions>
32+
<exclusion>
33+
<artifactId>commons-logging</artifactId>
34+
<groupId>commons-logging</groupId>
35+
</exclusion>
36+
</exclusions>
2537
</dependency>
2638
</dependencies>
2739

‎javax-servlets/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,12 @@
4949
<artifactId>httpclient</artifactId>
5050
<version>${org.apache.httpcomponents.version}</version>
5151
<scope>test</scope>
52+
<exclusions>
53+
<exclusion>
54+
<artifactId>commons-logging</artifactId>
55+
<groupId>commons-logging</groupId>
56+
</exclusion>
57+
</exclusions>
5258
</dependency>
5359

5460
</dependencies>

‎jsf/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,12 @@
6565
<groupId>org.springframework</groupId>
6666
<artifactId>spring-web</artifactId>
6767
<version>${org.springframework.version}</version>
68+
<exclusions>
69+
<exclusion>
70+
<artifactId>commons-logging</artifactId>
71+
<groupId>commons-logging</groupId>
72+
</exclusion>
73+
</exclusions>
6874
</dependency>
6975
<dependency>
7076
<groupId>javax.servlet</groupId>

‎json/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
<groupId>org.everit.json</groupId>
1212
<artifactId>org.everit.json.schema</artifactId>
1313
<version>${everit.json.schema.version}</version>
14+
<exclusions>
15+
<exclusion>
16+
<artifactId>commons-logging</artifactId>
17+
<groupId>commons-logging</groupId>
18+
</exclusion>
19+
</exclusions>
1420
</dependency>
1521

1622
<dependency>

‎libraries/pom.xml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,12 @@
111111
<groupId>org.apache.httpcomponents</groupId>
112112
<artifactId>httpclient</artifactId>
113113
<version>${httpclient.version}</version>
114+
<exclusions>
115+
<exclusion>
116+
<artifactId>commons-logging</artifactId>
117+
<groupId>commons-logging</groupId>
118+
</exclusion>
119+
</exclusions>
114120
</dependency>
115121
<dependency>
116122
<groupId>commons-io</groupId>
@@ -131,6 +137,12 @@
131137
<groupId>org.apache.httpcomponents</groupId>
132138
<artifactId>httpclient</artifactId>
133139
<version>${httpclient.version}</version>
140+
<exclusions>
141+
<exclusion>
142+
<artifactId>commons-logging</artifactId>
143+
<groupId>commons-logging</groupId>
144+
</exclusion>
145+
</exclusions>
134146
</dependency>
135147
<dependency>
136148
<groupId>commons-io</groupId>
@@ -141,11 +153,23 @@
141153
<groupId>org.apache.flink</groupId>
142154
<artifactId>flink-core</artifactId>
143155
<version>${flink.version}</version>
156+
<exclusions>
157+
<exclusion>
158+
<artifactId>commons-logging</artifactId>
159+
<groupId>commons-logging</groupId>
160+
</exclusion>
161+
</exclusions>
144162
</dependency>
145163
<dependency>
146164
<groupId>org.apache.flink</groupId>
147165
<artifactId>flink-java</artifactId>
148166
<version>${flink.version}</version>
167+
<exclusions>
168+
<exclusion>
169+
<artifactId>commons-logging</artifactId>
170+
<groupId>commons-logging</groupId>
171+
</exclusion>
172+
</exclusions>
149173
</dependency>
150174
<dependency>
151175
<groupId>org.apache.flink</groupId>

‎log-mdc/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<dependency>
1414
<groupId>org.springframework</groupId>
1515
<artifactId>spring-core</artifactId>
16-
<version>${springframework.version}</version>
16+
<version>${springframework.version}</version>
1717
</dependency>
1818
<dependency>
1919
<groupId>org.springframework</groupId>

‎log4j2/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@
4444
<groupId>org.apache.commons</groupId>
4545
<artifactId>commons-dbcp2</artifactId>
4646
<version>${commons-dbcp2.version}</version>
47+
<exclusions>
48+
<exclusion>
49+
<artifactId>commons-logging</artifactId>
50+
<groupId>commons-logging</groupId>
51+
</exclusion>
52+
</exclusions>
4753
</dependency>
4854

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

‎mapstruct/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@
3232
<groupId>org.springframework</groupId>
3333
<artifactId>spring-context</artifactId>
3434
<version>${springframework.version}</version>
35+
<exclusions>
36+
<exclusion>
37+
<artifactId>commons-logging</artifactId>
38+
<groupId>commons-logging</groupId>
39+
</exclusion>
40+
</exclusions>
3541
</dependency>
3642
<dependency>
3743
<groupId>org.springframework</groupId>

0 commit comments

Comments
 (0)