From 5c840a69608aacd77a5e7c95b2eff29dd1dcfe10 Mon Sep 17 00:00:00 2001
From: dsyer <dsyer@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Tue, 25 Mar 2008 05:39:36 +0000
Subject: [PATCH] [BATCH-271] tweak dependencies to ensure optional where
 appropriate

---
 pom.xml                             | 61 ++++++++++++-------------
 spring-batch-core/pom.xml           |  2 +-
 spring-batch-infrastructure/pom.xml | 12 ++---
 spring-batch-integration/pom.xml    | 71 +++++++++++++++++------------
 spring-batch-samples/pom.xml        | 15 +++---
 5 files changed, 84 insertions(+), 77 deletions(-)

diff --git a/pom.xml b/pom.xml
index 160cbad7b..a48fc9312 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +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">
-
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.batch</groupId>
 	<artifactId>spring-batch</artifactId>
@@ -9,10 +8,8 @@
 		<!--  Use CDATA to keep it on a single line in the manifest -->
 		<![CDATA[Spring Batch provides tools for enterprise batch or bulk processing. It can be used to wire up jobs, and track	their execution, or simply as an optimization for repetitive processing in a transactional environment. Spring Batch is part of the Spring Portfolio.]]>
 	</description>
-
 	<version>1.0.0.-SNAPSHOT</version>
 	<packaging>pom</packaging>
-
 	<modules>
 		<module>spring-batch-infrastructure</module>
 		<module>spring-batch-core</module>
@@ -20,7 +17,6 @@
 		<module>spring-batch-integration</module>
 		<module>docs</module>
 	</modules>
-
 	<url>http://www.springframework.org/spring-batch</url>
 	<organization>
 		<name>SpringSource</name>
@@ -28,11 +24,9 @@
 	</organization>
 	<scm>
 		<url>http://fisheye3.cenqua.com/browse/springframework/spring-batch/trunk</url>
-		<connection>
-			scm:svn:http://springframework.svn.sourceforge.net/svnroot/springframework/spring-batch/trunk
+		<connection> scm:svn:http://springframework.svn.sourceforge.net/svnroot/springframework/spring-batch/trunk 
 		</connection>
-		<developerConnection>
-			scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-batch/trunk
+		<developerConnection> scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-batch/trunk 
 		</developerConnection>
 	</scm>
 	<issueManagement>
@@ -62,12 +56,10 @@
 			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
 		</license>
 	</licenses>
-
 	<properties>
 		<maven.test.failure.ignore>true</maven.test.failure.ignore>
 		<spring.framework.version>2.5.2</spring.framework.version>
 	</properties>
-
 	<profiles>
 		<profile>
 			<id>default</id>
@@ -80,9 +72,7 @@
 			<distributionManagement>
 				<site>
 					<id>static.springframework.org</id>
-					<url>
-						scp://static.springframework.org:/var/www/domains/springframework.org/static/htdocs/spring-batch
-					</url>
+					<url> scp://static.springframework.org:/var/www/domains/springframework.org/static/htdocs/spring-batch </url>
 				</site>
 			</distributionManagement>
 		</profile>
@@ -112,6 +102,13 @@
 					<url>http://repository.atlassian.com/maven2</url>
 				</pluginRepository>
 			</pluginRepositories>
+			<repositories>
+				<repository>
+					<id>apache-snapshot</id>
+					<name>Apache Foundation Snapshot Repository</name>
+					<url>http://people.apache.org/maven-snapshot-repository</url>
+				</repository>
+			</repositories>
 			<build>
 				<pluginManagement>
 					<plugins>
@@ -159,8 +156,7 @@
 												<![CDATA[</summary>]]>
 											</footer>
 										</concat>
-										<xslt in="target/site/emma-reports/emma-report.xml"
-											out="target/site/emma-reports/index.html" style="src/main/xsl/emma2html.xsl">
+										<xslt in="target/site/emma-reports/emma-report.xml" out="target/site/emma-reports/index.html" style="src/main/xsl/emma2html.xsl">
 											<param name="project" expression="${project.name}" />
 											<param name="version" expression="${project.version}" />
 										</xslt>
@@ -176,7 +172,6 @@
 			</build>
 		</profile>
 	</profiles>
-
 	<distributionManagement>
 		<downloadUrl>http://www.springframework.org/download</downloadUrl>
 		<site>
@@ -194,7 +189,6 @@
 			<url>s3://maven.springframework.org/snapshot</url>
 		</snapshotRepository>
 	</distributionManagement>
-
 	<build>
 		<extensions>
 			<extension>
@@ -245,8 +239,7 @@
 									</junitreport>
 									<echo>Creating Emma reports</echo>
 									<mkdir dir="target/site/emma-reports" />
