diff --git a/archetypes/simple-cli/pom.xml b/archetypes/simple-cli/pom.xml
index 434851027..65009b320 100644
--- a/archetypes/simple-cli/pom.xml
+++ b/archetypes/simple-cli/pom.xml
@@ -26,6 +26,19 @@
 				<maven.test.failure.ignore>false</maven.test.failure.ignore>
 			</properties>
 		</profile>
+		<profile>
+			<id>tiger</id>
+			<activation>
+				<jdk>1.5</jdk>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>javax.xml.stream</groupId>
+					<artifactId>com.springsource.javax.xml.stream</artifactId>
+					<version>1.0.1</version>
+				</dependency>
+			</dependencies>
+		</profile>
 		<profile>
 			<id>manifest</id>
 			<activation>
@@ -54,6 +67,7 @@
 			</build>
 		</profile>
 	</profiles>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.junit</groupId>
@@ -102,13 +116,8 @@
 			<artifactId>com.springsource.org.aspectj.weaver</artifactId>
 			<version>1.5.4</version>
 		</dependency>
-		<dependency>
-			<groupId>javax.xml.stream</groupId>
-			<artifactId>com.springsource.javax.xml.stream</artifactId>
-			<version>1.0.1</version>
-			<optional>true</optional>
-		</dependency>
 	</dependencies>
+
 	<build>
 		<extensions>
 			<extension>
@@ -171,6 +180,7 @@
 			</plugin>
 		</plugins>
 	</build>
+
 	<repositories>
 		<repository>
 			<id>com.springsource.repository.bundles.release</id>
@@ -226,4 +236,5 @@
 			<url>s3://maven.springframework.org/snapshot</url>
 		</snapshotRepository>
 	</distributionManagement>
+
 </project>
diff --git a/build-ivy/.project b/build-ivy/.project
new file mode 100644
index 000000000..f81fc9440
--- /dev/null
+++ b/build-ivy/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>build-ivy</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/build-ivy/build.xml b/build-ivy/build.xml
new file mode 100644
index 000000000..78686dcc5
--- /dev/null
+++ b/build-ivy/build.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="com.springsource.test.build" default="test">
+	
+	<path id="bundles">
+		<pathelement location="${basedir}/../spring-batch-infrastructure"/>
+		<pathelement location="${basedir}/../spring-batch-core"/>
+		<pathelement location="${basedir}/../spring-batch-test"/>
+	</path>
+
+	<property file="${basedir}/../build.properties" />
+	<import file="${basedir}/../spring-build/multi-bundle/default.xml"/>
+
+</project>
diff --git a/build-ivy/package-bundle.xml b/build-ivy/package-bundle.xml
new file mode 100644
index 000000000..a477b8743
--- /dev/null
+++ b/build-ivy/package-bundle.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="package-bundle">
+	
+	<target name="package" depends="ivy.init, jar">
+		<dist-jar/>
+		<src-jar/>
+		<ext-jars/>
+	</target>
+	
+	<import file="${basedir}/../spring-build/standard/default.xml"/>	
+
+</project>
diff --git a/build.properties b/build.properties
new file mode 100644
index 000000000..bb74c2d18
--- /dev/null
+++ b/build.properties
@@ -0,0 +1,3 @@
+version=2.0.0
+integration.repo.dir=${basedir}/../integration-repo
+ivy.cache.dir=${basedir}/../ivy-cache
diff --git a/pom.xml b/pom.xml
index 7b01194d4..397b7c0ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,11 +61,6 @@
 		</profile>
 		<profile>
 			<id>deployment</id>
-			<activation>
-				<file>
-					<exists>deployment.txt</exists>
-				</file>
-			</activation>
 			<modules>
 				<module>spring-batch-samples</module>
 				<module>archetypes</module>
@@ -76,6 +71,29 @@
 					<plugin>
 						<artifactId>maven-javadoc-plugin</artifactId>
 					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-source-plugin</artifactId>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>dist</id>
+			<activation>
+				<file>
+					<exists>dist.txt</exists>
+				</file>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-javadoc-plugin</artifactId>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-source-plugin</artifactId>
+					</plugin>
 				</plugins>
 			</build>
 		</profile>
@@ -164,6 +182,7 @@
 									<goal>manifest</goal>
 								</goals>
 								<configuration>
