From e03e7ca6438c8513ab8044dc357d08829e526240 Mon Sep 17 00:00:00 2001
From: nebhale <nebhale@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Thu, 27 Sep 2007 15:31:55 +0000
Subject: [PATCH] [maven-release-plugin] prepare release spring-batch-1.0-m2

---
 core/pom.xml           |    5 +-
 docs/pom.xml           |    8 +-
 execution/pom.xml      |  451 ++++++++----------
 infrastructure/pom.xml |    5 +-
 integration/pom.xml    |  278 ++++++-----
 pom.xml                | 1030 ++++++++++++++++++++--------------------
 samples/pom.xml        |  308 ++++++------
 7 files changed, 1008 insertions(+), 1077 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index c20936443..e5361af3f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1,5 +1,4 @@
-<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-core</artifactId>
@@ -13,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.batch</groupId>
 		<artifactId>spring-batch</artifactId>
-		<version>1.0-m2-SNAPSHOT</version>
+		<version>1.0-m2</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/docs/pom.xml b/docs/pom.xml
index 63d988dce..728a32fd6 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -1,5 +1,4 @@
-<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-docs</artifactId>
@@ -10,7 +9,7 @@
 	<parent>
 		<groupId>org.springframework.batch</groupId>
 		<artifactId>spring-batch</artifactId>
-		<version>1.0-m2-SNAPSHOT</version>
+		<version>1.0-m2</version>
 		<relativePath>..</relativePath>
 	</parent>
 
@@ -60,8 +59,7 @@
 										<include name="**/*.jpg" />
 									</fileset>
 								</copy>
-								<move file="${basedir}/target/site/reference/pdf/index.pdf"
-									tofile="${basedir}/target/site/reference/pdf/${artifactId}.pdf" failonerror="false" />
+								<move file="${basedir}/target/site/reference/pdf/index.pdf" tofile="${basedir}/target/site/reference/pdf/${artifactId}.pdf" failonerror="false" />
 							</postProcess>
 						</configuration>
 						<phase>pre-site</phase>
