diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..6bf47b00a
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,4 @@
+language: java
+
+install: mvn -U install --quiet -DskipTests=true -P bootstrap
+script: mvn clean test -P bootstrap
diff --git a/archetypes/simple-cli/pom.xml b/archetypes/simple-cli/pom.xml
index c9a6e712a..5bacf902d 100644
--- a/archetypes/simple-cli/pom.xml
+++ b/archetypes/simple-cli/pom.xml
@@ -42,14 +42,6 @@
 						<enabled>false</enabled>
 					</snapshots>
 				</pluginRepository>
-				<pluginRepository>
-					<id>com.springsource.repository.bundles.release</id>
-					<name> SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
-					<url>http://repository.springsource.com/maven/bundles/release</url>
-					<snapshots>
-						<enabled>false</enabled>
-					</snapshots>
-				</pluginRepository>
 			</pluginRepositories>
 		</profile>
 	</profiles>
@@ -163,19 +155,6 @@
 					<configuration>
 						<lifecycleMappingMetadata>
 							<pluginExecutions>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>com.springsource.bundlor</groupId>
-										<artifactId>com.springsource.bundlor.maven</artifactId>
-										<versionRange>[1.0,)</versionRange>
-										<goals>
-											<goal>bundlor</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore />
-									</action>
-								</pluginExecution>
 								<pluginExecution>
 									<pluginExecutionFilter>
 										<groupId>org.apache.maven.plugins</groupId>
@@ -204,20 +183,6 @@
 					<target>1.6</target>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>com.springsource.bundlor</groupId>
-				<artifactId>com.springsource.bundlor.maven</artifactId>
-				<version>1.0.0.RELEASE</version>
-				<executions>
-					<execution>
-						<id>bundlor-transform</id>
-						<phase>compile</phase>
-						<goals>
-							<goal>bundlor</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
@@ -270,7 +235,6 @@
 							<addClasspath>true</addClasspath>
 							<classpathPrefix>lib/</classpathPrefix>
 						</manifest>
-						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
 					</archive>
 				</configuration>
 			</plugin>
diff --git a/archetypes/simple-cli/template.mf b/archetypes/simple-cli/template.mf
deleted file mode 100755
index 755b9c899..000000000
--- a/archetypes/simple-cli/template.mf
+++ /dev/null
@@ -1,16 +0,0 @@
-Bundle-SymbolicName: org.springframework.batch.archetype.simple.cli
-Bundle-Version: ${version}
-Bundle-ManifestVersion: 2
-Bundle-Name: Spring Batch Cammand Line Archetype
-Import-Template: 
- org.apache.commons.logging.*;version="[1.1.0, 2.0.0)",
- org.apache.commons.io.*;version="[1.4.0, 2.0.0)";resolution:=optional,
- org.springframework.batch.*;version="[2.0.0, 3.0.0)",
- org.springframework.beans.*;version="[2.5.5, 4.0.0)";resolution:=optional,
- org.springframework.jdbc.*;version="[2.5.5, 4.0.0)";resolution:=optional,
- org.springframework.util.*;version="[2.5.5, 4.0.0)";resolution:=optional,
- org.springframework.dao.*;version="[2.5.5, 4.0.0)";resolution:=optional,
- org.springframework.transaction.*;version="[2.5.5, 4.0.0)";resolution:=optional,
- org.springframework.context.*;version="[2.5.5, 4.0.0)";resolution:=optional,
- org.springframework.core.*;version="[2.5.5, 4.0.0)";resolution:=optional,
- javax.sql.*;version="0";resolution:=optional
diff --git a/pom.xml b/pom.xml
index 53c708678..aa74999ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -625,7 +625,7 @@
 		<pluginRepository>
 			<id>com.springsource.repository.bundles.milestone</id>
 			<name> SpringSource Enterprise Bundle Repository - SpringSource Bundle Milestones</name>
