Skip to content

Commit 8c654a3

Browse files
gregturngregturn
committed
SWS-1030 - Fixes version conflicts
Uses maven-enforcer-plugin with the dependencyConvergence rule to identify library conflicts and resolves them, for both Java 8 and Java 10.
1 parent 8b0ff1c commit 8c654a3

File tree

7 files changed

+264
-33
lines changed

7 files changed

+264
-33
lines changed

‎circle.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
- checkout
88
- run:
99
name: Java 8 - Test current version
10-
command: ./mvnw -Pdistribute,snapshot,docs clean test
10+
command: ./mvnw -Pdistribute,snapshot,docs,convergence clean test
1111

1212
java_8_test_spring_next:
1313
docker:
@@ -16,7 +16,7 @@ jobs:
1616
- checkout
1717
- run:
1818
name: Java 8 - Test Spring.NEXT
19-
command: ./mvnw -Pspringnext clean test
19+
command: ./mvnw -Pspringnext,convergence clean test
2020

2121
java_8_test_spring_buildsnapshot:
2222
docker:
@@ -25,7 +25,7 @@ jobs:
2525
- checkout
2626
- run:
2727
name: Java 8 - Test Spring.NEXT
28-
command: ./mvnw -Pspring-buildsnapshot clean test
28+
command: ./mvnw -Pspring-buildsnapshot,convergence clean test
2929

3030
java_10_test_current:
3131
docker:
@@ -34,7 +34,7 @@ jobs:
3434
- checkout
3535
- run:
3636
name: Java 10 - Test current version
37-
command: ./mvnw -Pdistribute,snapshot,docs,java10 clean test
37+
command: ./mvnw -Pdistribute,snapshot,docs,java10,convergence clean test
3838

3939
java_10_test_spring_next:
4040
docker:
@@ -43,7 +43,7 @@ jobs:
4343
- checkout
4444
- run:
4545
name: Java 10 - Test Spring.NEXT
46-
command: ./mvnw -Pspringnext,java10 clean test
46+
command: ./mvnw -Pspringnext,java10,convergence clean test
4747

4848
java_10_test_spring_buildsnapshot:
4949
docker:
@@ -52,7 +52,7 @@ jobs:
5252
- checkout
5353
- run:
5454
name: Java 10 - Test Spring.NEXT
55-
command: ./mvnw -Pspring-buildsnapshot,java10 clean test
55+
command: ./mvnw -Pspring-buildsnapshot,java10,convergence clean test
5656

5757
deploy:
5858
docker:

‎pom.xml‎

Lines changed: 114 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<packaging>pom</packaging>
1010

1111
<name>Spring Web Services</name>
12-
<url>http://project.spring.io/spring-ws</url>
12+
<url>http://spring.io/projects/spring-ws</url>
1313
<description>Spring-based Web Services support</description>
1414

1515
<developers>
@@ -104,21 +104,46 @@
104104
<junit.version>4.12</junit.version>
105105
<log4j.version>1.2.17</log4j.version>
106106
<log4j2.version>2.11.0</log4j2.version>
107+
<mail.version>1.4.7</mail.version>
107108
<mock-javamail.version>1.9</mock-javamail.version>
108109
<saaj-impl.version>1.3.28</saaj-impl.version>
110+
<slf4j.version>1.7.25</slf4j.version>
109111
<smack.version>4.2.1</smack.version>
110-
<spring.version>5.0.7.RELEASE</spring.version>
111-
<spring-security.version>5.0.6.RELEASE</spring-security.version>
112+
<soap-api.version>1.4.0</soap-api.version>
113+
<spring.version>5.0.8.RELEASE</spring.version>
114+
<spring-security.version>5.0.7.RELEASE</spring-security.version>
115+
<stax.version>1.7.8</stax.version>
112116
<sun-mail.version>1.6.0</sun-mail.version>
113117
<woodstox.version>4.2.0</woodstox.version>
114118
<wsdl4j.version>1.6.3</wsdl4j.version>
115119
<wss4j.version>2.2.0</wss4j.version>
120+
<xmlsec.version>2.1.0</xmlsec.version>
116121
<xml-schema-core.version>2.2.2</xml-schema-core.version>
117122
<xmlunit.version>1.5</xmlunit.version>
118123
<xws-security.version>3.0</xws-security.version>
119124
<xom.version>1.2.5</xom.version>
120125
</properties>
121126

