From 708364f1cc1555587c55623a7ee212d6be2f13aa Mon Sep 17 00:00:00 2001
From: dsyer <dsyer@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Wed, 3 Dec 2008 21:21:01 +0000
Subject: [PATCH] Make as many dependencies as possible optional (it's not
 inherited from parent apparently).

---
 spring-batch-core/pom.xml                 | 13 +++++++
 spring-batch-infrastructure-tests/pom.xml |  5 +++
 spring-batch-infrastructure/pom.xml       | 46 ++++++++++++-----------
 spring-batch-integration/pom.xml          |  5 ++-
 spring-batch-samples/pom.xml              |  6 +++
 spring-batch-test/pom.xml                 |  6 +++
 6 files changed, 58 insertions(+), 23 deletions(-)

diff --git a/spring-batch-core/pom.xml b/spring-batch-core/pom.xml
index 5c50f9b59..5ce6b7c10 100644
--- a/spring-batch-core/pom.xml
+++ b/spring-batch-core/pom.xml
@@ -28,6 +28,7 @@
 		<dependency>
 			<groupId>org.objectweb.asm</groupId>
 			<artifactId>com.springsource.org.objectweb.asm.commons</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.hsqldb</groupId>
@@ -38,6 +39,10 @@
 			<artifactId>com.springsource.org.apache.commons.io</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>com.springsource.org.apache.commons.lang</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.easymock</groupId>
 			<artifactId>com.springsource.org.easymock</artifactId>
@@ -70,6 +75,7 @@
 		<dependency>
 			<groupId>org.eclipse.osgi</groupId>
 			<artifactId>org.eclipse.osgi</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<!-- Spring Dependencies -->
 		<dependency>
@@ -96,6 +102,7 @@
 		<dependency>
 			<groupId>org.springframework.osgi</groupId>
 			<artifactId>org.springframework.osgi.core</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -110,6 +117,12 @@
 			<groupId>javax.annotation</groupId>
 			<artifactId>com.springsource.javax.annotation</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>stax</groupId>
+			<artifactId>stax</artifactId>
+			<!-- optional for Java 6 -->
+			<optional>true</optional>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/spring-batch-infrastructure-tests/pom.xml b/spring-batch-infrastructure-tests/pom.xml
index 30cc602fb..036dc9ebb 100644
--- a/spring-batch-infrastructure-tests/pom.xml
+++ b/spring-batch-infrastructure-tests/pom.xml
@@ -73,6 +73,11 @@
 			<artifactId>com.springsource.org.apache.commons.io</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>com.springsource.org.apache.commons.lang</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.derby</groupId>
 			<artifactId>com.springsource.org.apache.derby</artifactId>
diff --git a/spring-batch-infrastructure/pom.xml b/spring-batch-infrastructure/pom.xml
index 89cf89526..4c47be80b 100644
--- a/spring-batch-infrastructure/pom.xml
+++ b/spring-batch-infrastructure/pom.xml
@@ -74,10 +74,12 @@
 		<dependency>
 			<groupId>net.sourceforge.cglib</groupId>
 			<artifactId>com.springsource.net.sf.cglib</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>javax.jms</groupId>
 			<artifactId>com.springsource.javax.jms</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
@@ -86,6 +88,7 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>com.springsource.org.apache.commons.lang</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
@@ -100,44 +103,26 @@
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>com.springsource.org.hibernate</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>com.springsource.org.hibernate.ejb</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>com.springsource.org.hibernate.annotations</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>javax.transaction</groupId>
 			<artifactId>com.springsource.javax.transaction</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>net.sourceforge.cglib</groupId>
-			<artifactId>com.springsource.net.sf.cglib</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.ibatis</groupId>
 			<artifactId>com.springsource.com.ibatis</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.persistence</groupId>
-			<artifactId>com.springsource.javax.persistence</artifactId>
-		</dependency>
-		<dependency>
-			<!-- TODO: remove this or find a replacement in Java 5 / BRITS -->
-			<groupId>stax</groupId>
-			<artifactId>stax</artifactId>
-		</dependency>
-		<!-- Spring Dependencies -->
-		<dependency>
-			<groupId>org.springframework.ws</groupId>
-			<artifactId>org.springframework.oxm</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.aop</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
@@ -145,6 +130,23 @@
 			<artifactId>com.springsource.javax.persistence</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<!-- TODO: remove this or find a replacement in Java 5 / BRITS -->
+			<groupId>stax</groupId>
+			<artifactId>stax</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<!-- Spring Dependencies -->
+		<dependency>
+			<groupId>org.springframework.ws</groupId>
+			<artifactId>org.springframework.oxm</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>org.springframework.aop</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>org.springframework.core</artifactId>
diff --git a/spring-batch-integration/pom.xml b/spring-batch-integration/pom.xml
index f7f45a50e..bf2fdaf6b 100644
--- a/spring-batch-integration/pom.xml
+++ b/spring-batch-integration/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<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>org.springframework.batch
 		</artifactId>
@@ -55,6 +56,7 @@
 			<groupId>javax.jms</groupId>
 			<artifactId>com.springsource.javax.jms
 			</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
@@ -110,6 +112,7 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>org.springframework.jms
 			</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
diff --git a/spring-batch-samples/pom.xml b/spring-batch-samples/pom.xml
index c7f2a9334..41f0e5608 100644
--- a/spring-batch-samples/pom.xml
+++ b/spring-batch-samples/pom.xml
@@ -165,6 +165,12 @@
 			<artifactId>db2jcc</artifactId> <version>9.5.0</version>
 			<scope>test</scope> </dependency>
 		-->
+		<dependency>
+			<groupId>stax</groupId>
+			<artifactId>stax</artifactId>
+			<!-- optional for Java 6 -->
+			<optional>true</optional>
+		</dependency>
 		<!-- Spring Dependencies -->
 		<dependency>
 			<groupId>org.springframework</groupId>
diff --git a/spring-batch-test/pom.xml b/spring-batch-test/pom.xml
index f2fd608e6..77d156bac 100755
--- a/spring-batch-test/pom.xml
+++ b/spring-batch-test/pom.xml
@@ -55,6 +55,12 @@
 			<artifactId>com.springsource.org.apache.commons.collections
 			</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>stax</groupId>
+			<artifactId>stax</artifactId>
+			<!-- optional for Java 6 -->
+			<optional>true</optional>
+		</dependency>
 	</dependencies>
 	<reporting>
 		<plugins>