-									<xslt includes="target/emma/coverage.xml" destdir="target/emma-reports"
-										style="${project.parent.basedir}/src/main/xsl/emma.xsl">
+									<xslt includes="target/emma/coverage.xml" destdir="target/emma-reports" style="${project.parent.basedir}/src/main/xsl/emma.xsl">
 										<mapper type="glob" from="*.xml" to="*.fragment" />
 										<param name="project" expression="${project.name}" />
 									</xslt>
@@ -341,7 +334,6 @@
 			</plugin>
 		</plugins>
 	</build>
-
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
@@ -537,6 +529,23 @@
 				<artifactId>spring-web</artifactId>
 				<version>${spring.framework.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.ws</groupId>
+				<artifactId>spring-oxm</artifactId>
+				<version>1.0.3</version>
+				<scope>test</scope>
+				<optional>true</optional>
+				<exclusions>
+					<exclusion>
+						<groupId>org.springframework</groupId>
+						<artifactId>spring-beans</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.springframework</groupId>
+						<artifactId>spring-core</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
 			<dependency>
 				<groupId>xerces</groupId>
 				<artifactId>xercesImpl</artifactId>
@@ -545,7 +554,6 @@
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
-
 	<reporting>
 		<excludeDefaults>true</excludeDefaults>
 		<plugins>
@@ -592,7 +600,6 @@
 			</plugin>
 		</plugins>
 	</reporting>
-
 	<developers>
 		<developer>
 			<id>dsyer</id>
@@ -616,7 +623,6 @@
 			<email>robert.kasanicky@accenture.com</email>
 		</developer>
 	</developers>
-
 	<repositories>
 		<repository>
 			<id>spring-release</id>
@@ -633,18 +639,12 @@
 			<name>Spring Portfolio External Repository</name>
 			<url>http://s3.amazonaws.com/maven.springframework.org/external</url>
 		</repository>
-		<repository>
-			<id>apache-snapshot</id>
-			<name>Apache Foundation Snapshot Repository</name>
-			<url>http://people.apache.org/maven-snapshot-repository</url>
-		</repository>
 		<repository>
 			<id>objectstyle</id>
 			<name>ObjectStyle.org Repository</name>
 			<url>http://objectstyle.org/maven2/</url>
 		</repository>
 	</repositories>
-
 	<pluginRepositories>
 		<pluginRepository>
 			<id>spring-external</id>
@@ -661,5 +661,4 @@
 			<url>https://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo-ext</url>
 		</pluginRepository>
 	</pluginRepositories>
-
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-batch-core/pom.xml b/spring-batch-core/pom.xml
index 31e0628ae..ce6db6635 100644
--- a/spring-batch-core/pom.xml
+++ b/spring-batch-core/pom.xml
@@ -248,4 +248,4 @@
 		</plugins>
 	</reporting>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-batch-infrastructure/pom.xml b/spring-batch-infrastructure/pom.xml
index dd3f32158..0badd449c 100644
--- a/spring-batch-infrastructure/pom.xml
+++ b/spring-batch-infrastructure/pom.xml
@@ -1,5 +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">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-batch-infrastructure</artifactId>
 	<packaging>jar</packaging>
@@ -8,14 +8,12 @@
 		<!--  Use CDATA to keep it on a single line in the manifest -->
 		<![CDATA[The Spring Batch Infrastructure is a set of low-level components, interfaces and tools for batch processing applications and optimisations.]]>
 	</description>
-
 	<parent>
 		<groupId>org.springframework.batch</groupId>
 		<artifactId>spring-batch</artifactId>
 		<version>1.0.0.-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
-
 	<profiles>
 		<profile>
 			<id>clover</id>
@@ -38,7 +36,6 @@
 			</reporting>
 		</profile>
 	</profiles>
-
 	<build>
 		<plugins>
 			<plugin>
@@ -56,7 +53,6 @@
 			</plugin>
 		</plugins>
 	</build>
-
 	<dependencies>
 		<dependency>
 			<groupId>junit</groupId>
@@ -134,7 +130,7 @@
 		<dependency>
 			<groupId>org.springframework.ws</groupId>
 			<artifactId>spring-oxm</artifactId>
-			<version>1.0.0</version>
+			<version>1.0.3</version>
 			<optional>true</optional>
 			<exclusions>
 				<exclusion>
@@ -207,7 +203,6 @@
 			<optional>true</optional>
 		</dependency>
 	</dependencies>
-
 	<reporting>
 		<plugins>
 			<plugin>
@@ -216,5 +211,4 @@
 			</plugin>
 		</plugins>
 	</reporting>
-
 </project>
diff --git a/spring-batch-integration/pom.xml b/spring-batch-integration/pom.xml
index 488228307..8505b7f9b 100644
--- a/spring-batch-integration/pom.xml
+++ b/spring-batch-integration/pom.xml
@@ -1,13 +1,10 @@
-<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>
 	<artifactId>spring-batch-integration</artifactId>
 	<packaging>jar</packaging>
 	<name>Integration Tests</name>
-	<description>
-		Integration tests for the Spring Batch Infrastructure
-	</description>
-
+	<description> Integration tests for the Spring Batch Infrastructure </description>
 	<parent>
 		<groupId>org.springframework.batch</groupId>
 		<version>1.0.0.-SNAPSHOT</version>
@@ -15,16 +12,24 @@
 		<relativePath>..</relativePath>
 	</parent>
 
-	<!-- Temporary measure while we get to the bottom of the test failures on Bamboo -->
-	<properties>
-		<maven.test.skip>true</maven.test.skip>
-	</properties>
+	<profiles>
+		<profile>
+			<id>notest</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<properties>
+				<maven.test.skip>true</maven.test.skip>
+			</properties>
+		</profile>
+	</profiles>
 
+	<!-- Temporary measure while we get to the bottom of the test failures on Bamboo -->
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.batch</groupId>
 			<artifactId>spring-batch-infrastructure</artifactId>
-			<version>${project.version}</version>
+			<version>${pom.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>hsqldb</groupId>
@@ -34,11 +39,13 @@
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.derby</groupId>
 			<artifactId>derby</artifactId>
 			<version>10.2.1.6</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.activemq</groupId>
@@ -49,15 +56,25 @@
 					<groupId>commons-logging</groupId>
 					<artifactId>commons-logging</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging-api</artifactId>
+				</exclusion>
 				<exclusion>
 					<groupId>mx4j</groupId>
 					<artifactId>mx4j</artifactId>
 				</exclusion>
 				<exclusion>
 					<groupId>org.apache.geronimo.specs</groupId>
-					<artifactId>
-						geronimo-j2ee-management_1.0_spec
-					</artifactId>
+					<artifactId> geronimo-j2ee-management_1.0_spec </artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.activemq</groupId>
+					<artifactId>activeio-core</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.camel</groupId>
+					<artifactId>camel-core</artifactId>
 				</exclusion>
 			</exclusions>
 			<scope>test</scope>
@@ -89,7 +106,8 @@
 		<dependency>
 			<groupId>org.apache.geronimo.specs</groupId>
 			<artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
-			<version>1.0-M1</version>
+			<version>1.0.1</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>xmlunit</groupId>
@@ -101,19 +119,7 @@
 		<dependency>
 			<groupId>org.springframework.ws</groupId>
 			<artifactId>spring-oxm</artifactId>
-			<version>1.0.0</version>
 			<scope>test</scope>
-			<optional>true</optional>
-			<exclusions>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-beans</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-core</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.castor</groupId>
@@ -132,18 +138,18 @@
 			<groupId>xerces</groupId>
 			<artifactId>xercesImpl</artifactId>
 			<version>2.4.0</version>
-			<optional>true</optional>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>stax</groupId>
 			<artifactId>stax</artifactId>
-			<optional>true</optional>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.thoughtworks.xstream</groupId>
 			<artifactId>xstream</artifactId>
 			<version>1.2.1</version>
-			<optional>true</optional>
+			<scope>test</scope>
 		</dependency>
 <!-- Spring Dependencies -->
 		<dependency>
@@ -166,6 +172,11 @@
 			<artifactId>spring-tx</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-aop</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<!-- Reporting: it doesn't make much sense to have clover or Jdepend reports in this project but they are included by the parent anyway. -->
diff --git a/spring-batch-samples/pom.xml b/spring-batch-samples/pom.xml
index 300a975b1..087acf0a3 100644
--- a/spring-batch-samples/pom.xml
+++ b/spring-batch-samples/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">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-batch-samples</artifactId>
 	<packaging>jar</packaging>
@@ -7,14 +8,12 @@
 		<!--  Use CDATA to keep it on a single line in the manifest -->
 		<![CDATA[Example batch jobs using Spring Batch Core and Execution.]]>
 	</description>
-
 	<parent>
 		<groupId>org.springframework.batch</groupId>
 		<artifactId>spring-batch</artifactId>
 		<version>1.0.0.-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
-
 	<profiles>
 		<profile>
 			<id>clover</id>
@@ -37,7 +36,6 @@
 			</reporting>
 		</profile>
 	</profiles>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.batch</groupId>
@@ -92,6 +90,12 @@
 			<artifactId>aspectjweaver</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<version>5.1.6</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
@@ -237,7 +241,6 @@
 			<optional>true</optional>
 		</dependency>
 	</dependencies>
-
 	<build>
 		<plugins>
 			<plugin>
@@ -345,4 +348,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
\ No newline at end of file
+</project>