127+
<dependencyManagement>
128+
<dependencies>
129+
<dependency>
130+
<groupId>org.springframework</groupId>
131+
<artifactId>spring-framework-bom</artifactId>
132+
<version>${spring.version}</version>
133+
<type>pom</type>
134+
<scope>import</scope>
135+
</dependency>
136+
137+
<dependency>
138+
<groupId>org.springframework.security</groupId>
139+
<artifactId>spring-security-bom</artifactId>
140+
<version>${spring-security.version}</version>
141+
<type>pom</type>
142+
<scope>import</scope>
143+
</dependency>
144+
</dependencies>
145+
</dependencyManagement>
146+
122147
<dependencies>
123148

124149
<dependency>
@@ -129,7 +154,6 @@
129154
<dependency>
130155
<groupId>org.springframework</groupId>
131156
<artifactId>spring-core</artifactId>
132-
<version>${spring.version}</version>
133157
</dependency>
134158

135159
<dependency>
@@ -184,9 +208,9 @@
184208
<profile>
185209
<id>spring-buildsnapshot</id>
186210
<properties>
187-
<aspectj.version>1.9.0.RC2</aspectj.version>
188-
<spring.version>5.0.8.BUILD-SNAPSHOT</spring.version>
189-
<spring-security.version>5.0.7.BUILD-SNAPSHOT</spring-security.version>
211+
<aspectj.version>1.9.1</aspectj.version>
212+
<spring.version>5.0.9.BUILD-SNAPSHOT</spring.version>
213+
<spring-security.version>5.0.8.BUILD-SNAPSHOT</spring-security.version>
190214
</properties>
191215
<repositories>
192216
<repository>
@@ -219,9 +243,9 @@
219243
<profile>
220244
<id>springnext</id>
221245
<properties>
222-
<aspectj.version>1.9.0.RC2</aspectj.version>
223-
<spring.version>5.1.0.BUILD-SNAPSHOT</spring.version>
224-
<spring-security.version>5.0.7.BUILD-SNAPSHOT</spring-security.version>
246+
<aspectj.version>1.9.1</aspectj.version>
247+
<spring.version>5.1.0.RC1</spring.version>
248+
<spring-security.version>5.1.0.M2</spring-security.version>
225249
</properties>
226250
<repositories>
227251
<repository>
@@ -251,6 +275,41 @@
251275
</repositories>
252276
</profile>
253277

278+
<profile>
279+
<id>convergence</id>
280+
281+
<build>
282+
<plugins>
283+
<plugin>
284+
<groupId>org.apache.maven.plugins</groupId>
285+
<artifactId>maven-enforcer-plugin</artifactId>
286+
<version>3.0.0-M2</version>
287+
<executions>
288+
<execution>
289+
<id>default-cli</id>
290+
<goals>
291+
<goal>enforce</goal>
292+
</goals>
293+
<phase>validate</phase>
294+
<configuration>
295+
<rules>
296+
<bannedDependencies>
297+
<excludes>
298+
<exclude>commons-logging:*:*</exclude>
299+
</excludes>
300+
<searchTransitive>true</searchTransitive>
301+
</bannedDependencies>
302+
<dependencyConvergence />
303+
</rules>
304+
<fail>true</fail>
305+
</configuration>
306+
</execution>
307+
</executions>
308+
</plugin>
309+
</plugins>
310+
</build>
311+
</profile>
312+
254313