+									<manifestTemplatePath>template.mf</manifestTemplatePath>
 									<outputFile>${project.basedir}/src/main/resources/META-INF/MANIFEST.MF</outputFile>
 								</configuration>
 							</execution>
@@ -393,6 +412,18 @@
 						<excludePackageNames>*.batch.sample,*.batch.container,example,test</excludePackageNames>
 					</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>
 			</plugins>
 		</pluginManagement>
 		<plugins>
@@ -404,12 +435,6 @@
 					<target>1.5</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>
@@ -486,6 +511,13 @@
 				<version>1.0.0</version>
 				<scope>test</scope>
 			</dependency>
+			<dependency>
+				<groupId>javax.xml.stream</groupId>
+				<artifactId>com.springsource.javax.xml.stream</artifactId>
+				<version>1.0.1</version>
+				<!-- optional for Java 6 -->
+				<optional>true</optional>
+			</dependency>
 			<dependency>
 				<groupId>org.hibernate</groupId>
 				<artifactId>com.springsource.org.hibernate</artifactId>
@@ -507,6 +539,12 @@
 				<artifactId>com.springsource.org.hibernate.ejb</artifactId>
 				<version>3.3.2.GA</version>
 				<optional>true</optional>
+				<exclusions>
+					<exclusion>
+						<groupId>edu.oswego.cs.concurrent</groupId>
+						<artifactId>com.springsource.edu.oswego.cs.dl.util.concurrent</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>org.hibernate</groupId>
diff --git a/spring-batch-core/build.xml b/spring-batch-core/build.xml
new file mode 100644
index 000000000..2c70296aa
--- /dev/null
+++ b/spring-batch-core/build.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="com.springframework.batch.core">
+
+	<property file="${basedir}/../build.properties" />
+	<import file="${basedir}/../build-ivy/package-bundle.xml"/>
+
+</project>
diff --git a/spring-batch-core/ivy.xml b/spring-batch-core/ivy.xml
new file mode 100644
index 000000000..c9ba0b20d
--- /dev/null
+++ b/spring-batch-core/ivy.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
+<ivy-module
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
+		version="1.3">
+
+	<info organisation="org.springframework.batch" module="${ant.project.name}">
+		<license name="Apache 2.0" url="http://www.apache.org/licenses/LICENSE-2.0"/>
+		<ivyauthor name="Dave Syer"/>
+	</info>
+
+	<configurations>
+		<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+	</configurations>
+
+	<dependencies>
+		<dependency org="org.springframework.batch" name="org.springframework.batch.infrastructure" rev="latest.integration" conf="compile->runtime,provided"/>
+		<dependency org="org.objectweb.asm" name="com.springsource.org.objectweb.asm.commons" rev="2.2.3" conf="optional->runtime,provided"/>
+		<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="test->runtime,provided"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.io" rev="1.4.0" conf="test->runtime,provided"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.lang" rev="2.1.0" conf="compile->runtime,provided"/>
+		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.3.0" conf="test->runtime,provided"/>
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.4.0" conf="test->runtime,provided"/>
+		<dependency org="org.aspectj" name="com.springsource.org.aspectj.runtime" rev="1.5.4" conf="compile->runtime,provided"/>
+		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.5.4" conf="compile->runtime,provided"/>
+		<dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.1.3" conf="test->runtime,provided"/>
+		<dependency org="com.thoughtworks.xstream" name="com.springsource.com.thoughtworks.xstream" rev="1.3.0" conf="compile->runtime,provided"/>
+		<dependency org="org.codehaus.jettison" name="com.springsource.org.codehaus.jettison" rev="1.0.0" conf="compile->runtime,provided"/>
+		<dependency org="org.eclipse.osgi" name="org.eclipse.osgi" rev="3.4.2.R34x_v20080826-1230" conf="optional->runtime,provided"/>
+		<dependency org="org.springframework" name="org.springframework.aop" rev="2.5.6.A" conf="compile->runtime,provided"/>
+		<dependency org="org.springframework" name="org.springframework.beans" rev="2.5.6.A" conf="compile->runtime,provided"/>
+		<dependency org="org.springframework" name="org.springframework.context" rev="2.5.6.A" conf="compile->runtime,provided"/>
+		<dependency org="org.springframework" name="org.springframework.core" rev="2.5.6.A" conf="compile->runtime,provided"/>
+		<dependency org="org.springframework" name="org.springframework.jdbc" rev="2.5.6.A" conf="optional->runtime,provided"/>
+		<dependency org="org.springframework.osgi" name="org.springframework.osgi.core" rev="1.1.2.A" conf="optional->runtime,provided"/>
+		<dependency org="org.springframework" name="org.springframework.test" rev="2.5.6.A" conf="test->runtime,provided"/>
+		<dependency org="org.springframework" name="org.springframework.transaction" rev="2.5.6.A" conf="compile->runtime,provided"/>
+		<dependency org="javax.annotation" name="com.springsource.javax.annotation" rev="1.0.0" conf="test->runtime,provided"/>
+		<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="optional->runtime,provided"/>
+	</dependencies>
+
+</ivy-module>
diff --git a/spring-batch-core/pom.xml b/spring-batch-core/pom.xml
index 8c0f9f330..f8cdb6b5b 100644
--- a/spring-batch-core/pom.xml
+++ b/spring-batch-core/pom.xml
@@ -18,6 +18,20 @@
 		<relativePath>..</relativePath>
 	</parent>
 
