diff --git a/spring-batch-parent/pom.xml b/spring-batch-parent/pom.xml
index bff958f97..e8db927ca 100644
--- a/spring-batch-parent/pom.xml
+++ b/spring-batch-parent/pom.xml
@@ -14,7 +14,7 @@
 	<properties>
 		<maven.test.failure.ignore>true</maven.test.failure.ignore>
 		<spring.framework.version>2.5.6.A</spring.framework.version>
-		<bundlor.version>1.0.0.BUILD-SNAPSHOT</bundlor.version>
+		<bundlor.version>1.0.0.M1A</bundlor.version>
 	</properties>
 	<profiles>
 		<profile>
diff --git a/src/assembly/with-dependencies.xml b/src/assembly/with-dependencies.xml
index db37a2ec3..baacaefa5 100644
--- a/src/assembly/with-dependencies.xml
+++ b/src/assembly/with-dependencies.xml
@@ -129,7 +129,7 @@
 						<outputFileNameMapping>
 							lib/${module.artifactId}-${module.version}.${module.extension}
 						</outputFileNameMapping>
-						<scope>runtime</scope>
+						<scope>test</scope>
 						<excludes>
 							<exclude>
 								org.springframework.batch:org.springframework.batch.parent
@@ -145,12 +145,6 @@
 							</exclude>
 						</excludes>
 					</dependencySet>
-					<dependencySet>
-						<outputFileNameMapping>
-							lib/${module.artifactId}-${module.version}.${module.extension}
-						</outputFileNameMapping>
-						<scope>provided</scope>
-					</dependencySet>
 				</dependencySets>
 			</binaries>
 		</moduleSet>	
@@ -165,46 +159,6 @@
 				<outputDirectory>samples</outputDirectory>
 				<unpack>false</unpack>
 				<dependencySets>
-					<dependencySet>
-						<outputFileNameMapping>
-							lib/${module.artifactId}-${module.version}.${module.extension}
-						</outputFileNameMapping>
-						<scope>runtime</scope>
-						<excludes>
-							<exclude>
-								org.springframework.batch:org.springframework.batch.parent
-							</exclude>
-							<exclude>
-								org.springframework.batch:org.springframework.batch.test
-							</exclude>
-							<exclude>
-								org.springframework.batch:org.springframework.batch.core
-							</exclude>
-							<exclude>
-								org.springframework.batch:org.springframework.batch.infrastructure
-							</exclude>
-						</excludes>
-					</dependencySet>
-					<dependencySet>
-						<outputFileNameMapping>
-							lib/${module.artifactId}-${module.version}.${module.extension}
-						</outputFileNameMapping>
-						<scope>provided</scope>
-						<excludes>
-							<exclude>
-								org.springframework.batch:org.springframework.batch.parent
-							</exclude>
-							<exclude>
-								org.springframework.batch:org.springframework.batch.test
-							</exclude>
-							<exclude>
-								org.springframework.batch:org.springframework.batch.core
-							</exclude>
-							<exclude>
-								org.springframework.batch:org.springframework.batch.infrastructure
-							</exclude>
-						</excludes>
-					</dependencySet>
 					<dependencySet>
 						<outputFileNameMapping>
 							lib/${module.artifactId}-${module.version}.${module.extension}