From 889956911af6e6cfdbd9595968cd8bf8bbb7c889 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Wed, 13 May 2009 10:47:25 +0000
Subject: [PATCH] SWS-492 - Maven POM uses incorrect stax-api dependency

---
 core-tiger/pom.xml |  5 +++--
 core/pom.xml       |  5 +++--
 oxm-tiger/pom.xml  |  9 +++++----
 oxm/pom.xml        | 16 ++++++++--------
 parent/pom.xml     |  7 ++++---
 pom.xml            | 22 ++++++++++++----------
 security/pom.xml   |  5 +++--
 xml/pom.xml        |  5 +++--
 8 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/core-tiger/pom.xml b/core-tiger/pom.xml
index b6d9eef6..1acd213c 100644
--- a/core-tiger/pom.xml
+++ b/core-tiger/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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">
     <parent>
         <artifactId>spring-ws-parent</artifactId>
         <groupId>org.springframework.ws</groupId>
@@ -16,7 +17,7 @@
             </activation>
             <dependencies>
                 <dependency>
-                    <groupId>stax</groupId>
+                    <groupId>javax.xml.stream</groupId>
                     <artifactId>stax-api</artifactId>
                 </dependency>
                 <dependency>
diff --git a/core/pom.xml b/core/pom.xml
index c6f3ea7b..3183ba95 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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">
     <parent>
         <artifactId>spring-ws-parent</artifactId>
         <groupId>org.springframework.ws</groupId>
@@ -17,7 +18,7 @@
             </activation>
             <dependencies>
                 <dependency>
-                    <groupId>stax</groupId>
+                    <groupId>javax.xml.stream</groupId>
                     <artifactId>stax-api</artifactId>
                 </dependency>
                 <dependency>
diff --git a/oxm-tiger/pom.xml b/oxm-tiger/pom.xml
index ff9196ff..7a1a052e 100644
--- a/oxm-tiger/pom.xml
+++ b/oxm-tiger/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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">
     <parent>
         <artifactId>spring-ws-parent</artifactId>
         <groupId>org.springframework.ws</groupId>
@@ -63,9 +64,9 @@
                         <phase>generate-test-sources</phase>
                         <configuration>
                             <tasks>
-                                <ant antfile="${basedir}/build-maven2.xml" inheritRefs="true">
-                                    <property name="maven.test.skip" value="${maven.test.skip}" />
-                                    <target name="generate-test-sources" />
+                                <ant antfile="${basedir}/build-maven2.xml" inheritRefs="true"
+                                     target="generate-test-sources">
+                                    <property name="maven.test.skip" value="${maven.test.skip}"/>
                                 </ant>
                             </tasks>
                             <testSourceRoot>${project.build.directory}/generated-sources/test/java</testSourceRoot>
diff --git a/oxm/pom.xml b/oxm/pom.xml
index 944c28b1..5e8fddef 100644
--- a/oxm/pom.xml
+++ b/oxm/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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">
     <parent>
         <artifactId>spring-ws-parent</artifactId>
         <groupId>org.springframework.ws</groupId>
@@ -17,7 +18,7 @@
             </activation>
             <dependencies>
                 <dependency>
-                    <groupId>stax</groupId>
+                    <groupId>javax.xml.stream</groupId>
                     <artifactId>stax-api</artifactId>
                 </dependency>
                 <dependency>
@@ -38,9 +39,9 @@
                         <phase>generate-test-sources</phase>
                         <configuration>
                             <tasks>
-                                <ant antfile="${basedir}/build-maven2.xml" inheritRefs="true">
-                                    <property name="maven.test.skip" value="${maven.test.skip}" />
-                                    <target name="generate-test-sources" />
+                                <ant antfile="${basedir}/build-maven2.xml" inheritRefs="true"
+                                     target="generate-test-sources">
+                                    <property name="maven.test.skip" value="${maven.test.skip}"/>
                                 </ant>
                             </tasks>
                             <testSourceRoot>${project.build.directory}/generated-sources/test/java</testSourceRoot>
