Skip to content

Commit 8899569

Browse files
poutsmapoutsma
committed
SWS-492 - Maven POM uses incorrect stax-api dependency
1 parent 35f2e8e commit 8899569

File tree

8 files changed

+41
-33
lines changed

8 files changed

+41
-33
lines changed

‎core-tiger/pom.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
23
<parent>
34
<artifactId>spring-ws-parent</artifactId>
45
<groupId>org.springframework.ws</groupId>
@@ -16,7 +17,7 @@
1617
</activation>
1718
<dependencies>
1819
<dependency>
19-
<groupId>stax</groupId>
20+
<groupId>javax.xml.stream</groupId>
2021
<artifactId>stax-api</artifactId>
2122
</dependency>
2223
<dependency>

‎core/pom.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
23
<parent>
34
<artifactId>spring-ws-parent</artifactId>
45
<groupId>org.springframework.ws</groupId>
@@ -17,7 +18,7 @@
1718
</activation>
1819
<dependencies>
1920
<dependency>
20-
<groupId>stax</groupId>
21+
<groupId>javax.xml.stream</groupId>
2122
<artifactId>stax-api</artifactId>
2223
</dependency>
2324
<dependency>

‎oxm-tiger/pom.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
23
<parent>
34
<artifactId>spring-ws-parent</artifactId>
45
<groupId>org.springframework.ws</groupId>
@@ -63,9 +64,9 @@
6364
<phase>generate-test-sources</phase>
6465
<configuration>
6566
<tasks>
66-
<ant antfile="${basedir}/build-maven2.xml" inheritRefs="true">
67-
<property name="maven.test.skip" value="${maven.test.skip}" />
68-
<target name="generate-test-sources" />
67+
<ant antfile="${basedir}/build-maven2.xml" inheritRefs="true"
68+
target="generate-test-sources">
69+
<property name="maven.test.skip" value="${maven.test.skip}"/>
6970
</ant>
7071
</tasks>
7172
<testSourceRoot>${project.build.directory}/generated-sources/test/java</testSourceRoot>

‎oxm/pom.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
23
<parent>
34
<artifactId>spring-ws-parent</artifactId>
45
<groupId>org.springframework.ws</groupId>
@@ -17,7 +18,7 @@
1718
</activation>
1819
<dependencies>
1920
<dependency>
20-
<groupId>stax</groupId>
21+
<groupId>javax.xml.stream</groupId>
2122
<artifactId>stax-api</artifactId>
2223
</dependency>
2324
<dependency>
@@ -38,9 +39,9 @@
3839
<phase>generate-test-sources</phase>
3940
<configuration>
4041
<tasks>
41-
<ant antfile="${basedir}/build-maven2.xml" inheritRefs="true">
42-
<property name="maven.test.skip" value="${maven.test.skip}" />
43-
<target name="generate-test-sources" />
42+
<ant antfile="${basedir}/build-maven2.xml" inheritRefs="true"
43+
target="generate-test-sources">
44+
<property name="maven.test.skip" value="${maven.test.skip}"/>
4445
</ant>
4546
</tasks>
4647
<testSourceRoot>${project.build.directory}/generated-sources/test/java</testSourceRoot>
@@ -54,9 +55,8 @@
5455
<phase>test-compile</phase>
5556
<configuration>
5657
<tasks>
57-
<ant antfile="${basedir}/build-maven2.xml" inheritRefs="true">
58-
<property name="maven.test.skip" value="${maven.test.skip}" />
59-
<target name="test-compile" />
58+
<ant antfile="${basedir}/build-maven2.xml" inheritRefs="true" target="test-compile">
59+
<property name="maven.test.skip" value="${maven.test.skip}"/>
6060
</ant>
6161
</tasks>
6262
</configuration>

‎parent/pom.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45
<groupId>org.springframework.ws</groupId>
56
<artifactId>spring-ws-parent</artifactId>
@@ -255,9 +256,9 @@
255256
<version>2.8.1</version>
256257
</dependency>
257258
<dependency>
258-
<groupId>stax</groupId>
259+
<groupId>javax.xml.stream</groupId>
259260
<artifactId>stax-api</artifactId>
260-
<version>1.0.1</version>
261+
<version>1.0-2</version>
261262
</dependency>
262263
<dependency>
263264
<groupId>xalan</groupId>

‎pom.xml‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45
<groupId>org.springframework.ws</groupId>
56
<artifactId>spring-ws</artifactId>
@@ -194,9 +195,9 @@
194195
</artifactItem>
195196
<!-- XML dependencies -->
196197
<artifactItem>
197-
<groupId>stax</groupId>
198+
<groupId>javax.xml.stream</groupId>
198199
<artifactId>stax-api</artifactId>
199-
<version>1.0.1</version>
200+
<version>1.0-2</version>
200201
<outputDirectory>${project.build.directory}/dependency/stax/</outputDirectory>
201202
</artifactItem>
202203
<artifactItem>
@@ -616,19 +617,20 @@
616617
<postProcess>
617618
<copy todir="target/site/reference">
618619
<fileset dir="target/docbkx">
619-
<include name="**/*.html" />
620-
<include name="**/*.pdf" />
620+
<include name="**/*.html"/>
621+
<include name="**/*.pdf"/>
621622
</fileset>
622623
</copy>
623624
<copy todir="target/site/reference/html">
624625
<fileset dir="src/docbkx/resources">
625-
<include name="**/*.css" />
626-
<include name="**/*.png" />
627-
<include name="**/*.gif" />
628-
<include name="**/*.jpg" />
626+
<include name="**/*.css"/>
627+
<include name="**/*.png"/>
628+
<include name="**/*.gif"/>
629+
<include name="**/*.jpg"/>
629630
</fileset>
630631
</copy>
631-
<move file="target/site/reference/pdf/index.pdf" tofile="target/site/reference/pdf/spring-ws-reference.pdf" failonerror="false" />
632+
<move file="target/site/reference/pdf/index.pdf"
633+
tofile="target/site/reference/pdf/spring-ws-reference.pdf" failonerror="false"/>
632634
</postProcess>
633635
</configuration>
634636
</plugin>

‎security/pom.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
23
<parent>
34
<artifactId>spring-ws-parent</artifactId>
45
<groupId>org.springframework.ws</groupId>
@@ -30,7 +31,7 @@
3031
</activation>
3132
<dependencies>
3233
<dependency>
33-
<groupId>stax</groupId>
34+
<groupId>javax.xml.stream</groupId>
3435
<artifactId>stax-api</artifactId>
3536
</dependency>
3637
<dependency>

‎xml/pom.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
23
<parent>
34
<artifactId>spring-ws-parent</artifactId>
45
<groupId>org.springframework.ws</groupId>
@@ -17,7 +18,7 @@
1718
</activation>
1819
<dependencies>
1920
<dependency>
20-
<groupId>stax</groupId>
21+
<groupId>javax.xml.stream</groupId>
2122
<artifactId>stax-api</artifactId>
2223
</dependency>
2324
</dependencies>

0 commit comments

Comments
 (0)