Skip to content

Commit 9a67481

Browse files
snicollsnicoll
committed
Polish build
This mostly polish the structure of the POM files and harmonize the dependency management.
1 parent 6f991ba commit 9a67481

File tree

13 files changed

+153
-424
lines changed

13 files changed

+153
-424
lines changed

‎airline/client/axis1/pom.xml‎

Lines changed: 3 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -3,51 +3,37 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
6-
76
<parent>
87
<groupId>org.springframework.ws</groupId>
98
<artifactId>spring-ws-samples</artifactId>
109
<version>2.0.0-SNAPSHOT</version>
11-
<relativePath>../../../</relativePath> <!-- lookup parent from repository -->
10+
<relativePath>../../../pom.xml</relativePath>
1211
</parent>
13-
14-
<groupId>org.springframework.ws</groupId>
1512
<artifactId>airline-client-axis1</artifactId>
16-
<version>0.0.1-SNAPSHOT</version>
1713
<name>Spring Web Services Samples - Airline - Client - Axis1</name>
18-
<description>Demo project for Spring Web Services</description>
1914

2015
<properties>
21-
<axis.version>1.4</axis.version>
22-
2316
<sourcesDir>${project.basedir}/target/generated-sources/axis</sourcesDir>
2417
<classesDir>${project.basedir}/target/classes</classesDir>
2518
<wsdl>${project.basedir}/../airline.wsdl</wsdl>
2619
</properties>
2720

2821
<dependencies>
29-
3022
<dependency>
3123
<groupId>axis</groupId>
3224
<artifactId>axis</artifactId>
33-
<version>${axis.version}</version>
3425
</dependency>
35-
3626
<dependency>
3727
<groupId>org.apache.axis</groupId>
3828
<artifactId>axis-jaxrpc</artifactId>
39-
<version>${axis.version}</version>
4029
</dependency>
41-
4230
</dependencies>
4331

4432
<build>
45-
4633
<plugins>
4734
<plugin>
4835
<groupId>org.apache.maven.plugins</groupId>
4936
<artifactId>maven-antrun-plugin</artifactId>
50-
<version>1.8</version>
5137
<dependencies>
5238
<dependency>
5339
<groupId>axis</groupId>
@@ -64,7 +50,7 @@
6450
<execution>
6551
<phase>generate-sources</phase>
6652
<configuration>
67-
<tasks>
53+
<target>
6854
<taskdef name="axis-wsdl2java"
6955
classname="org.apache.axis.tools.ant.wsdl.Wsdl2javaAntTask">
7056
<classpath refid="maven.compile.classpath"/>
@@ -103,7 +89,7 @@
10389
<exclude name="**/*.java"/>
10490
</fileset>
10591
</copy>
106-
</tasks>
92+
</target>
10793
</configuration>
10894
<goals>
10995
<goal>run</goal>
@@ -114,7 +100,6 @@
114100
<plugin>
115101
<groupId>org.codehaus.mojo</groupId>
116102
<artifactId>build-helper-maven-plugin</artifactId>
117-
<version>1.1</version>
118103
<executions>
119104
<execution>
120105
<id>add-source</id>
@@ -131,38 +116,6 @@
131116
</executions>
132117
</plugin>
133118
</plugins>
134-
135119
</build>
136120

137-
<repositories>
138-
<repository>
139-
<id>spring-snapshots</id>
140-
<name>Spring Snapshots</name>
141-
<url>https://repo.spring.io/snapshot</url>
142-
<snapshots>
143-
<enabled>true</enabled>
144-
</snapshots>
145-
</repository>
146-
<repository>
147-
<id>spring-milestones</id>
148-
<name>Spring Milestones</name>
149-
<url>https://repo.spring.io/milestone</url>
150-
</repository>
151-
</repositories>
152-
<pluginRepositories>
153-
<pluginRepository>
154-
<id>spring-snapshots</id>
155-
<name>Spring Snapshots</name>
156-
<url>https://repo.spring.io/snapshot</url>
157-
<snapshots>
158-
<enabled>true</enabled>
159-
</snapshots>
160-
</pluginRepository>
161-
<pluginRepository>
162-
<id>spring-milestones</id>
163-
<name>Spring Milestones</name>
164-
<url>https://repo.spring.io/milestone</url>
165-
</pluginRepository>
166-
</pluginRepositories>
167-
168121
</project>