-			<url>http://repository.springsource.com/maven/bundles/milestone/</url>
+			<url>http://repository.springsource.com/maven/bundles/milestone</url>
 			<snapshots>
 				<enabled>false</enabled>
 			</snapshots>
@@ -633,7 +633,23 @@
 		<pluginRepository>
 			<id>com.springsource.repository.bundles.snapshot</id>
 			<name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Snapshots</name>
-			<url>http://repository.springsource.com/maven/bundles/snapshot/</url>
+			<url>http://repository.springsource.com/maven/bundles/snapshot</url>
+		</pluginRepository>
+		<pluginRepository>
+			<id>com.springsource.repository.bundles.release</id>
+			<name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
+			<url>http://repository.springsource.com/maven/bundles/release</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>com.springsource.repository.bundles.release</id>
+			<name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
+			<url>http://repository.springsource.com/maven/bundles/release/</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
 		</pluginRepository>
 	</pluginRepositories>
 </project>
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/StepScopeTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/StepScopeTests.java
index b46166cd0..0e97fe6f5 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/StepScopeTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/StepScopeTests.java
@@ -56,7 +56,7 @@ public class StepScopeTests {
 
 	@After
 	public void tearDown() throws Exception {
-		StepSynchronizationManager.close();
+		StepSynchronizationManager.release();
 	}
 
 	@Test
diff --git a/spring-batch-core/src/test/resources/log4j.properties b/spring-batch-core/src/test/resources/log4j.properties
index 0d7d45982..44dca7c68 100644
--- a/spring-batch-core/src/test/resources/log4j.properties
+++ b/spring-batch-core/src/test/resources/log4j.properties
@@ -5,13 +5,13 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %t %c{2}:%L - %m%n
 
 log4j.category.org.apache.activemq=ERROR
-log4j.category.org.springframework.retry=DEBUG
-log4j.category.org.springframework.batch=DEBUG
-log4j.category.org.springframework.batch.support=INFO
-log4j.category.org.springframework.batch.support.transaction.ResourcelessTransactionManager=DEBUG
-log4j.category.org.springframework.core.repository=DEBUG
+#log4j.category.org.springframework.retry=DEBUG
+#log4j.category.org.springframework.batch=DEBUG
+#log4j.category.org.springframework.batch.support=INFO
+#log4j.category.org.springframework.batch.support.transaction.ResourcelessTransactionManager=DEBUG
+#log4j.category.org.springframework.core.repository=DEBUG
 # log4j.category.org.springframework.transaction=INFO
-log4j.category.org.springframework.beans=DEBUG
+#log4j.category.org.springframework.beans=DEBUG
 
 # log4j.category.org.hibernate.SQL=DEBUG
 # for debugging datasource initialization
diff --git a/spring-batch-core/template.mf b/spring-batch-core/template.mf
index d1633eb7a..729519bb9 100644
--- a/spring-batch-core/template.mf
+++ b/spring-batch-core/template.mf
@@ -13,16 +13,20 @@ Import-Template:
  org.aopalliance.*;version="[1.0.0, 2.0.0)",
  org.aspectj.*;version="[1.5.2,1.7.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.0.4, 2.0.0)",
- org.springframework.batch.*;version="[2.0.0, 3.0.0)";resolution:=optional,
- org.springframework.aop.*;version="[2.5.5, 4.0.0)",
- org.springframework.beans.*;version="[2.5.5, 4.0.0)",
- org.springframework.context.*;version="[2.5.5, 4.0.0)",
- org.springframework.core.*;version="[2.5.5, 4.0.0)",
- org.springframework.dao.*;version="[2.5.5, 4.0.0)";resolution:=optional,
- org.springframework.jdbc.*;version="[2.5.5, 4.0.0)";resolution:=optional,
- org.springframework.transaction.*;version="[2.5.5, 4.0.0)";resolution:=optional,
- org.springframework.util.*;version="[2.5.5, 4.0.0)";resolution:=optional,
+ org.springframework.batch.*;version="[2.2.0, 3.0.0)";resolution:=optional,
+ org.springframework.aop.*;version="[3.1.2, 4.0.0)",
+ org.springframework.beans.*;version="[3.1.2, 4.0.0)",
+ org.springframework.context.*;version="[3.1.2, 4.0.0)",
+ org.springframework.core.*;version="[3.1.2, 4.0.0)",
+ org.springframework.dao.*;version="[3.1.2, 4.0.0)";resolution:=optional,
+ org.springframework.jdbc.*;version="[3.1.2, 4.0.0)";resolution:=optional,
+ org.springframework.transaction.*;version="[3.1.2, 4.0.0)";resolution:=optional,
+ org.springframework.util.*;version="[3.1.2, 4.0.0)";resolution:=optional,
+ org.springframework.stereotype.*;version="[3.1.2, 4.0.0)";resolution:=optional,
+ org.springframework.retry.*;version="[1.0.0,2.0.0)";resolution:=optional,
+ org.springframework.classify.*;version="[1.0.0,2.0.0)";resolution:=optional,
  org.springframework.osgi.*;version="[1.1.0, 2.0.0)";resolution:=optional,
  org.osgi.framework;version="0";resolution:=optional,
  org.w3c.dom;version="0";resolution:=optional,
+ javax.annotation.*;version="0";resolution:=optional,
  javax.sql.*;version="0";resolution:=optional
diff --git a/spring-batch-infrastructure-tests/pom.xml b/spring-batch-infrastructure-tests/pom.xml
index 53e90faca..e95480e38 100644
--- a/spring-batch-infrastructure-tests/pom.xml
+++ b/spring-batch-infrastructure-tests/pom.xml
@@ -77,6 +77,16 @@
 			<artifactId>activemq-core</artifactId>
 			<version>5.1.0</version>
 			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<artifactId>camel-core</artifactId>
+					<groupId>org.apache.camel</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>commons-logging-api</artifactId>
+					<groupId>commons-logging</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
@@ -107,13 +117,17 @@
 		      <artifactId>castor-xml</artifactId>
 		      <version>1.3.2</version>
 			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<artifactId>stax</artifactId>
+					<groupId>stax</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>commons-lang</artifactId>
+					<groupId>commons-lang</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
-	    <dependency>
-	      <groupId>commons-lang</groupId>
-	      <artifactId>commons-lang</artifactId>
-	      <version>2.5</version>
-	      <scope>test</scope>
-	    </dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
diff --git a/spring-batch-infrastructure-tests/src/test/resources/log4j.properties b/spring-batch-infrastructure-tests/src/test/resources/log4j.properties
index 0d084f65e..a12e7324c 100644
--- a/spring-batch-infrastructure-tests/src/test/resources/log4j.properties
+++ b/spring-batch-infrastructure-tests/src/test/resources/log4j.properties
@@ -6,10 +6,10 @@ log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %t %c{1}:%L - %m
 
 log4j.category.org.apache.activemq=ERROR
 # log4j.category.org.springframework=DEBUG
-log4j.category.org.springframework.jdbc=DEBUG
-log4j.category.org.springframework.jdbc.datasource=INFO
+#log4j.category.org.springframework.jdbc=DEBUG
+#log4j.category.org.springframework.jdbc.datasource=INFO
 # log4j.category.org.springframework.jms=DEBUG
 # log4j.category.org.springframework.batch=DEBUG
-log4j.category.org.springframework.batch.support=INFO
+#log4j.category.org.springframework.batch.support=INFO
 # log4j.category.org.springframework.retry=DEBUG
 # log4j.category.org.springframework.batch.item.database=DEBUG
diff --git a/spring-batch-infrastructure/pom.xml b/spring-batch-infrastructure/pom.xml
index 53166e392..e76d32379 100644
--- a/spring-batch-infrastructure/pom.xml
+++ b/spring-batch-infrastructure/pom.xml
@@ -139,7 +139,7 @@
 			<version>1.4</version>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
+        <dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-oxm</artifactId>
 			<optional>true</optional>
diff --git a/spring-batch-infrastructure/src/test/resources/log4j.properties b/spring-batch-infrastructure/src/test/resources/log4j.properties
index a2a8dc39b..7168892cd 100644
--- a/spring-batch-infrastructure/src/test/resources/log4j.properties
+++ b/spring-batch-infrastructure/src/test/resources/log4j.properties
@@ -4,7 +4,7 @@ log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d %p %t [%c] - <%m>%n
 
-log4j.category.org.springframework.batch=DEBUG
+#log4j.category.org.springframework.batch=DEBUG
 log4j.category.org.springframework.transaction=INFO
 log4j.category.org.springframework.batch.support.transaction.ResourcelessTransactionManager=INFO
 log4j.category.org.springframework.jdbc.datasource=INFO
diff --git a/spring-batch-infrastructure/template.mf b/spring-batch-infrastructure/template.mf
index ef609946a..5ae81d7f2 100644
--- a/spring-batch-infrastructure/template.mf
+++ b/spring-batch-infrastructure/template.mf
@@ -15,21 +15,24 @@ Import-Template:
  org.apache.commons.logging.*;version="[1.1.0,2.0.0)",
  com.ibatis.sqlmap.*;version="[2.3.0,3.0.0)";resolution:=optional,
  org.springframework.batch.*;version="[2.0.0,3.0.0)",
- org.springframework.aop.*;version="[2.5.5,4.0.0)",
- org.springframework.beans.*;version="[2.5.5,4.0.0)",
- org.springframework.context.*;version="[2.5.5,4.0.0)",
- org.springframework.core.*;version="[2.5.5,4.0.0)",
- org.springframework.dao.*;version="[2.5.5,4.0.0)";resolution:=optional,
- org.springframework.jdbc.*;version="[2.5.5,4.0.0)";resolution:=optional,
- org.springframework.jms.*;version="[2.5.5,4.0.0)";resolution:=optional,
- org.springframework.mail.*;version="[2.5.5,4.0.0)";resolution:=optional,
- org.springframework.orm.*;version="[2.5.5,4.0.0)";resolution:=optional,
- org.springframework.oxm.*;version="[1.5.5,2.0.0)";resolution:=optional,
- org.springframework.xml.*;version="[1.5.5,2.0.0)";resolution:=optional,
- org.springframework.validation.*;version="[2.5.5,4.0.0)";resolution:=optional,
- org.springframework.transaction.*;version="[2.5.5,4.0.0)";resolution:=optional,
- org.springframework.util.*;version="[2.5.5,4.0.0)";resolution:=optional,
+ org.springframework.aop.*;version="[3.1.2,4.0.0)",
+ org.springframework.beans.*;version="[3.1.2,4.0.0)",
+ org.springframework.context.*;version="[3.1.2,4.0.0)",
+ org.springframework.core.*;version="[3.1.2,4.0.0)",
+ org.springframework.dao.*;version="[3.1.2,4.0.0)";resolution:=optional,
+ org.springframework.jdbc.*;version="[3.1.2,4.0.0)";resolution:=optional,
+ org.springframework.jms.*;version="[3.1.2,4.0.0)";resolution:=optional,
+ org.springframework.mail.*;version="[3.1.2,4.0.0)";resolution:=optional,
+ org.springframework.orm.*;version="[3.1.2,4.0.0)";resolution:=optional,
+ org.springframework.oxm.*;version="[3.1.2,4.0.0)";resolution:=optional,
+ org.springframework.xml.*;version="[3.1.2,4.0.0)";resolution:=optional,
+ org.springframework.validation.*;version="[3.1.2,4.0.0)";resolution:=optional,
+ org.springframework.transaction.*;version="[3.1.2,4.0.0)";resolution:=optional,
+ org.springframework.util.*;version="[3.1.2,4.0.0)";resolution:=optional,
  org.springframework.osgi.*;version="[1.1.0,2.0.0)";resolution:=optional,
+ org.springframework.amqp.*;version="[1.1.0,2.0.0)";resolution:=optional,
+ org.springframework.retry.*;version="[1.0.0,2.0.0)";resolution:=optional,
+ org.springframework.classify.*;version="[1.0.0,2.0.0)";resolution:=optional,
  javax.sql.*;version="0";resolution:=optional,
  javax.jms;version="0";resolution:=optional,
  javax.persistence;version="0";resolution:=optional,
diff --git a/spring-batch-parent/pom.xml b/spring-batch-parent/pom.xml
index 8a9101ef5..94748e17d 100644
--- a/spring-batch-parent/pom.xml
+++ b/spring-batch-parent/pom.xml
@@ -141,9 +141,9 @@
 			<id>bootstrap</id>
 			<repositories>
 				<repository>
-   					<id>gemstone</id>
-   					<name>Release bundles for SQLFire and GemFire</name>
-  					 <url>http://dist.gemstone.com.s3.amazonaws.com/maven/release</url>
+					<id>gemstone</id>
+					<name>Release bundles for SQLFire and GemFire</name>
+					<url>http://dist.gemstone.com.s3.amazonaws.com/maven/release</url>
 				</repository>
 				<repository>
 					<id>objectstyle</id>
@@ -317,7 +317,7 @@
 		<pluginRepository>
 			<id>com.springsource.repository.bundles.release</id>
 			<name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
-			<url>http://repository.springsource.com/maven/bundles/release/</url>
+			<url>http://repository.springsource.com/maven/bundles/release</url>
 			<snapshots>
 				<enabled>false</enabled>
 			</snapshots>
@@ -474,6 +474,10 @@
 						<groupId>org.hibernate</groupId>
 						<artifactId>hibernate</artifactId>
 					</exclusion>
+					<exclusion>
+						<groupId>commons-logging</groupId>
+						<artifactId>commons-logging</artifactId>
+					</exclusion>
 				</exclusions>
 			</dependency>
 			<dependency>
diff --git a/spring-batch-samples/src/main/resources/log4j.properties b/spring-batch-samples/src/main/resources/log4j.properties
index da440d039..b708a7b37 100644
--- a/spring-batch-samples/src/main/resources/log4j.properties
+++ b/spring-batch-samples/src/main/resources/log4j.properties
@@ -29,5 +29,5 @@ log4j.appender.chainsaw.layout=org.apache.log4j.xml.XMLLayout
 
 ###  debug your specific package or classes with the following example
 log4j.logger.org.springframework.jdbc=info
-log4j.logger.org.springframework.batch=debug
+#log4j.logger.org.springframework.batch=debug
 log4j.logger.org.springframework.batch.sample=debug
diff --git a/spring-batch-test/src/test/resources/log4j.properties b/spring-batch-test/src/test/resources/log4j.properties
index 0fa986064..5e0f6839e 100644
--- a/spring-batch-test/src/test/resources/log4j.properties
+++ b/spring-batch-test/src/test/resources/log4j.properties
@@ -5,10 +5,10 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %t %c{2} - %m%n
 
 log4j.category.org.apache.activemq=ERROR
-log4j.category.org.springframework.batch=DEBUG
-log4j.category.org.springframework.batch.support=INFO
+#log4j.category.org.springframework.batch=DEBUG
+#log4j.category.org.springframework.batch.support=INFO
 # log4j.category.org.springframework.transaction=INFO
-log4j.category.org.springframework.jdbc=DEBUG
+#log4j.category.org.springframework.jdbc=DEBUG
 
 # log4j.category.org.hibernate.SQL=DEBUG
 # for debugging datasource initialization