diff --git a/spring-batch-execution/pom.xml b/spring-batch-execution/pom.xml
index a6f95eb40..8114f2553 100644
--- a/spring-batch-execution/pom.xml
+++ b/spring-batch-execution/pom.xml
@@ -1,4 +1,6 @@
-<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-execution</artifactId>
@@ -94,6 +96,10 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-tx</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>backport-util-concurrent</groupId>
+			<artifactId>backport-util-concurrent</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -107,105 +113,159 @@
 						<phase>generate-sources</phase>
 						<configuration>
 							<tasks>
-								<typedef resource="foundrylogic/vpp/typedef.properties" />
-								<taskdef resource="foundrylogic/vpp/taskdef.properties" />
+								<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">
+								<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" />
+											<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" />
+											<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" />
+									<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">
+								<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" />
+											<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" />
+											<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" />
+									<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">
+								<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" />
+											<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" />
+											<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" />
+									<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">
+								<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" />
+											<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" />
+											<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" />
+									<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">
+								<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" />
+											<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" />
+											<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" />
+									<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">
+								<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" />
+											<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" />
+											<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" />
+									<fileset
+										dir="${basedir}/src/main/sql" includes="schema.sql.vpp" />
+									<mapper type="glob" from="*.sql.vpp"
+										to="*-postgresql.sql" />
 								</vppcopy>
 								<!-- Reference script for MySQL - N.B. not under source control, but packaged in jar. -->
-								<vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
+								<vppcopy
+									todir="${basedir}/target/generated-resources"
+									overwrite="true">
 									<config>
 										<context>
-											<property key="includes" value="src/main/sql" />
-											<property file="${basedir}/src/main/sql/mysql.properties" />
+											<property key="includes"
+												value="src/main/sql" />
+											<property
+												file="${basedir}/src/main/sql/mysql.properties" />
 										</context>
 										<engine>
-											<property key="velocimacro.library" value="src/main/sql/mysql.vpp" />
+											<property
+												key="velocimacro.library" value="src/main/sql/mysql.vpp" />
 										</engine>
 									</config>
-									<fileset dir="${basedir}/src/main/sql" includes="schema.sql.vpp" />
-									<mapper type="glob" from="*.sql.vpp" to="*-mysql.sql" />
+									<fileset
+										dir="${basedir}/src/main/sql" includes="schema.sql.vpp" />
+									<mapper type="glob" from="*.sql.vpp"
+										to="*-mysql.sql" />
 								</vppcopy>
 							</tasks>
 						</configuration>
diff --git a/src/.project b/src/.project
index 0f6f6a765..6897b1e45 100644
--- a/src/.project
+++ b/src/.project
@@ -1,17 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>src</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>src</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>pom.xml</name>
+			<type>1</type>
+			<locationURI>PARENT/pom.xml</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>