From 5410e076a8df1cb15605add8485d75ffdc38bf45 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@vmware.com>
Date: Mon, 24 Sep 2012 16:34:02 +0100
Subject: [PATCH] BATCH-1685: fix broken dependeny on spring-oxm

---
 spring-batch-infrastructure-tests/pom.xml     |   4 +-
 spring-batch-infrastructure/pom.xml           |   4 +-
 .../batch/item/xml/StaxUtils.java             |   2 +-
 .../batch/support/JdbcTestUtils.java          |   2 +-
 spring-batch-parent/pom.xml                   | 135 +++++++++---------
 spring-batch-samples/pom.xml                  |   4 +-
 6 files changed, 77 insertions(+), 74 deletions(-)

diff --git a/spring-batch-infrastructure-tests/pom.xml b/spring-batch-infrastructure-tests/pom.xml
index 82a6d5f5a..2443c4152 100644
--- a/spring-batch-infrastructure-tests/pom.xml
+++ b/spring-batch-infrastructure-tests/pom.xml
@@ -196,8 +196,8 @@
 			<optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>${spring.oxm.group}</groupId>
-			<artifactId>${spring.oxm.artifact}</artifactId>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-oxm</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/spring-batch-infrastructure/pom.xml b/spring-batch-infrastructure/pom.xml
index 3370ab903..369931b5c 100644
--- a/spring-batch-infrastructure/pom.xml
+++ b/spring-batch-infrastructure/pom.xml
@@ -163,8 +163,8 @@
 			<optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>${spring.oxm.group}</groupId>
-			<artifactId>${spring.oxm.artifact}</artifactId>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-oxm</artifactId>
 			<optional>true</optional>
 		</dependency>
         <dependency>
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxUtils.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxUtils.java
index 7ca1bf5ba..2d039f9b5 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxUtils.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxUtils.java
@@ -40,8 +40,8 @@ import org.springframework.util.ClassUtils;
  *
  * @author Josh Long
  *
- * @see org.springframework.xml.transform.StaxSource
  */