255314
<profile>
256315
<id>distribute</id>
@@ -602,7 +661,52 @@
602661
<artifactId>jaxws-ri</artifactId>
603662
<version>2.3.0</version>
604663
<type>pom</type>
664+
<exclusions>
665+
<exclusion>
666+
<groupId>org.codehaus.woodstox</groupId>
667+
<artifactId>woodstox-core-asl</artifactId>
668+
</exclusion>
669+
<exclusion>
670+
<groupId>org.jvnet.staxex</groupId>
671+
<artifactId>stax-ex</artifactId>
672+
</exclusion>
673+
<exclusion>
674+
<groupId>com.sun.xml.messaging.saaj</groupId>
675+
<artifactId>saaj-impl</artifactId>
676+
</exclusion>
677+
</exclusions>
678+
</dependency>
679+
680+
<dependency>
681+
<groupId>org.jvnet.staxex</groupId>
682+
<artifactId>stax-ex</artifactId>
683+
<version>${stax.version}</version>
684+
</dependency>
685+
686+
<dependency>
687+
<groupId>com.sun.xml.messaging.saaj</groupId>
688+
<artifactId>saaj-impl</artifactId>
689+
<version>${saaj-impl.version}</version>
690+
<exclusions>
691+
<exclusion>
692+
<groupId>javax.xml.soap</groupId>
693+
<artifactId>javax.xml.soap-api</artifactId>
694+
</exclusion>
695+
</exclusions>
605696
</dependency>
697+
698+
<dependency>
699+
<groupId>javax.xml.soap</groupId>
700+
<artifactId>javax.xml.soap-api</artifactId>
701+
<version>${soap-api.version}</version>
702+
</dependency>
703+
704+
<dependency>
705+
<groupId>javax.xml.ws</groupId>
706+
<artifactId>jaxws-api</artifactId>
707+
<version>2.3.0</version>
708+
</dependency>
709+
606710
</dependencies>
607711
</profile>
608712

‎spring-ws-core/pom.xml‎

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,32 +26,26 @@
2626
<dependency>
2727
<groupId>org.springframework</groupId>
2828
<artifactId>spring-aop</artifactId>
29-
<version>${spring.version}</version>
3029
</dependency>
3130
<dependency>
3231
<groupId>org.springframework</groupId>
3332
<artifactId>spring-beans</artifactId>
34-
<version>${spring.version}</version>
3533
</dependency>
3634
<dependency>
3735
<groupId>org.springframework</groupId>
3836
<artifactId>spring-oxm</artifactId>
39-
<version>${spring.version}</version>
4037
</dependency>
4138
<dependency>
4239
<groupId>org.springframework</groupId>
4340
<artifactId>spring-web</artifactId>
44-
<version>${spring.version}</version>
4541
</dependency>
4642
<dependency>
4743
<groupId>org.springframework</groupId>
4844
<artifactId>spring-webmvc</artifactId>
49-
<version>${spring.version}</version>
5045
</dependency>
5146
<dependency>
5247
<groupId>org.springframework</groupId>
5348
<artifactId>spring-test</artifactId>
54-
<version>${spring.version}</version>
5549
<scope>test</scope>
5650
</dependency>
5751

@@ -101,6 +95,12 @@
10195
<artifactId>axiom-api</artifactId>
10296
<version>${axiom.version}</version>
10397
<optional>true</optional>
98+
<exclusions>
99+
<exclusion>
100+
<groupId>commons-logging</groupId>
101+
<artifactId>commons-logging</artifactId>
102+
</exclusion>
103+
</exclusions>
104104
</dependency>
105105
<dependency>
106106
<groupId>org.apache.ws.commons.axiom</groupId>
@@ -112,6 +112,10 @@
112112
<groupId>org.codehaus.woodstox</groupId>
113113
<artifactId>wstx-asl</artifactId>
114114
</exclusion>
115+
<exclusion>
116+
<groupId>commons-logging</groupId>
117+
<artifactId>commons-logging</artifactId>
118+
</exclusion>
115119
</exclusions>
116120
</dependency>
117121

@@ -135,12 +139,28 @@
135139
<artifactId>httpclient</artifactId>
136140
<version>${httpclient.version}</version>
137141
<optional>true</optional>
142+
<exclusions>
143+
<exclusion>
144+
<groupId>commons-logging</groupId>
145+
<artifactId>commons-logging</artifactId>
146+
</exclusion>
147+
</exclusions>
138148
</dependency>
139149
<dependency>
140150
<groupId>commons-httpclient</groupId>
141151
<artifactId>commons-httpclient</artifactId>
142152
<version>${commons-httpclient.version}</version>
143153
<optional>true</optional>
154+
<exclusions>
155+
<exclusion>
156+
<groupId>commons-codec</groupId>
157+
<artifactId>commons-codec</artifactId>
158+
</exclusion>
159+
<exclusion>
160+
<groupId>commons-logging</groupId>
161+
<artifactId>commons-logging</artifactId>
162+
</exclusion>
163+
</exclusions>
144164
</dependency>
145165
<dependency>
146166
<groupId>org.mortbay.jetty</groupId>

0 commit comments

Comments
 (0)