diff --git a/execution/pom.xml b/execution/pom.xml
index 3371f3eba..657c3658f 100644
--- a/execution/pom.xml
+++ b/execution/pom.xml
@@ -1,250 +1,201 @@
-<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-execution</artifactId>
-	<packaging>jar</packaging>
-	<name>Execution</name>
-	<description>
-		<!--  Use CDATA to keep it on a single line in the manifest -->
-		<![CDATA[Execution tools and implementations of Spring Batch Core interfaces]]>
-	</description>
-
-	<parent>
-		<groupId>org.springframework.batch</groupId>
-		<artifactId>spring-batch</artifactId>
-		<version>1.0-m2-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.batch</groupId>
-			<artifactId>spring-batch-core</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>hsqldb</groupId>
-			<artifactId>hsqldb</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>easymock</groupId>
-			<artifactId>easymock</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-		</dependency>
-		<dependency>
-			<!-- Needed by Hibernate if JTA is excluded -->
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-jta_1.1_spec</artifactId>
-			<version>1.1</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<!-- Force Hibernate to use a particular nodep version of cglib in case of clash with Spring AOP -->
-			<groupId>cglib</groupId>
-			<artifactId>cglib-nodep</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate</artifactId>
-			<optional>true</optional>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>generate-sql</id>
-						<phase>generate-sources</phase>
-						<configuration>
-							<tasks>
-								<typedef
-									resource="foundrylogic/vpp/typedef.properties" />
-								<taskdef
-									resource="foundrylogic/vpp/taskdef.properties" />
-								<!-- Scripts for DAO tests - N.B. under source control. -->
-								<vppcopy
-									todir="${basedir}/src/test/resources/org/springframework/batch/execution/repository/dao"
-									overwrite="true">
-									<config>
-										<context>
-											<property key="includes"
-												value="src/main/sql" />
-											<property
-												file="${basedir}/src/main/sql/hsqldb.properties" />
-										</context>
-										<engine>
-											<property
-												key="velocimacro.library" value="src/main/sql/hsqldb.vpp" />
-										</engine>
-									</config>
-									<fileset
-										dir="${basedir}/src/main/sql" includes="*.sql.vpp"
-										excludes="schema*" />
-									<mapper type="glob" from="*.sql.vpp"
-										to="*.sql" />
-								</vppcopy>
-								<!-- Reference script for HSQLDB - N.B. not under source control, but packagaed in jar. -->
-								<vppcopy
-									todir="${basedir}/target/generated-resources"
-									overwrite="true">
-									<config>
-										<context>
-											<property key="includes"
-												value="src/main/sql" />
-											<property
-												file="${basedir}/src/main/sql/hsqldb.properties" />
-										</context>
-										<engine>
-											<property
-												key="velocimacro.library" value="src/main/sql/hsqldb.vpp" />
-										</engine>
-									</config>
-									<fileset
-										dir="${basedir}/src/main/sql" includes="schema.sql.vpp" />
-									<mapper type="glob" from="*.sql.vpp"
-										to="*-hsqldb.sql" />
-								</vppcopy>
-								<!-- Reference script for DB2 - N.B. not under source control, but packagaed in jar. -->
-								<vppcopy
-									todir="${basedir}/target/generated-resources"
-									overwrite="true">
-									<config>
-										<context>
-											<property key="includes"
-												value="src/main/sql" />
-											<property
-												file="${basedir}/src/main/sql/db2.properties" />
-										</context>
-										<engine>
-											<property
-												key="velocimacro.library" value="src/main/sql/db2.vpp" />
-										</engine>
-									</config>
-									<fileset
-										dir="${basedir}/src/main/sql" includes="schema.sql.vpp" />
-									<mapper type="glob" from="*.sql.vpp"
-										to="*-db2.sql" />
-								</vppcopy>
-								<!-- Reference script for Derby - N.B. not under source control, but packagaed in jar. -->
-								<vppcopy
-									todir="${basedir}/target/generated-resources"
-									overwrite="true">
-									<config>
-										<context>
-											<property key="includes"
-												value="src/main/sql" />
-											<property
-												file="${basedir}/src/main/sql/derby.properties" />
-										</context>
-										<engine>
-											<property
-												key="velocimacro.library" value="src/main/sql/derby.vpp" />
-										</engine>
-									</config>
-									<fileset
-										dir="${basedir}/src/main/sql" includes="schema.sql.vpp" />
-									<mapper type="glob" from="*.sql.vpp"
-										to="*-derby.sql" />
-								</vppcopy>
-								<!-- Reference script for Oracle - N.B. not under source control, but packagaed in jar. -->
-								<vppcopy
-									todir="${basedir}/target/generated-resources"
-									overwrite="true">
-									<config>
-										<context>
-											<property key="includes"
-												value="src/main/sql" />
-											<property
-												file="${basedir}/src/main/sql/oracle10g.properties" />
-										</context>
-										<engine>
-											<property
-												key="velocimacro.library"
-												value="src/main/sql/oracle10g.vpp" />
-										</engine>
-									</config>
-									<fileset
-										dir="${basedir}/src/main/sql" includes="schema.sql.vpp" />
-									<mapper type="glob" from="*.sql.vpp"
-										to="*-oracle10g.sql" />
-								</vppcopy>
-								<!-- Reference script for PostgreSQL - N.B. not under source control, but packagaed in jar. -->
-								<vppcopy
-									todir="${basedir}/target/generated-resources"
-									overwrite="true">
-									<config>
-										<context>
-											<property key="includes"
-												value="src/main/sql" />
-											<property
-												file="${basedir}/src/main/sql/postgresql.properties" />
-										</context>
-										<engine>
-											<property
-												key="velocimacro.library"
-												value="src/main/sql/postgresql.vpp" />
-										</engine>
-									</config>
-									<fileset
-										dir="${basedir}/src/main/sql" includes="schema.sql.vpp" />
-									<mapper type="glob" from="*.sql.vpp"
-										to="*-postgresql.sql" />
-								</vppcopy>
-							</tasks>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-clover-plugin</artifactId>
-				<configuration>
-					<licenseLocation>
-						${basedir}/src/test/resources/clover.license
-					</licenseLocation>
-				</configuration>
-				<executions>
-					<execution>
-						<phase>pre-site</phase>
-						<goals>
-							<goal>instrument</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-	<reporting>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-clover-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</reporting>
-
-</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">
+
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>spring-batch-execution</artifactId>
+	<packaging>jar</packaging>
+	<name>Execution</name>
+	<description>
+		<!--  Use CDATA to keep it on a single line in the manifest -->
+		<![CDATA[Execution tools and implementations of Spring Batch Core interfaces]]>
+	</description>
+
+	<parent>
+		<groupId>org.springframework.batch</groupId>
+		<artifactId>spring-batch</artifactId>
+		<version>1.0-m2</version>
+		<relativePath>..</relativePath>
+	</parent>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.batch</groupId>
+			<artifactId>spring-batch-core</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-test</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>hsqldb</groupId>
+			<artifactId>hsqldb</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>easymock</groupId>
+			<artifactId>easymock</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+		</dependency>
+		<dependency>
+			<!-- Needed by Hibernate if JTA is excluded -->
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-jta_1.1_spec</artifactId>
+			<version>1.1</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<!-- Force Hibernate to use a particular nodep version of cglib in case of clash with Spring AOP -->
+			<groupId>cglib</groupId>
+			<artifactId>cglib-nodep</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate</artifactId>
+			<optional>true</optional>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>generate-sql</id>
+						<phase>generate-sources</phase>
+						<configuration>
+							<tasks>
+								<typedef resource="foundrylogic/vpp/typedef.properties" />
+								<taskdef resource="foundrylogic/vpp/taskdef.properties" />
+								<!-- Scripts for DAO tests - N.B. under source control. -->
+								<vppcopy todir="${basedir}/src/test/resources/org/springframework/batch/execution/repository/dao" overwrite="true">
+									<config>
+										<context>
+											<property key="includes" value="src/main/sql" />
+											<property file="${basedir}/src/main/sql/hsqldb.properties" />
+										</context>
+										<engine>
+											<property key="velocimacro.library" value="src/main/sql/hsqldb.vpp" />
+										</engine>
+									</config>
+									<fileset dir="${basedir}/src/main/sql" includes="*.sql.vpp" excludes="schema*" />
+									<mapper type="glob" from="*.sql.vpp" to="*.sql" />
+								</vppcopy>
+								<!-- Reference script for HSQLDB - N.B. not under source control, but packagaed in jar. -->
+								<vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
+									<config>
+										<context>
+											<property key="includes" value="src/main/sql" />
+											<property file="${basedir}/src/main/sql/hsqldb.properties" />
+										</context>
+										<engine>
+											<property key="velocimacro.library" value="src/main/sql/hsqldb.vpp" />
+										</engine>
+									</config>
+									<fileset dir="${basedir}/src/main/sql" includes="schema.sql.vpp" />
+									<mapper type="glob" from="*.sql.vpp" to="*-hsqldb.sql" />
+								</vppcopy>
+								<!-- Reference script for DB2 - N.B. not under source control, but packagaed in jar. -->
+								<vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
+									<config>
+										<context>
+											<property key="includes" value="src/main/sql" />
+											<property file="${basedir}/src/main/sql/db2.properties" />
+										</context>
+										<engine>
+											<property key="velocimacro.library" value="src/main/sql/db2.vpp" />
+										</engine>
+									</config>
+									<fileset dir="${basedir}/src/main/sql" includes="schema.sql.vpp" />
+									<mapper type="glob" from="*.sql.vpp" to="*-db2.sql" />
+								</vppcopy>
+								<!-- Reference script for Derby - N.B. not under source control, but packagaed in jar. -->
+								<vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
+									<config>
+										<context>
+											<property key="includes" value="src/main/sql" />
+											<property file="${basedir}/src/main/sql/derby.properties" />
+										</context>
+										<engine>
+											<property key="velocimacro.library" value="src/main/sql/derby.vpp" />
+										</engine>
+									</config>
+									<fileset dir="${basedir}/src/main/sql" includes="schema.sql.vpp" />
+									<mapper type="glob" from="*.sql.vpp" to="*-derby.sql" />
+								</vppcopy>
+								<!-- Reference script for Oracle - N.B. not under source control, but packagaed in jar. -->
+								<vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
+									<config>
+										<context>
+											<property key="includes" value="src/main/sql" />
+											<property file="${basedir}/src/main/sql/oracle10g.properties" />
+										</context>
+										<engine>
+											<property key="velocimacro.library" value="src/main/sql/oracle10g.vpp" />
+										</engine>
+									</config>
+									<fileset dir="${basedir}/src/main/sql" includes="schema.sql.vpp" />
+									<mapper type="glob" from="*.sql.vpp" to="*-oracle10g.sql" />
+								</vppcopy>
+								<!-- Reference script for PostgreSQL - N.B. not under source control, but packagaed in jar. -->
+								<vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
+									<config>
+										<context>
+											<property key="includes" value="src/main/sql" />
+											<property file="${basedir}/src/main/sql/postgresql.properties" />
+										</context>
+										<engine>
+											<property key="velocimacro.library" value="src/main/sql/postgresql.vpp" />
+										</engine>
+									</config>
+									<fileset dir="${basedir}/src/main/sql" includes="schema.sql.vpp" />
+									<mapper type="glob" from="*.sql.vpp" to="*-postgresql.sql" />
+								</vppcopy>
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-clover-plugin</artifactId>
+				<configuration>
+					<licenseLocation>
+						${basedir}/src/test/resources/clover.license
+					</licenseLocation>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>pre-site</phase>
+						<goals>
+							<goal>instrument</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-clover-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</reporting>
+
+</project>
\ No newline at end of file
diff --git a/infrastructure/pom.xml b/infrastructure/pom.xml
index 5ab7c898f..0f7a38206 100644
--- a/infrastructure/pom.xml
+++ b/infrastructure/pom.xml
@@ -1,5 +1,4 @@
-<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>
@@ -13,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.batch</groupId>
 		<artifactId>spring-batch</artifactId>