+	<profiles>
+		<profile>
+			<id>tiger</id>
+			<activation>
+				<jdk>1.5</jdk>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>javax.xml.stream</groupId>
+					<artifactId>com.springsource.javax.xml.stream</artifactId>
+				</dependency>
+			</dependencies>
+		</profile>
+	</profiles>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.batch</groupId>
@@ -117,12 +131,6 @@
 			<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>
 		<dependency>
 			<groupId>org.apache.log4j</groupId>
 			<artifactId>com.springsource.org.apache.log4j</artifactId>
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/AsyncTaskletStepTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/AsyncTaskletStepTests.java
index 739744a38..ddee07080 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/AsyncTaskletStepTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/AsyncTaskletStepTests.java
@@ -18,9 +18,9 @@ package org.springframework.batch.core.step.tasklet;
 
 import static org.junit.Assert.assertEquals;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -47,7 +47,7 @@ import org.springframework.util.StringUtils;
 
 public class AsyncTaskletStepTests {
 
-	private List<String> processed = new ArrayList<String>();
+	private List<String> processed = new CopyOnWriteArrayList<String>();
 
 	private TaskletStep step;
 
diff --git a/spring-batch-core/src/main/resources/META-INF/org.springframework.batch.core.mf b/spring-batch-core/template.mf
similarity index 95%
rename from spring-batch-core/src/main/resources/META-INF/org.springframework.batch.core.mf
rename to spring-batch-core/template.mf
index 5a8486522..5f8eabfd3 100644
--- a/spring-batch-core/src/main/resources/META-INF/org.springframework.batch.core.mf
+++ b/spring-batch-core/template.mf
@@ -1,7 +1,6 @@
 Bundle-SymbolicName: org.springframework.batch.core
-Bundle-Version: 2.0.0.CI-SNAPSHOT
-Bundle-ManifestVersion: 2
 Bundle-Name: Spring Batch Core
+Bundle-Vendor: Spring
 Ignored-Existing-Headers: 
  Import-Package,
  Export-Package
diff --git a/spring-batch-infrastructure/build.xml b/spring-batch-infrastructure/build.xml
new file mode 100644
index 000000000..85b565694
--- /dev/null
+++ b/spring-batch-infrastructure/build.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="com.springframework.batch.infrastructure">
+
+	<property file="${basedir}/../build.properties" />
+	<import file="${basedir}/../build-ivy/package-bundle.xml"/>
+
+</project>
diff --git a/spring-batch-infrastructure/ivy.xml b/spring-batch-infrastructure/ivy.xml
new file mode 100644
index 000000000..65423560c
--- /dev/null
+++ b/spring-batch-infrastructure/ivy.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
+<ivy-module
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
+		version="1.3">
+
+	<info organisation="org.springframework.batch" module="${ant.project.name}">
+		<license name="Apache 2.0" url="http://www.apache.org/licenses/LICENSE-2.0"/>
+		<ivyauthor name="Dave Syer"/>
+	</info>
+
+	<configurations>
+		<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+	</configurations>
+
+	<dependencies>
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.4.0" conf="test->runtime,provided"/>
+		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.3.0" conf="test->runtime,provided"/>
+		<dependency org="org.aspectj" name="com.springsource.org.aspectj.runtime" rev="1.5.4" conf="test->runtime,provided"/>
+		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.5.4" conf="test->runtime,provided"/>
+		<dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.1.3" conf="optional->runtime,provided"/>
+		<dependency org="javax.jms" name="com.springsource.javax.jms" rev="1.1.0" conf="optional->runtime,provided"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->runtime,provided"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.lang" rev="2.1.0" conf="optional->runtime,provided"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.io" rev="1.4.0" conf="test->runtime,provided"/>
+		<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="test->runtime,provided"/>
+		<dependency org="org.hibernate" name="com.springsource.org.hibernate" rev="3.2.6.ga" conf="optional->runtime,provided"/>
+		<dependency org="org.hibernate" name="com.springsource.org.hibernate.ejb" rev="3.3.2.GA" conf="optional->runtime,provided"/>
+		<dependency org="org.hibernate" name="com.springsource.org.hibernate.annotations" rev="3.3.1.ga" conf="optional->runtime,provided"/>
+		<dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="optional->runtime,provided"/>
+		<dependency org="org.apache.ibatis" name="com.springsource.com.ibatis" rev="2.3.0.677" conf="optional->runtime,provided"/>
+		<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="optional->runtime,provided"/>
+		<dependency org="org.springframework.ws" name="org.springframework.oxm" rev="1.5.5.A" conf="optional->runtime,provided"/>
+		<dependency org="org.springframework" name="org.springframework.aop" rev="2.5.6.A" conf="optional->runtime,provided"/>
+		<dependency org="org.springframework" name="org.springframework.core" rev="2.5.6.A" conf="compile->runtime,provided"/>
+		<dependency org="org.springframework" name="org.springframework.jdbc" rev="2.5.6.A" conf="optional->runtime,provided"/>
+		<dependency org="org.springframework" name="org.springframework.jms" rev="2.5.6.A" conf="optional->runtime,provided"/>
+		<dependency org="org.springframework" name="org.springframework.orm" rev="2.5.6.A" conf="optional->runtime,provided"/>
+		<dependency org="org.springframework" name="org.springframework.test" rev="2.5.6.A" conf="test->runtime,provided"/>
+		<dependency org="org.springframework" name="org.springframework.transaction" rev="2.5.6.A" conf="optional->runtime,provided"/>
+	</dependencies>
+
+</ivy-module>
diff --git a/spring-batch-infrastructure/pom.xml b/spring-batch-infrastructure/pom.xml
index 1d7280ebc..8ce830c31 100644
--- a/spring-batch-infrastructure/pom.xml
+++ b/spring-batch-infrastructure/pom.xml
@@ -20,24 +20,16 @@
 	</properties>
 	<profiles>
 		<profile>
-			<id>clover</id>
+			<id>tiger</id>
 			<activation>
-				<activeByDefault>false</activeByDefault>
+				<jdk>1.5</jdk>
 			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<artifactId>maven-clover-plugin</artifactId>
-					</plugin>
-				</plugins>
-			</build>
-			<reporting>
-				<plugins>
-					<plugin>
-						<artifactId>maven-clover-plugin</artifactId>
-					</plugin>
-				</plugins>
-			</reporting>
+			<dependencies>
+				<dependency>
+					<groupId>stax</groupId>
+					<artifactId>stax</artifactId>
+				</dependency>
+			</dependencies>
 		</profile>
 	</profiles>
 	<build>
@@ -130,12 +122,6 @@
 			<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>
diff --git a/spring-batch-infrastructure/src/main/resources/META-INF/org.springframework.batch.infrastructure.mf b/spring-batch-infrastructure/template.mf
similarity index 94%
rename from spring-batch-infrastructure/src/main/resources/META-INF/org.springframework.batch.infrastructure.mf
rename to spring-batch-infrastructure/template.mf
index 41d760a49..418865877 100644
--- a/spring-batch-infrastructure/src/main/resources/META-INF/org.springframework.batch.infrastructure.mf
+++ b/spring-batch-infrastructure/template.mf
@@ -1,7 +1,9 @@
 Bundle-SymbolicName: org.springframework.batch.infrastructure
-Bundle-Version: 2.0.0.CI-SNAPSHOT
-Bundle-ManifestVersion: 2
 Bundle-Name: Spring Batch Infrastructure
+Bundle-Vendor: Spring
+Ignored-Existing-Headers: 
+ Import-Package,
+ Export-Package
 Import-Template: 
  com.ibatis.sqlmap.*;version="[2.3.0, 3.0.0)";resolution:=optional,
  javax.jms.*;version=1.1.0;resolution:=optional,
diff --git a/spring-batch-test/build.xml b/spring-batch-test/build.xml
new file mode 100644
index 000000000..4c1e787fd
--- /dev/null
+++ b/spring-batch-test/build.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="com.springframework.batch.test">
+
+	<property file="${basedir}/../build.properties" />
+	<import file="${basedir}/../build-ivy/package-bundle.xml"/>
+
+</project>
diff --git a/spring-batch-test/ivy.xml b/spring-batch-test/ivy.xml
new file mode 100644
index 000000000..26a56ac76
--- /dev/null
+++ b/spring-batch-test/ivy.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
+<ivy-module
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
+		version="1.3">
+
+	<info organisation="org.springframework.batch" module="${ant.project.name}">
+		<license name="Apache 2.0" url="http://www.apache.org/licenses/LICENSE-2.0"/>
+		<ivyauthor name="Dave Syer"/>
+	</info>
+
+	<configurations>
+		<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+	</configurations>
+
+	<dependencies>
+		<dependency org="org.springframework.batch" name="org.springframework.batch.core" rev="latest.integration" conf="compile->runtime,provided"/>
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.4.0" conf="compile->runtime,provided"/>
+		<dependency org="org.springframework" name="org.springframework.test" rev="2.5.6.A" conf="test->runtime,provided"/>
+		<dependency org="org.springframework" name="org.springframework.jdbc" rev="2.5.6.A" conf="compile->runtime,provided"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.io" rev="1.4.0" conf="compile->runtime,provided"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.dbcp" rev="1.2.2.osgi" conf="compile->runtime,provided"/>
+		<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="test->runtime,provided"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.collections" rev="3.2.0" conf="compile->runtime,provided"/>
+	</dependencies>
+
+</ivy-module>
diff --git a/spring-batch-test/pom.xml b/spring-batch-test/pom.xml
index 6d113e84f..7777e5bf1 100755
--- a/spring-batch-test/pom.xml
+++ b/spring-batch-test/pom.xml
@@ -1,18 +1,36 @@
 <?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">
-	<parent>
-		<artifactId>org.springframework.batch</artifactId>
-		<groupId>org.springframework.batch</groupId>
-		<version>2.0.0.CI-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
+
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>org.springframework.batch.test</artifactId>
 	<version>2.0.0.CI-SNAPSHOT</version>
 	<name>Test</name>
 	<packaging>jar</packaging>
 	<description>Domain for batch job testing</description>
+
+	<parent>
+		<artifactId>org.springframework.batch</artifactId>
+		<groupId>org.springframework.batch</groupId>
+		<version>2.0.0.CI-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+
+	<profiles>
+		<profile>
+			<id>tiger</id>
+			<activation>
+				<jdk>1.5</jdk>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>javax.xml.stream</groupId>
+					<artifactId>com.springsource.javax.xml.stream</artifactId>
+				</dependency>
+			</dependencies>
+		</profile>
+	</profiles>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.batch</groupId>
@@ -55,13 +73,8 @@
 			<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>
 			<plugin>
@@ -70,4 +83,5 @@
 			</plugin>
 		</plugins>
 	</reporting>
+
 </project>
\ No newline at end of file
diff --git a/src/.project b/src/.project
index 2e23dfd23..c543f0b33 100644
--- a/src/.project
+++ b/src/.project
@@ -9,6 +9,11 @@
 	<natures>
 	</natures>
 	<linkedResources>
+		<link>
+			<name>build.properties</name>
+			<type>1</type>
+			<locationURI>SPRING_BATCH/build.properties</locationURI>
+		</link>
 		<link>
 			<name>pom.xml</name>
 			<type>1</type>