+@SuppressWarnings("restriction")
 public abstract class StaxUtils {
 
 	private static final Log logger = LogFactory.getLog(StaxUtils.class);
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/JdbcTestUtils.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/JdbcTestUtils.java
index 9fd20a468..ecf99bf28 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/JdbcTestUtils.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/JdbcTestUtils.java
@@ -7,7 +7,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
 /**
  * <p>
  * Util class based off {@link org.springframework.test.jdbc.SimpleJdbcTestUtils} but for JdbcTemplate
- * rather than the deprecated {@link org.springframework.jdbc.core.simple.SimpleJdbcTemplate}.
+ * rather than the deprecated SimpleJdbcTemplate.
  *
  * This class should be removed when Batch uses Spring 3.2 - see:
  * https://jira.springsource.org/browse/SPR-9235
diff --git a/spring-batch-parent/pom.xml b/spring-batch-parent/pom.xml
index 7a06d0ffd..d8e1321cb 100644
--- a/spring-batch-parent/pom.xml
+++ b/spring-batch-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.batch</groupId>
 	<artifactId>spring-batch-parent</artifactId>
@@ -12,8 +13,8 @@
 		<url>http://github.com/SpringSource/spring-batch</url>
 		<connection>scm:git:git://github.com/SpringSource/spring-batch.git</connection>
 		<developerConnection>scm:git:git://github.com/SpringSource/spring-batch.git</developerConnection>
-	  <tag>HEAD</tag>
-  </scm>
+		<tag>HEAD</tag>
+	</scm>
 	<licenses>
 		<license>
 			<name>Apache 2.0</name>
@@ -28,15 +29,12 @@
 		</developer>
 	</developers>
 	<properties>
-        <spring.framework.version>3.1.2.RELEASE</spring.framework.version>
-        <spring.oxm.group>org.springframework</spring.oxm.group>
-        <spring.oxm.artifact>spring-oxm</spring.oxm.artifact>
-        <spring.oxm.version>3.0.7.RELEASE</spring.oxm.version>
-        <spring.amqp.version>1.1.2.RELEASE</spring.amqp.version>
-        <junit.version>4.10</junit.version>
+		<spring.framework.version>3.1.2.RELEASE</spring.framework.version>
+		<spring.amqp.version>1.1.2.RELEASE</spring.amqp.version>
+		<junit.version>4.10</junit.version>
 		<bundlor.version>1.0.0.RELEASE</bundlor.version>
 		<dependency.locations.enabled>false</dependency.locations.enabled>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 	<profiles>
 		<profile>
@@ -169,8 +167,7 @@
 		</extensions>
 		<pluginManagement>
 			<plugins>
-				<!--This plugin's configuration is used to store Eclipse m2e settings 
-					only. It has no influence on the Maven build itself. -->
+				<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself. -->
 				<plugin>
 					<groupId>org.eclipse.m2e</groupId>
 					<artifactId>lifecycle-mapping</artifactId>
@@ -243,25 +240,25 @@
 						</dependency>
 					</dependencies>
 				</plugin>
-                <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-site-plugin</artifactId>
-                  <version>3.1</version>
-                  <dependencies>
-                    <dependency>
-                      <groupId>org.apache.maven.wagon</groupId>
-                      <artifactId>wagon-ssh</artifactId>
-                      <version>2.2</version>
-                    </dependency>
-                  </dependencies>
-                </plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-site-plugin</artifactId>
+					<version>3.1</version>
+					<dependencies>
+						<dependency>
+							<groupId>org.apache.maven.wagon</groupId>
+							<artifactId>wagon-ssh</artifactId>
+							<version>2.2</version>
+						</dependency>
+					</dependencies>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-                <version>2.5.1</version>
+				<version>2.5.1</version>
 				<configuration>
 					<source>1.5</source>
 					<target>1.5</target>
@@ -285,7 +282,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-                <version>2.12.3</version>
+				<version>2.12.3</version>
 				<configuration>
 					<includes>
 						<include>**/*Tests.java</include>
@@ -298,36 +295,36 @@
 			</plugin>
 		</plugins>
 	</build>
-    <pluginRepositories>
-      <pluginRepository>
-        <id>objectstyle</id>
-        <name>ObjectStyle.org Repository</name>
-        <url>http://objectstyle.org/maven2/</url>
-        <snapshots>
-          <enabled>false</enabled>
-        </snapshots>
-      </pluginRepository>
-      <pluginRepository>
-        <id>com.springsource.repository.bundles.release</id>
-        <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
-        <url>http://repository.springsource.com/maven/bundles/release/</url>
-        <snapshots>
-          <enabled>false</enabled>
-        </snapshots>
-      </pluginRepository>
-    </pluginRepositories>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>objectstyle</id>
+			<name>ObjectStyle.org Repository</name>
+			<url>http://objectstyle.org/maven2/</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>com.springsource.repository.bundles.release</id>
+			<name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
+			<url>http://repository.springsource.com/maven/bundles/release/</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+	</pluginRepositories>
 	<reporting>
 		<plugins>
 			<plugin>
 				<artifactId>maven-jxr-plugin</artifactId>
-                <version>2.3</version>
+				<version>2.3</version>
 				<configuration>
 					<aggregate>true</aggregate>
 				</configuration>
 			</plugin>
 			<plugin>
 				<artifactId>maven-surefire-report-plugin</artifactId>
-                <version>2.12.3</version>
+				<version>2.12.3</version>
 				<configuration>
 					<aggregate>true</aggregate>
 				</configuration>
@@ -338,7 +335,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8.1</version>
+				<version>2.8.1</version>
 				<configuration>
 					<quiet>true</quiet>
 				</configuration>
@@ -376,12 +373,12 @@
 				<version>2.4</version>
 				<scope>test</scope>
 			</dependency>
-            <dependency>
-                <groupId>org.easymock</groupId>
-                <artifactId>easymockclassextension</artifactId>
-                <version>2.4</version>
-                <scope>test</scope>
-            </dependency>
+			<dependency>
+				<groupId>org.easymock</groupId>
+				<artifactId>easymockclassextension</artifactId>
+				<version>2.4</version>
+				<scope>test</scope>
+			</dependency>
 			<dependency>
 				<groupId>org.apache.geronimo.specs</groupId>
 				<artifactId>geronimo-jms_1.1_spec</artifactId>
@@ -659,10 +656,16 @@
 				<version>${spring.framework.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>${spring.oxm.group}</groupId>
-				<artifactId>${spring.oxm.artifact}</artifactId>
-				<version>${spring.oxm.version}</version>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-oxm</artifactId>
+				<version>${spring.framework.version}</version>
 				<optional>true</optional>
+				<exclusions>
+					<exclusion>
+						<groupId>commons-lang</groupId>
+						<artifactId>commons-lang</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.osgi</groupId>
@@ -670,16 +673,16 @@
 				<version>1.1.2</version>
 				<optional>true</optional>
 			</dependency>
-            <dependency>
-                <groupId>org.springframework.amqp</groupId>
-                <artifactId>spring-amqp</artifactId>
-                <version>${spring.amqp.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.amqp</groupId>
-                <artifactId>spring-rabbit</artifactId>
-                <version>${spring.amqp.version}</version>
-            </dependency>
+			<dependency>
+				<groupId>org.springframework.amqp</groupId>
+				<artifactId>spring-amqp</artifactId>
+				<version>${spring.amqp.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.amqp</groupId>
+				<artifactId>spring-rabbit</artifactId>
+				<version>${spring.amqp.version}</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<distributionManagement>
diff --git a/spring-batch-samples/pom.xml b/spring-batch-samples/pom.xml
index d0cd3ea17..c44444cb9 100644
--- a/spring-batch-samples/pom.xml
+++ b/spring-batch-samples/pom.xml
@@ -200,8 +200,8 @@
 			<artifactId>spring-aop</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>${spring.oxm.group}</groupId>
-			<artifactId>${spring.oxm.artifact}</artifactId>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-oxm</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>