‎airline/client/jax-ws/pom.xml‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,54 +3,47 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
6-
76
<parent>
87
<groupId>org.springframework.ws</groupId>
98
<artifactId>spring-ws-samples</artifactId>
109
<version>2.0.0-SNAPSHOT</version>
11-
<relativePath>../../../</relativePath> <!-- lookup parent from repository -->
10+
<relativePath>../../../pom.xml</relativePath>
1211
</parent>
13-
1412
<artifactId>airline-client-jax-ws</artifactId>
15-
<version>0.0.1-SNAPSHOT</version>
1613
<name>Spring Web Services Samples - Airline - Client - JAX-WS</name>
17-
<description>Demo project for Spring Web Services</description>
1814

1915
<properties>
20-
<jax-ws.version>2.1.7</jax-ws.version>
2116
<sourcesDir>${project.basedir}/target/generated-sources/jaxws</sourcesDir>
2217
<classesDir>${project.basedir}/target/classes</classesDir>
2318
<wsdl>${project.basedir}/../airline.wsdl</wsdl>
2419
</properties>
2520

2621
<dependencies>
27-
2822
<dependency>
2923
<groupId>org.springframework.ws</groupId>
3024
<artifactId>spring-ws-core</artifactId>
3125
</dependency>
32-
3326
<dependency>
3427
<groupId>com.sun.xml.ws</groupId>
3528
<artifactId>jaxws-tools</artifactId>
36-
<version>${jaxws-tools.version}</version>
3729
</dependency>
38-
3930
<dependency>
4031
<groupId>jakarta.jws</groupId>
4132
<artifactId>jakarta.jws-api</artifactId>
42-
<version>${jws-api.version}</version>
4333
</dependency>
4434

35+
<dependency>
36+
<groupId>org.springframework.boot</groupId>
37+
<artifactId>spring-boot-starter-test</artifactId>
38+
<scope>test</scope>
39+
</dependency>
4540
</dependencies>
4641

4742
<build>
48-
4943
<plugins>
5044
<plugin>
5145
<groupId>com.sun.xml.ws</groupId>
5246
<artifactId>jaxws-maven-plugin</artifactId>
53-
<version>3.0.0</version>
5447
<executions>
5548
<execution>
5649
<goals>
@@ -70,7 +63,6 @@
7063
<plugin>
7164
<groupId>org.codehaus.mojo</groupId>
7265
<artifactId>build-helper-maven-plugin</artifactId>
73-
<version>1.1</version>
7466
<executions>
7567
<execution>
7668
<id>add-source</id>
@@ -87,7 +79,6 @@
8779
</executions>
8880
</plugin>
8981
</plugins>
90-
9182
</build>
9283

9384
</project>

‎airline/client/jms/pom.xml‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,14 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
6-
76
<parent>
87
<groupId>org.springframework.ws</groupId>
98
<artifactId>spring-ws-samples</artifactId>
109
<version>2.0.0-SNAPSHOT</version>
11-
<relativePath>../../../</relativePath> <!-- lookup parent from repository -->
10+
<relativePath>../../../pom.xml</relativePath>
1211
</parent>
13-
1412
<artifactId>airline-client-jms</artifactId>
15-
<version>0.0.1-SNAPSHOT</version>
1613
<name>Spring Web Services Samples - Airline - Client - JMS</name>
17-
<description>Demo project for Spring Web Services</description>
1814

1915
<properties>
2016
<sourcesDir>${project.basedir}/target/generated-sources/jaxws</sourcesDir>
@@ -23,22 +19,19 @@
2319
</properties>
2420

2521
<dependencies>
22+
<dependency>
23+
<groupId>org.springframework.boot</groupId>
24+
<artifactId>spring-boot-starter-artemis</artifactId>
25+
</dependency>
2626

2727
<dependency>
2828
<groupId>org.springframework.ws</groupId>
2929
<artifactId>spring-ws-core</artifactId>
3030
</dependency>
31-
3231
<dependency>
3332
<groupId>org.springframework.ws</groupId>
3433
<artifactId>spring-ws-support</artifactId>
3534
</dependency>
36-
37-
<dependency>
38-
<groupId>org.springframework.boot</groupId>
39-
<artifactId>spring-boot-starter-artemis</artifactId>
40-
</dependency>
41-
4235
</dependencies>
4336

4437
</project>

‎airline/client/saaj/pom.xml‎

Lines changed: 5 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -3,67 +3,25 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
6-
76
<parent>
87
<groupId>org.springframework.ws</groupId>
98
<artifactId>spring-ws-samples</artifactId>
109
<version>2.0.0-SNAPSHOT</version>
11-
<relativePath>../../../</relativePath> <!-- lookup parent from repository -->
10+
<relativePath>../../../pom.xml</relativePath>
1211
</parent>
13-
1412
<artifactId>airline-client-saaj</artifactId>
1513
<version>0.0.1-SNAPSHOT</version>
1614
<name>Spring Web Services Samples - Airline - Client - SAAJ</name>
17-
<description>Demo project for Spring Web Services</description>
18-
19-
<properties>
20-
<saaj-impl.version>2.0.1</saaj-impl.version>
21-
</properties>
2215