@@ -54,9 +55,8 @@
                         <phase>test-compile</phase>
                         <configuration>
                             <tasks>
-                                <ant antfile="${basedir}/build-maven2.xml" inheritRefs="true">
-                                    <property name="maven.test.skip" value="${maven.test.skip}" />
-                                    <target name="test-compile" />
+                                <ant antfile="${basedir}/build-maven2.xml" inheritRefs="true" target="test-compile">
+                                    <property name="maven.test.skip" value="${maven.test.skip}"/>
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/parent/pom.xml b/parent/pom.xml
index bb3d9531..82cadac3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.springframework.ws</groupId>
     <artifactId>spring-ws-parent</artifactId>
@@ -255,9 +256,9 @@
                 <version>2.8.1</version>
             </dependency>
             <dependency>
-                <groupId>stax</groupId>
+                <groupId>javax.xml.stream</groupId>
                 <artifactId>stax-api</artifactId>
-                <version>1.0.1</version>
+                <version>1.0-2</version>
             </dependency>
             <dependency>
                 <groupId>xalan</groupId>
diff --git a/pom.xml b/pom.xml
index deacbab2..8c78f0b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.springframework.ws</groupId>
     <artifactId>spring-ws</artifactId>
@@ -194,9 +195,9 @@
                                         </artifactItem>
                                         <!-- XML dependencies -->
                                         <artifactItem>
-                                            <groupId>stax</groupId>
+                                            <groupId>javax.xml.stream</groupId>
                                             <artifactId>stax-api</artifactId>
-                                            <version>1.0.1</version>
+                                            <version>1.0-2</version>
                                             <outputDirectory>${project.build.directory}/dependency/stax/</outputDirectory>
                                         </artifactItem>
                                         <artifactItem>
@@ -616,19 +617,20 @@
                     <postProcess>
                         <copy todir="target/site/reference">
                             <fileset dir="target/docbkx">
-                                <include name="**/*.html" />
-                                <include name="**/*.pdf" />
+                                <include name="**/*.html"/>
+                                <include name="**/*.pdf"/>
                             </fileset>
                         </copy>
                         <copy todir="target/site/reference/html">
                             <fileset dir="src/docbkx/resources">
-                                <include name="**/*.css" />
-                                <include name="**/*.png" />
-                                <include name="**/*.gif" />
-                                <include name="**/*.jpg" />
+                                <include name="**/*.css"/>
+                                <include name="**/*.png"/>
+                                <include name="**/*.gif"/>
+                                <include name="**/*.jpg"/>
                             </fileset>
                         </copy>
-                        <move file="target/site/reference/pdf/index.pdf" tofile="target/site/reference/pdf/spring-ws-reference.pdf" failonerror="false" />
+                        <move file="target/site/reference/pdf/index.pdf"
+                              tofile="target/site/reference/pdf/spring-ws-reference.pdf" failonerror="false"/>
                     </postProcess>
                 </configuration>
             </plugin>
diff --git a/security/pom.xml b/security/pom.xml
index 1eac3eb3..79e6c55d 100644
--- a/security/pom.xml
+++ b/security/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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">
     <parent>
         <artifactId>spring-ws-parent</artifactId>
         <groupId>org.springframework.ws</groupId>
@@ -30,7 +31,7 @@
             </activation>
             <dependencies>
                 <dependency>
-                    <groupId>stax</groupId>
+                    <groupId>javax.xml.stream</groupId>
                     <artifactId>stax-api</artifactId>
                 </dependency>
                 <dependency>
diff --git a/xml/pom.xml b/xml/pom.xml
index d4e03a56..eafa40dd 100644
--- a/xml/pom.xml
+++ b/xml/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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">
     <parent>
         <artifactId>spring-ws-parent</artifactId>
         <groupId>org.springframework.ws</groupId>
@@ -17,7 +18,7 @@
             </activation>
             <dependencies>
                 <dependency>
-                    <groupId>stax</groupId>
+                    <groupId>javax.xml.stream</groupId>
                     <artifactId>stax-api</artifactId>
                 </dependency>
             </dependencies>