-		<version>1.0-m2-SNAPSHOT</version>
+		<version>1.0-m2</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/integration/pom.xml b/integration/pom.xml
index 354acd2c7..24aeb7fcf 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -1,140 +1,138 @@
-<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>
-
-	<parent>
-		<groupId>org.springframework.batch</groupId>
-		<version>1.0-m2-SNAPSHOT</version>
-		<artifactId>spring-batch</artifactId>
-		<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>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.batch</groupId>
-			<artifactId>spring-batch-infrastructure</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>hsqldb</groupId>
-			<artifactId>hsqldb</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.derby</groupId>
-			<artifactId>derby</artifactId>
-			<version>10.2.1.6</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.activemq</groupId>
-			<artifactId>activemq-core</artifactId>
-			<version>5.0-SNAPSHOT-10</version>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</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>
-				</exclusion>
-			</exclusions>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>easymock</groupId>
-			<artifactId>easymock</artifactId>
-		</dependency>
-		<dependency>
-			<!-- This is just for the JMS spec - could use javax.jms -->
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-jms_1.1_spec</artifactId>
-			<version>1.0</version>
-			<exclusions>
-				<exclusion>
-					<groupId>mockobjects</groupId>
-					<artifactId>mockobjects-jdk1.4-j2ee1.3</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>mockobjects</groupId>
-					<artifactId>mockobjects-core</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>xmlunit</groupId>
-			<artifactId>xmlunit</artifactId>
-			<version>1.1</version>
-			<scope>test</scope>
-			<optional>true</optional>
-		</dependency>
-		<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>
-			<artifactId>castor</artifactId>
-			<version>1.1.2</version>
-			<scope>test</scope>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>stax</groupId>
-			<artifactId>stax</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.thoughtworks.xstream</groupId>
-			<artifactId>xstream</artifactId>
-			<version>1.2.1</version>
-			<optional>true</optional>
-		</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. -->
-</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">
+
+	<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>
+
+	<parent>
+		<groupId>org.springframework.batch</groupId>
+		<version>1.0-m2</version>
+		<artifactId>spring-batch</artifactId>
+		<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>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.batch</groupId>
+			<artifactId>spring-batch-infrastructure</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-test</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>hsqldb</groupId>
+			<artifactId>hsqldb</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.derby</groupId>
+			<artifactId>derby</artifactId>
+			<version>10.2.1.6</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.activemq</groupId>
+			<artifactId>activemq-core</artifactId>
+			<version>5.0-SNAPSHOT-10</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</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>
+				</exclusion>
+			</exclusions>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>easymock</groupId>
+			<artifactId>easymock</artifactId>
+		</dependency>
+		<dependency>
+			<!-- This is just for the JMS spec - could use javax.jms -->
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-jms_1.1_spec</artifactId>
+			<version>1.0</version>
+			<exclusions>
+				<exclusion>
+					<groupId>mockobjects</groupId>
+					<artifactId>mockobjects-jdk1.4-j2ee1.3</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>mockobjects</groupId>
+					<artifactId>mockobjects-core</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>xmlunit</groupId>
+			<artifactId>xmlunit</artifactId>
+			<version>1.1</version>
+			<scope>test</scope>
+			<optional>true</optional>
+		</dependency>
+		<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>
+			<artifactId>castor</artifactId>
+			<version>1.1.2</version>
+			<scope>test</scope>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>stax</groupId>
+			<artifactId>stax</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.thoughtworks.xstream</groupId>
+			<artifactId>xstream</artifactId>
+			<version>1.2.1</version>
+			<optional>true</optional>
+		</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. -->
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 448f9d0a8..27843e81e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,521 +1,509 @@
-<?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">
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework.batch</groupId>
-	<artifactId>spring-batch</artifactId>
-	<name>Spring Batch</name>
-	<description>
-		<!--  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 optimisation for repetitive processing in a transactional environment. Spring Batch is part of the Spring Portfolio.]]>
-	</description>
-	<version>1.0-m2-SNAPSHOT</version>
-	<packaging>pom</packaging>
-	<url>http://static.springframework.org/spring-batch</url>
-	<organization>
-		<name>Interface 21</name>
-		<url>http://www.interface21.com</url>
-	</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>
-		<developerConnection>
-			scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-batch/trunk
-		</developerConnection>
-	</scm>
-	<issueManagement>
-		<system>JIRA</system>
-		<url>
-			http://opensource.atlassian.com/projects/spring/browse/BATCH
-		</url>
-	</issueManagement>
-	<mailingLists>
-		<mailingList>
-			<name>Spring Batch Forum</name>
-			<post>
-				http://forum.springframework.org/forumdisplay.php?f=41
-			</post>
-			<archive>
-				http://forum.springframework.org/forumdisplay.php?f=41
-			</archive>
-		</mailingList>
-		<mailingList>
-			<subscribe>
-				http://lists.interface21.com/listmanager/listinfo/spring-batch-announce
-			</subscribe>
-			<unsubscribe>
-				http://lists.interface21.com/listmanager/listinfo/spring-batch-announce
-			</unsubscribe>
-			<name>Spring Batch Announce</name>
-			<archive>
-				http://lists.interface21.com/archives/spring-batch-announce
-			</archive>
-		</mailingList>
-	</mailingLists>
-	<ciManagement>
-		<system>Bamboo</system>
-		<url>
-			http://build.springframework.org:8085/bamboo/browse/BATCH
-		</url>
-	</ciManagement>
-	<licenses>
-		<license>
-			<name>Apache 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-		</license>
-	</licenses>
-
-	<properties>
-		<maven.test.failure.ignore>true</maven.test.failure.ignore>
-	</properties>
-
-	<modules>
-		<module>infrastructure</module>
-		<module>core</module>
-		<module>execution</module>
-		<module>samples</module>
-		<module>integration</module>
-		<module>docs</module>
-	</modules>
-
-	<profiles>
-		<profile>
-			<id>default</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-		</profile>
-		<profile>
-			<id>deployment</id>
-			<distributionManagement>
-				<site>
-					<id>static.springframework.org</id>
-					<url>
-						scp://static.springframework.org:/var/www/domains/springframework.org/static/htdocs/spring-batch
-					</url>
-				</site>
-			</distributionManagement>
-		</profile>
-		<profile>
-			<id>strict</id>
-			<properties>
-				<maven.test.failure.ignore>
-					false
-				</maven.test.failure.ignore>
-			</properties>
-		</profile>
-		<profile>
-			<id>fast</id>
-			<properties>
-				<maven.test.skip>true</maven.test.skip>
-			</properties>
-		</profile>
-		<profile>
-			<id>snapshots</id>
-			<pluginRepositories>
-				<pluginRepository>
-					<id>apache-snapshots</id>
-					<url>
-						http://people.apache.org/maven-snapshot-repository
-					</url>
-				</pluginRepository>
-			</pluginRepositories>
-		</profile>
-	</profiles>
-
-	<distributionManagement>
-		<downloadUrl>
-			http://www.springframework.org/spring-batch
-		</downloadUrl>
-		<site>
-			<id>staging</id>
-			<url>file:///${user.dir}/target/staging</url>
-		</site>
-		<repository>
-			<id>local</id>
-			<url>file:///${user.dir}/target/staging</url>
-		</repository>
-		<snapshotRepository>
-			<id>spring-snapshot</id>
-			<name>Spring Snapshot Repository</name>
-			<url>s3://maven.springframework.org/snapshot</url>
-		</snapshotRepository>
-	</distributionManagement>
-
-	<build>
-		<extensions>
-			<extension>
-				<groupId>org.springframework.aws</groupId>
-				<artifactId>spring-aws-maven</artifactId>
-				<version>1.2</version>
-			</extension>
-		</extensions>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.4</source>
-					<target>1.4</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>attach-sources</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.3</version>
-				<configuration>
-					<!--forkMode>pertest</forkMode-->
-					<includes>
-						<include>**/*Tests.java</include>
-					</includes>
-					<excludes>
-						<exclude>**/Abstract*.java</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>junitreport</id>
-						<phase>site</phase>
-						<configuration>
-							<tasks>
-								<echo>Creating JUnit reports</echo>
-								<mkdir dir="target/surefire-reports" />
-								<junitreport
-									todir="target/surefire-reports">
-									<fileset
-										dir="target/surefire-reports">
-										<include name="TEST-*.xml" />
-									</fileset>
-									<report
-										todir="target/site/junit-reports" />
-								</junitreport>
-							</tasks>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>cleandata</id>
-						<phase>pre-site</phase>
-						<configuration>
-							<tasks>
-								<echo>Removing test data</echo>
-								<delete failonerror="false">
-									<fileset dir="amqstore" />
-									<fileset dir="activemq-data" />
-									<fileset dir="derby-home" />
-								</delete>
-							</tasks>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-				<dependencies>
-					<dependency>
-						<groupId>ant</groupId>
-						<artifactId>ant-junit</artifactId>
-						<version>1.6.5</version>
-					</dependency>
-					<dependency>
-						<groupId>foundrylogic.vpp</groupId>
-						<artifactId>vpp</artifactId>
-						<version>2.2.1</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-			<plugin>
-				<artifactId>maven-clean-plugin</artifactId>
-				<configuration>
-					<filesets>
-						<fileset>
-							<directory>${basedir}</directory>
-							<includes>
-								<include>activemq-data</include>
-								<include>derby-home</include>
-								<include>amqstore</include>
-								<include>.clover</include>
-								<include>surefire*</include>
-							</includes>
-							<followSymlinks>false</followSymlinks>
-						</fileset>
-					</filesets>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>aspectj</groupId>
-				<artifactId>aspectjrt</artifactId>
-				<version>1.5.3</version>
-			</dependency>
-			<dependency>
-				<groupId>junit</groupId>
-				<artifactId>junit</artifactId>
-				<version>3.8.1</version>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.hibernate</groupId>
-				<artifactId>hibernate</artifactId>
-				<version>3.2.3.ga</version>
-				<exclusions>
-					<exclusion>
-						<groupId>commons-logging</groupId>
-						<artifactId>commons-logging</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>javax.transaction</groupId>
-						<artifactId>jta</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>cglib</groupId>
-						<artifactId>cglib</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>net.sf.ehcache</groupId>
-						<artifactId>ehcache</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>asm</groupId>
-						<artifactId>asm-attrs</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>asm</groupId>
-						<artifactId>asm</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>cglib</groupId>
-				<artifactId>cglib-nodep</artifactId>
-				<version>2.1_3</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring</artifactId>
-				<version>2.1-m4</version>
-			</dependency>
-			<dependency>
-				<groupId>commons-logging</groupId>
-				<artifactId>commons-logging</artifactId>
-				<version>1.1</version>
-				<exclusions>
-					<exclusion>
-						<groupId>avalon-framework</groupId>
-						<artifactId>avalon-framework</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>logkit</groupId>
-						<artifactId>logkit</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>javax.servlet</groupId>
-						<artifactId>servlet-api</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>commons-lang</groupId>
-				<artifactId>commons-lang</artifactId>
-				<version>2.1</version>
-			</dependency>
-			<dependency>
-				<groupId>commons-io</groupId>
-				<artifactId>commons-io</artifactId>
-				<version>1.2</version>
-			</dependency>
-			<dependency>
-				<groupId>hsqldb</groupId>
-				<artifactId>hsqldb</artifactId>
-				<version>1.8.0.7</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-test</artifactId>
-				<version>2.1-m4</version>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>easymock</groupId>
-				<artifactId>easymock</artifactId>
-				<version>1.1</version>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>com.thoughtworks.xstream</groupId>
-				<artifactId>xstream</artifactId>
-				<version>1.2.1</version>
-				<optional>true</optional>
-			</dependency>
-			<dependency>
-				<groupId>stax</groupId>
-				<artifactId>stax</artifactId>
-				<version>1.2.0</version>
-				<optional>true</optional>
-			</dependency>
-			<dependency>
-				<groupId>commons-dbcp</groupId>
-				<artifactId>commons-dbcp</artifactId>
-				<version>1.2.1</version>
-				<exclusions>
-					<exclusion>
-						<groupId>commons-collections</groupId>
-						<artifactId>commons-collections</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-
-	<repositories>
-		<repository>
-			<id>spring-milestone</id>
-			<name>Spring Portfolio Milestone Repository</name>
-			<url>http://s3.amazonaws.com/maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<id>spring-external</id>
-			<name>Spring Portfolio Milestone 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>
-	</repositories>
-
-	<pluginRepositories>
-		<pluginRepository>
-			<id>spring-external</id>
-			<name>Spring Portfolio Milestone Repository</name>
-			<url>http://s3.amazonaws.com/maven.springframework.org/external</url>
-		</pluginRepository>
-		<pluginRepository>
-			<id>objectstyle</id>
-			<url>http://objectstyle.org/maven2</url>
-		</pluginRepository>
-	</pluginRepositories>
-
-	<reporting>
-		<excludeDefaults>true</excludeDefaults>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-report-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>com.interface21.maven</groupId>
-				<artifactId>maven-external-report-plugin</artifactId>
-				<version>1.0</version>
-				<configuration>
-					<name>JUnit Report</name>
-					<description>
-						JUnit test results for this project
-					</description>
-					<base>junit-reports</base>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>jdepend-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<configuration>
-					<links>
-						<link>
-							http://java.sun.com/j2ee/1.4/docs/api
-						</link>
-						<link>
-							http://java.sun.com/j2se/1.5.0/docs/api
-						</link>
-						<link>
-							http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/
-						</link>
-						<link>
-							http://jakarta.apache.org/commons/dbcp/apidocs/
-						</link>
-						<link>
-							http://jakarta.apache.org/commons/fileupload/apidocs/
-						</link>
-						<link>
-							http://jakarta.apache.org/commons/httpclient/apidocs/
-						</link>
-						<link>
-							http://jakarta.apache.org/commons/logging/api/
-						</link>
-						<link>
-							http://jakarta.apache.org/commons/pool/apidocs/
-						</link>
-						<link>http://www.junit.org/junit/javadoc/</link>
-						<link>
-							http://logging.apache.org/log4j/docs/api/
-						</link>
-						<link>
-							http://jakarta.apache.org/regexp/apidocs/
-						</link>
-						<link>
-							http://jakarta.apache.org/velocity/api/
-						</link>
-						<link>
-							http://static.springframework.org/spring/docs/2.1.x/api/
-						</link>
-						<link>
-							http://static.springframework.org/spring-batch/spring-batch-infrastructure/apidocs/
-						</link>
-						<link>
-							http://static.springframework.org/spring-batch/spring-batch-core/apidocs/
-						</link>
-						<link>
-							http://static.springframework.org/spring-batch/spring-batch-execution/apidocs/
-						</link>
-					</links>
-					<aggregate>true</aggregate>
-				</configuration>
-			</plugin>
-		</plugins>
-	</reporting>
-
-	<developers>
-		<developer>
-			<id>dsyer</id>
-			<name>Dave Syer</name>
-			<email>dsyer@interface21.com</email>
-		</developer>
-		<developer>
-			<id>lward</id>
-			<name>Lucas Ward</name>
-			<email>lucas.l.ward@accenture.com</email>
-		</developer>
-	</developers>
-
-</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">
+
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.springframework.batch</groupId>
+	<artifactId>spring-batch</artifactId>
+	<name>Spring Batch</name>
+	<description>
+		<!--  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 optimisation for repetitive processing in a transactional environment. Spring Batch is part of the Spring Portfolio.]]>
+	</description>
+	<version>1.0-m2</version>
+	<packaging>pom</packaging>
+	<url>http://static.springframework.org/spring-batch</url>
+	<organization>
+		<name>Interface 21</name>
+		<url>http://www.interface21.com</url>
+	</organization>
+	<scm>
+		<url>http://fisheye3.cenqua.com/browse/springframework/spring-batch/tags/spring-batch-1.0-m2</url>
+		<connection>scm:svn:http://springframework.svn.sourceforge.net/svnroot/springframework/spring-batch/tags/spring-batch-1.0-m2</connection>
+		<developerConnection>scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-batch/tags/spring-batch-1.0-m2</developerConnection>
+	</scm>
+	<issueManagement>
+		<system>JIRA</system>
+		<url>
+			http://opensource.atlassian.com/projects/spring/browse/BATCH
+		</url>
+	</issueManagement>
+	<mailingLists>
+		<mailingList>
+			<name>Spring Batch Forum</name>
+			<post>
+				http://forum.springframework.org/forumdisplay.php?f=41
+			</post>
+			<archive>
+				http://forum.springframework.org/forumdisplay.php?f=41
+			</archive>
+		</mailingList>
+		<mailingList>
+			<subscribe>
+				http://lists.interface21.com/listmanager/listinfo/spring-batch-announce
+			</subscribe>
+			<unsubscribe>
+				http://lists.interface21.com/listmanager/listinfo/spring-batch-announce
+			</unsubscribe>
+			<name>Spring Batch Announce</name>
+			<archive>
+				http://lists.interface21.com/archives/spring-batch-announce
+			</archive>
+		</mailingList>
+	</mailingLists>
+	<ciManagement>
+		<system>Bamboo</system>
+		<url>
+			http://build.springframework.org:8085/bamboo/browse/BATCH
+		</url>
+	</ciManagement>
+	<licenses>
+		<license>
+			<name>Apache 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+		</license>
+	</licenses>
+
+	<properties>
+		<maven.test.failure.ignore>true</maven.test.failure.ignore>
+	</properties>
+
+	<modules>
+		<module>infrastructure</module>
+		<module>core</module>
+		<module>execution</module>
+		<module>samples</module>
+		<module>integration</module>
+		<module>docs</module>
+	</modules>
+
+	<profiles>
+		<profile>
+			<id>default</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+		</profile>
+		<profile>
+			<id>deployment</id>
+			<distributionManagement>
+				<site>
+					<id>static.springframework.org</id>
+					<url>
+						scp://static.springframework.org:/var/www/domains/springframework.org/static/htdocs/spring-batch
+					</url>
+				</site>
+			</distributionManagement>
+		</profile>
+		<profile>
+			<id>strict</id>
+			<properties>
+				<maven.test.failure.ignore>
+					false
+				</maven.test.failure.ignore>
+			</properties>
+		</profile>
+		<profile>
+			<id>fast</id>
+			<properties>
+				<maven.test.skip>true</maven.test.skip>
+			</properties>
+		</profile>
+		<profile>
+			<id>snapshots</id>
+			<pluginRepositories>
+				<pluginRepository>
+					<id>apache-snapshots</id>
+					<url>
+						http://people.apache.org/maven-snapshot-repository
+					</url>
+				</pluginRepository>
+			</pluginRepositories>
+		</profile>
+	</profiles>
+
+	<distributionManagement>
+		<downloadUrl>
+			http://www.springframework.org/spring-batch
+		</downloadUrl>
+		<site>
+			<id>staging</id>
+			<url>file:///${user.dir}/target/staging</url>
+		</site>
+		<repository>
+			<id>local</id>
+			<url>file:///${user.dir}/target/staging</url>
+		</repository>
+		<snapshotRepository>
+			<id>spring-snapshot</id>
+			<name>Spring Snapshot Repository</name>
+			<url>s3://maven.springframework.org/snapshot</url>
+		</snapshotRepository>
+	</distributionManagement>
+
+	<build>
+		<extensions>
+			<extension>
+				<groupId>org.springframework.aws</groupId>
+				<artifactId>spring-aws-maven</artifactId>
+				<version>1.2</version>
+			</extension>
+		</extensions>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.4</source>
+					<target>1.4</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.3</version>
+				<configuration>
+					<!--forkMode>pertest</forkMode-->
+					<includes>
+						<include>**/*Tests.java</include>
+					</includes>
+					<excludes>
+						<exclude>**/Abstract*.java</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>junitreport</id>
+						<phase>site</phase>
+						<configuration>
+							<tasks>
+								<echo>Creating JUnit reports</echo>
+								<mkdir dir="target/surefire-reports" />
+								<junitreport todir="target/surefire-reports">
+									<fileset dir="target/surefire-reports">
+										<include name="TEST-*.xml" />
+									</fileset>
+									<report todir="target/site/junit-reports" />
+								</junitreport>
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>cleandata</id>
+						<phase>pre-site</phase>
+						<configuration>
+							<tasks>
+								<echo>Removing test data</echo>
+								<delete failonerror="false">
+									<fileset dir="amqstore" />
+									<fileset dir="activemq-data" />
+									<fileset dir="derby-home" />
+								</delete>
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>ant</groupId>
+						<artifactId>ant-junit</artifactId>
+						<version>1.6.5</version>
+					</dependency>
+					<dependency>
+						<groupId>foundrylogic.vpp</groupId>
+						<artifactId>vpp</artifactId>
+						<version>2.2.1</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+			<plugin>
+				<artifactId>maven-clean-plugin</artifactId>
+				<configuration>
+					<filesets>
+						<fileset>
+							<directory>${basedir}</directory>
+							<includes>
+								<include>activemq-data</include>
+								<include>derby-home</include>
+								<include>amqstore</include>
+								<include>.clover</include>
+								<include>surefire*</include>
+							</includes>
+							<followSymlinks>false</followSymlinks>
+						</fileset>
+					</filesets>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>aspectj</groupId>
+				<artifactId>aspectjrt</artifactId>
+				<version>1.5.3</version>
+			</dependency>
+			<dependency>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<version>3.8.1</version>
+				<scope>test</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.hibernate</groupId>
+				<artifactId>hibernate</artifactId>
+				<version>3.2.3.ga</version>
+				<exclusions>
+					<exclusion>
+						<groupId>commons-logging</groupId>
+						<artifactId>commons-logging</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>javax.transaction</groupId>
+						<artifactId>jta</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>cglib</groupId>
+						<artifactId>cglib</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>net.sf.ehcache</groupId>
+						<artifactId>ehcache</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>asm</groupId>
+						<artifactId>asm-attrs</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>asm</groupId>
+						<artifactId>asm</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+			<dependency>
+				<groupId>cglib</groupId>
+				<artifactId>cglib-nodep</artifactId>
+				<version>2.1_3</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring</artifactId>
+				<version>2.1-m4</version>
+			</dependency>
+			<dependency>
+				<groupId>commons-logging</groupId>
+				<artifactId>commons-logging</artifactId>
+				<version>1.1</version>
+				<exclusions>
+					<exclusion>
+						<groupId>avalon-framework</groupId>
+						<artifactId>avalon-framework</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>logkit</groupId>
+						<artifactId>logkit</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>javax.servlet</groupId>
+						<artifactId>servlet-api</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+			<dependency>
+				<groupId>commons-lang</groupId>
+				<artifactId>commons-lang</artifactId>
+				<version>2.1</version>
+			</dependency>
+			<dependency>
+				<groupId>commons-io</groupId>
+				<artifactId>commons-io</artifactId>
+				<version>1.2</version>
+			</dependency>
+			<dependency>
+				<groupId>hsqldb</groupId>
+				<artifactId>hsqldb</artifactId>
+				<version>1.8.0.7</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-test</artifactId>
+				<version>2.1-m4</version>
+				<scope>test</scope>
+			</dependency>
+			<dependency>
+				<groupId>easymock</groupId>
+				<artifactId>easymock</artifactId>
+				<version>1.1</version>
+				<scope>test</scope>
+			</dependency>
+			<dependency>
+				<groupId>com.thoughtworks.xstream</groupId>
+				<artifactId>xstream</artifactId>
+				<version>1.2.1</version>
+				<optional>true</optional>
+			</dependency>
+			<dependency>
+				<groupId>stax</groupId>
+				<artifactId>stax</artifactId>
+				<version>1.2.0</version>
+				<optional>true</optional>
+			</dependency>
+			<dependency>
+				<groupId>commons-dbcp</groupId>
+				<artifactId>commons-dbcp</artifactId>
+				<version>1.2.1</version>
+				<exclusions>
+					<exclusion>
+						<groupId>commons-collections</groupId>
+						<artifactId>commons-collections</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
+	<repositories>
+		<repository>
+			<id>spring-milestone</id>
+			<name>Spring Portfolio Milestone Repository</name>
+			<url>http://s3.amazonaws.com/maven.springframework.org/milestone</url>
+		</repository>
+		<repository>
+			<id>spring-external</id>
+			<name>Spring Portfolio Milestone 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>
+	</repositories>
+
+	<pluginRepositories>
+		<pluginRepository>
+			<id>spring-external</id>
+			<name>Spring Portfolio Milestone Repository</name>
+			<url>http://s3.amazonaws.com/maven.springframework.org/external</url>
+		</pluginRepository>
+		<pluginRepository>
+			<id>objectstyle</id>
+			<url>http://objectstyle.org/maven2</url>
+		</pluginRepository>
+	</pluginRepositories>
+
+	<reporting>
+		<excludeDefaults>true</excludeDefaults>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-report-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>com.interface21.maven</groupId>
+				<artifactId>maven-external-report-plugin</artifactId>
+				<version>1.0</version>
+				<configuration>
+					<name>JUnit Report</name>
+					<description>
+						JUnit test results for this project
+					</description>
+					<base>junit-reports</base>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>jdepend-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<configuration>
+					<links>
+						<link>
+							http://java.sun.com/j2ee/1.4/docs/api
+						</link>
+						<link>
+							http://java.sun.com/j2se/1.5.0/docs/api
+						</link>
+						<link>
+							http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/
+						</link>
+						<link>
+							http://jakarta.apache.org/commons/dbcp/apidocs/
+						</link>
+						<link>
+							http://jakarta.apache.org/commons/fileupload/apidocs/
+						</link>
+						<link>
+							http://jakarta.apache.org/commons/httpclient/apidocs/
+						</link>
+						<link>
+							http://jakarta.apache.org/commons/logging/api/
+						</link>
+						<link>
+							http://jakarta.apache.org/commons/pool/apidocs/
+						</link>
+						<link>http://www.junit.org/junit/javadoc/</link>
+						<link>
+							http://logging.apache.org/log4j/docs/api/
+						</link>
+						<link>
+							http://jakarta.apache.org/regexp/apidocs/
+						</link>
+						<link>
+							http://jakarta.apache.org/velocity/api/
+						</link>
+						<link>
+							http://static.springframework.org/spring/docs/2.1.x/api/
+						</link>
+						<link>
+							http://static.springframework.org/spring-batch/spring-batch-infrastructure/apidocs/
+						</link>
+						<link>
+							http://static.springframework.org/spring-batch/spring-batch-core/apidocs/
+						</link>
+						<link>
+							http://static.springframework.org/spring-batch/spring-batch-execution/apidocs/
+						</link>
+					</links>
+					<aggregate>true</aggregate>
+				</configuration>
+			</plugin>
+		</plugins>
+	</reporting>
+
+	<developers>
+		<developer>
+			<id>dsyer</id>
+			<name>Dave Syer</name>
+			<email>dsyer@interface21.com</email>
+		</developer>
+		<developer>
+			<id>lward</id>
+			<name>Lucas Ward</name>
+			<email>lucas.l.ward@accenture.com</email>
+		</developer>
+	</developers>
+
+</project>
\ No newline at end of file
diff --git a/samples/pom.xml b/samples/pom.xml
index 97418b073..9df9943e3 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -1,155 +1,153 @@
-<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>
-	<name>Samples</name>
-	<description>
-		Example batch jobs using Spring Batch Core and Execution.
-	</description>
-
-	<parent>
-		<groupId>org.springframework.batch</groupId>
-		<artifactId>spring-batch</artifactId>
-		<version>1.0-m2-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.batch</groupId>
-			<artifactId>spring-batch-execution</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>aspectj</groupId>
-			<artifactId>aspectjrt</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springmodules</groupId>
-			<artifactId>spring-modules-validation</artifactId>
-			<version>0.8</version>
-			<exclusions>
-				<exclusion>
-					<groupId>rhino</groupId>
-					<artifactId>js</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>commons-validator</groupId>
-					<artifactId>commons-validator</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>quartz</groupId>
-			<artifactId>quartz</artifactId>
-			<version>1.5.1</version>
-		</dependency>
-		<dependency>
-			<groupId>asm</groupId>
-			<artifactId>asm-all</artifactId>
-			<version>2.2.3</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>aspectj</groupId>
-			<artifactId>aspectjweaver</artifactId>
-			<version>1.5.3</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>hsqldb</groupId>
-			<artifactId>hsqldb</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>commons-dbcp</groupId>
-			<artifactId>commons-dbcp</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-	        <groupId>org.springframework.ws</groupId>
-			<artifactId>spring-oxm</artifactId>
-	        <version>1.0.0</version>
-	        <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>geronimo-spec</groupId>
-			<artifactId>geronimo-spec-j2ee</artifactId>
-			<version>1.4-rc4</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>easymock</groupId>
-			<artifactId>easymock</artifactId>
-		</dependency>
-		<!-- optional dependency from infrastructure -->
-		<dependency>
-			<groupId>cglib</groupId>
-			<artifactId>cglib-nodep</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<!-- optional dependency from infrastructure -->
-		<dependency>
-			<groupId>com.thoughtworks.xstream</groupId>
-			<artifactId>xstream</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<!-- optional dependency from infrastructure -->
-		<dependency>
-			<groupId>stax</groupId>
-			<artifactId>stax</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>xmlunit</groupId>
-			<artifactId>xmlunit</artifactId>
-			<scope>test</scope>
-			<version>1.1</version>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.3</version>
-				<configuration>
-					<!--forkMode>pertest</forkMode-->
-					<includes>
-						<include>**/*Tests.java</include>
-					</includes>
-					<excludes>
-						<exclude>**/Abstract*.java</exclude>
-						<exclude>**/NflJobFunctionalTests.java</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-</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">
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>spring-batch-samples</artifactId>
+	<packaging>jar</packaging>
+	<name>Samples</name>
+	<description>
+		Example batch jobs using Spring Batch Core and Execution.
+	</description>
+
+	<parent>
+		<groupId>org.springframework.batch</groupId>
+		<artifactId>spring-batch</artifactId>
+		<version>1.0-m2</version>
+		<relativePath>..</relativePath>
+	</parent>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.batch</groupId>
+			<artifactId>spring-batch-execution</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>aspectj</groupId>
+			<artifactId>aspectjrt</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springmodules</groupId>
+			<artifactId>spring-modules-validation</artifactId>
+			<version>0.8</version>
+			<exclusions>
+				<exclusion>
+					<groupId>rhino</groupId>
+					<artifactId>js</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>commons-validator</groupId>
+					<artifactId>commons-validator</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-test</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>quartz</groupId>
+			<artifactId>quartz</artifactId>
+			<version>1.5.1</version>
+		</dependency>
+		<dependency>
+			<groupId>asm</groupId>
+			<artifactId>asm-all</artifactId>
+			<version>2.2.3</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>aspectj</groupId>
+			<artifactId>aspectjweaver</artifactId>
+			<version>1.5.3</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>hsqldb</groupId>
+			<artifactId>hsqldb</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-dbcp</groupId>
+			<artifactId>commons-dbcp</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+	        <groupId>org.springframework.ws</groupId>
+			<artifactId>spring-oxm</artifactId>
+	        <version>1.0.0</version>
+	        <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>geronimo-spec</groupId>
+			<artifactId>geronimo-spec-j2ee</artifactId>
+			<version>1.4-rc4</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>easymock</groupId>
+			<artifactId>easymock</artifactId>
+		</dependency>
+		<!-- optional dependency from infrastructure -->
+		<dependency>
+			<groupId>cglib</groupId>
+			<artifactId>cglib-nodep</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<!-- optional dependency from infrastructure -->
+		<dependency>
+			<groupId>com.thoughtworks.xstream</groupId>
+			<artifactId>xstream</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<!-- optional dependency from infrastructure -->
+		<dependency>
+			<groupId>stax</groupId>
+			<artifactId>stax</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>xmlunit</groupId>
+			<artifactId>xmlunit</artifactId>
+			<scope>test</scope>
+			<version>1.1</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.3</version>
+				<configuration>
+					<!--forkMode>pertest</forkMode-->
+					<includes>
+						<include>**/*Tests.java</include>
+					</includes>
+					<excludes>
+						<exclude>**/Abstract*.java</exclude>
+						<exclude>**/NflJobFunctionalTests.java</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
\ No newline at end of file