2316
<dependencies>
24-
2517
<dependency>
26-
<groupId>com.sun.xml.messaging.saaj</groupId>
27-
<artifactId>saaj-impl</artifactId>
28-
<version>${saaj-impl.version}</version>
18+
<groupId>org.springframework.boot</groupId>
19+
<artifactId>spring-boot-starter</artifactId>
2920
</dependency>
30-
3121
<dependency>
32-
<groupId>org.slf4j</groupId>
33-
<artifactId>slf4j-api</artifactId>
22+
<groupId>com.sun.xml.messaging.saaj</groupId>
23+
<artifactId>saaj-impl</artifactId>
3424
</dependency>
35-
3625
</dependencies>
3726

38-
<repositories>
39-
<repository>
40-
<id>spring-snapshots</id>
41-
<name>Spring Snapshots</name>
42-
<url>https://repo.spring.io/snapshot</url>
43-
<snapshots>
44-
<enabled>true</enabled>
45-
</snapshots>
46-
</repository>
47-
<repository>
48-
<id>spring-milestones</id>
49-
<name>Spring Milestones</name>
50-
<url>https://repo.spring.io/milestone</url>
51-
</repository>
52-
</repositories>
53-
<pluginRepositories>
54-
<pluginRepository>
55-
<id>spring-snapshots</id>
56-
<name>Spring Snapshots</name>
57-
<url>https://repo.spring.io/snapshot</url>
58-
<snapshots>
59-
<enabled>true</enabled>
60-
</snapshots>
61-
</pluginRepository>
62-
<pluginRepository>
63-
<id>spring-milestones</id>
64-
<name>Spring Milestones</name>
65-
<url>https://repo.spring.io/milestone</url>
66-
</pluginRepository>
67-
</pluginRepositories>
68-
6927
</project>

‎airline/client/spring-ws/pom.xml‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,14 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
6-
76
<parent>
87
<groupId>org.springframework.ws</groupId>
98
<artifactId>spring-ws-samples</artifactId>
109
<version>2.0.0-SNAPSHOT</version>
11-
<relativePath>../../../</relativePath> <!-- lookup parent from repository -->
10+
<relativePath>../../../pom.xml</relativePath>
1211
</parent>
13-
1412
<artifactId>airline-client-spring-ws</artifactId>
15-
<version>0.0.1-SNAPSHOT</version>
1613
<name>Spring Web Services Samples - Airline - Client - Spring WS</name>
17-
<description>Demo project for Spring Web Services</description>
1814

1915
<properties>
2016
<sourcesDir>${project.basedir}/target/generated-sources/xjc</sourcesDir>
@@ -24,33 +20,32 @@
2420
</properties>
2521

2622
<dependencies>
27-
2823
<dependency>
2924
<groupId>org.springframework.ws</groupId>
3025
<artifactId>spring-ws-core</artifactId>
3126
</dependency>
32-
3327
<dependency>
3428
<groupId>org.springframework.ws</groupId>
3529
<artifactId>spring-ws-security</artifactId>
3630
</dependency>
3731

32+
<dependency>
33+
<groupId>org.springframework.boot</groupId>
34+
<artifactId>spring-boot-starter-test</artifactId>
35+
<scope>test</scope>
36+
</dependency>
3837
<dependency>
3938
<groupId>org.springframework.ws</groupId>
4039
<artifactId>spring-ws-test</artifactId>
4140
<scope>test</scope>
4241
</dependency>
43-
4442
</dependencies>
4543

4644
<build>
47-
4845
<plugins>
49-
5046
<plugin>
5147
<groupId>com.evolvedbinary.maven.jvnet</groupId>
5248
<artifactId>jaxb30-maven-plugin</artifactId>
53-
<version>0.15.0</version>
5449
<executions>
5550
<execution>
5651
<goals>
@@ -69,11 +64,9 @@
6964
<addCompileSourceRoot>true</addCompileSourceRoot>
7065
</configuration>
7166
</plugin>
72-
7367
<plugin>
7468
<groupId>org.codehaus.mojo</groupId>
7569
<artifactId>build-helper-maven-plugin</artifactId>
76-
<version>1.1</version>
7770
<executions>
7871
<execution>
7972
<id>add-source</id>
@@ -90,7 +83,6 @@
9083
</executions>
9184
</plugin>
9285
</plugins>
93-
9486
</build>
9587

9688
</project>

0 commit comments

Comments
 (0)