diff --git a/pom.xml b/pom.xml
index 9ec65ed89..6cea4d7ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.batch</groupId>
@@ -79,7 +78,6 @@
 								<configuration>
 									<descriptors>
 										<descriptor>src/assembly/no-dependencies.xml</descriptor>
-										<descriptor>src/assembly/with-dependencies.xml</descriptor>
 									</descriptors>
 								</configuration>
 							</execution>
@@ -131,8 +129,7 @@
 									<imgSrcPath>src/site/docbook/reference/</imgSrcPath>
 									<admonGraphicsPath>src/docbkx/resources/images/</admonGraphicsPath>
 									<postProcess>
-										<copy file="${basedir}/target/docbkx/pdf/index.pdf"
-											tofile="${basedir}/target/site/reference/pdf/spring-batch-docs.pdf"
+										<copy file="${basedir}/target/docbkx/pdf/index.pdf" tofile="${basedir}/target/site/reference/pdf/spring-batch-docs.pdf"
 											failonerror="false" />
 									</postProcess>
 								</configuration>
@@ -241,49 +238,17 @@
 								</goals>
 								<configuration>
 									<tasks>
-										<unzip dest="target/it/with-dep">
-											<fileset dir="target">
-												<include name="*with-dep*.zip" />
-											</fileset>
-											<regexpmapper from="^[^/]*/(.*)$$" to="\1"
-												handledirsep="true" />
-										</unzip>
 										<unzip dest="target/it/no-dep">
 											<fileset dir="target">
 												<include name="*no-dep*.zip" />
 											</fileset>
-											<regexpmapper from="^[^/]*/(.*)$$" to="\1"
-												handledirsep="true" />
+											<regexpmapper from="^[^/]*/(.*)$$" to="\1" handledirsep="true" />
 										</unzip>
-										<fail
-											message="Failed integration test of zip distro: Spring Batch jar files are missing.">
+										<fail message="Failed integration test of zip distro: dist/* jar file count wrong.">
 											<condition>
 												<not>
-													<resourcecount count="3">
-														<fileset id="fs" dir="target/it/with-dep/dist"
-															includes="*.jar" />
-													</resourcecount>
-												</not>
-											</condition>
-										</fail>
-										<fail
-											message="Failed integration test of zip distro: dependency jar files are missing.">
-											<condition>
-												<not>
-													<resourcecount count="1">
-														<fileset id="fs" dir="target/it/with-dep/sources/lib"
-															includes="org.springframework.beans-*.jar" />
-													</resourcecount>
-												</not>
-											</condition>
-										</fail>
-										<fail
-											message="Failed integration test of zip distro: test dependency jar files are missing.">
-											<condition>
-												<not>
-													<resourcecount count="1">
-														<fileset id="fs" dir="target/it/with-dep/sources/lib"
-															includes="com.springsource.org.junit-*.jar" />
+													<resourcecount count="6">
+														<fileset id="fs" dir="target/it/no-dep/dist" includes="spring-batch-*.jar" />
 													</resourcecount>
 												</not>
 											</condition>
@@ -294,8 +259,30 @@
 						</executions>
 					</plugin>
 					<plugin>
+						<!-- After the file count, we build the samples and archetypes as well -->
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-invoker-plugin</artifactId>
+						<configuration>
+							<projectsDirectory>target/it/no-dep</projectsDirectory>
+							<localRepositoryPath>target/local-repo</localRepositoryPath>
+							<debug>true</debug>
+							<settingsFile>${basedir}/src/it/settings.xml</settingsFile>
+							<goals>
+								<goal>test</goal>
+							</goals>
+							<pomIncludes>
+								<pomInclude>samples/*/pom.xml</pomInclude>
+							</pomIncludes>
+						</configuration>
+						<executions>
+							<execution>
+								<id>integration-test</id>
+								<phase>verify</phase>
+								<goals>
+									<goal>run</goal>
+								</goals>
+							</execution>
+						</executions>
 					</plugin>
 				</plugins>
 			</build>
@@ -340,16 +327,6 @@
 					<url>http://people.apache.org/maven-snapshot-repository</url>
 				</repository>
 			</repositories>
-			<build>
-				<pluginManagement>
-					<plugins>
-						<plugin>
-							<artifactId>maven-site-plugin</artifactId>
-							<version>2.0-beta-8-SNAPSHOT</version>
-						</plugin>
-					</plugins>
-				</pluginManagement>
-			</build>
 		</profile>
 		<profile>
 			<id>manifest</id>
@@ -401,6 +378,10 @@
 		</extensions>
 		<pluginManagement>
 			<plugins>
+				<plugin>
+					<artifactId>maven-site-plugin</artifactId>
+					<version>2.0</version>
+				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-antrun-plugin</artifactId>
@@ -417,31 +398,6 @@
 						</dependency>
 					</dependencies>
 				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-invoker-plugin</artifactId>
-					<configuration>
-						<projectsDirectory>target/it/no-dep</projectsDirectory>
-						<localRepositoryPath>target/local-repo</localRepositoryPath>
-						<debug>true</debug>
-						<settingsFile>${basedir}/src/it/settings.xml</settingsFile>
-						<goals>
-							<goal>test</goal>
-						</goals>
-						<pomIncludes>
-							<pomInclude>samples/*/pom.xml</pomInclude>
-						</pomIncludes>
-					</configuration>
-					<executions>
-						<execution>
-							<id>integration-test</id>
-							<phase>verify</phase>
-							<goals>
-								<goal>run</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
diff --git a/spring-batch-core/.settings/org.eclipse.jdt.core.prefs b/spring-batch-core/.settings/org.eclipse.jdt.core.prefs
index e7a358223..fa11813ab 100644
--- a/spring-batch-core/.settings/org.eclipse.jdt.core.prefs
+++ b/spring-batch-core/.settings/org.eclipse.jdt.core.prefs
@@ -1,83 +1,7 @@
-#Tue Aug 19 18:12:49 BST 2008
+#Sat May 30 15:50:11 BST 2009
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=default
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.source=1.5
diff --git a/spring-batch-parent/pom.xml b/spring-batch-parent/pom.xml
index fdceb5678..9fb4255e7 100644
--- a/spring-batch-parent/pom.xml
+++ b/spring-batch-parent/pom.xml
@@ -7,7 +7,6 @@
 	<artifactId>spring-batch-parent</artifactId>
 	<version>2.0.1.CI-SNAPSHOT</version>
 	<name>Spring Batch Parent</name>
-	<url>http://static.springframework.org/spring-batch</url>
 	<description>Spring Batch parent project.  Defines dependencies and common configuration for the
 	build process.</description>
 	<packaging>pom</packaging>
@@ -92,21 +91,15 @@
 					<url>http://people.apache.org/maven-snapshot-repository</url>
 				</repository>
 			</repositories>
-			<build>
-				<pluginManagement>
-					<plugins>
-						<plugin>
-							<artifactId>maven-site-plugin</artifactId>
-							<version>2.0-beta-8-SNAPSHOT</version>
-						</plugin>
-					</plugins>
-				</pluginManagement>
-			</build>
 		</profile>
 	</profiles>
 	<build>
 		<pluginManagement>
 			<plugins>
+				<plugin>
+					<artifactId>maven-site-plugin</artifactId>
+					<version>2.0</version>
+				</plugin>
 				<plugin>
 					<groupId>com.springsource.bundlor</groupId>
 					<artifactId>com.springsource.bundlor.maven</artifactId>
diff --git a/src/assembly/no-dependencies.xml b/src/assembly/no-dependencies.xml
index 5e1bbd2f5..0138b4783 100644
--- a/src/assembly/no-dependencies.xml
+++ b/src/assembly/no-dependencies.xml
@@ -11,16 +11,16 @@
 		<moduleSet>
 			<includes>
 				<include>
-					org.springframework.batch:org.springframework.batch.parent
+					org.springframework.batch:spring-batch-parent
 				</include>
 				<include>
-					org.springframework.batch:org.springframework.batch.test
+					org.springframework.batch:spring-batch-test
 				</include>
 				<include>
-					org.springframework.batch:org.springframework.batch.core
+					org.springframework.batch:spring-batch-core
 				</include>
 				<include>
-					org.springframework.batch:org.springframework.batch.infrastructure
+					org.springframework.batch:spring-batch-infrastructure
 				</include>
 			</includes>
 			<sources>
@@ -39,10 +39,10 @@
 		<moduleSet>
 			<includes>
 				<include>
-					org.springframework.batch:org.springframework.batch.samples
+					org.springframework.batch:spring-batch-samples
 				</include>
 				<include>
-					org.springframework.batch:org.springframework.batch.archetype.simple.cli
+					org.springframework.batch:spring-batch-simple-cli
 				</include>
 			</includes>
 			<sources>
@@ -62,7 +62,7 @@
 		<moduleSet>
 			<includes>
 				<include>
-					org.springframework.batch:org.springframework.batch.parent
+					org.springframework.batch:spring-batch-parent
 				</include>
 			</includes>
 			<sources>
diff --git a/src/assembly/with-dependencies.xml b/src/assembly/with-dependencies.xml
deleted file mode 100644
index baacaefa5..000000000
--- a/src/assembly/with-dependencies.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<assembly>
-	<id>with-dependencies</id>
-	<formats>
-		<format>zip</format>
-	</formats>
-	<componentDescriptors>
-		<componentDescriptor>src/assembly/docs.xml</componentDescriptor>
-	</componentDescriptors>
-	<includeBaseDirectory>true</includeBaseDirectory>
-	<moduleSets>
-		<moduleSet>
-			<includes>
-				<include>
-					org.springframework.batch:org.springframework.batch.parent
-				</include>
-				<include>
-					org.springframework.batch:org.springframework.batch.test
-				</include>
-				<include>
-					org.springframework.batch:org.springframework.batch.core
-				</include>
-				<include>
-					org.springframework.batch:org.springframework.batch.infrastructure
-				</include>
-			</includes>
-			<sources>
-				<includeModuleDirectory>false</includeModuleDirectory>
-				<fileSets>
-					<fileSet>
-						<directory>target</directory>
-						<outputDirectory>dist</outputDirectory>
-						<includes>
-							<include>*.jar</include>
-						</includes>
-					</fileSet>
-				</fileSets>
-			</sources>
-		</moduleSet>	
-		<moduleSet>
-			<includes>
-				<include>
-					org.springframework.batch:org.springframework.batch.samples
-				</include>
-				<include>
-					org.springframework.batch:org.springframework.batch.archetype.simple.cli
-				</include>
-			</includes>
-			<sources>
-				<outputDirectoryMapping>
-					samples/${module.artifactId}
-				</outputDirectoryMapping>
-				<fileSets>
-					<fileSet>
-						<excludes>
-							<exclude>bin/**</exclude>
-							<exclude>target/**</exclude>
-						</excludes>
-					</fileSet>
-				</fileSets>
-			</sources>
-		</moduleSet>
-		<moduleSet>
-			<includes>
-				<include>
-					org.springframework.batch:org.springframework.batch.test
-				</include>
-				<include>
-					org.springframework.batch:org.springframework.batch.core
-				</include>
-				<include>
-					org.springframework.batch:org.springframework.batch.infrastructure
-				</include>
-			</includes>
-			<sources>
-				<outputDirectoryMapping>
-					sources/${module.artifactId}
-				</outputDirectoryMapping>
-				<fileSets>
-					<fileSet>
-						<excludes>
-							<exclude>bin/**</exclude>
-							<exclude>target/**</exclude>
-						</excludes>
-					</fileSet>
-				</fileSets>
-			</sources>
-		</moduleSet>
-		<moduleSet>
-			<includes>
-				<include>
-					org.springframework.batch:org.springframework.batch.parent
-				</include>
-			</includes>
-			<sources>
-				<outputDirectoryMapping>
-					sources/spring-batch-parent
-				</outputDirectoryMapping>
-				<fileSets>
-					<fileSet>
-						<excludes>
-							<exclude>bin/**</exclude>
-							<exclude>target/**</exclude>
-						</excludes>
-					</fileSet>
-				</fileSets>
-			</sources>
-		</moduleSet>
-		<moduleSet>
-			<includes>
-				<include>
-					org.springframework.batch:org.springframework.batch.parent
-				</include>
-				<include>
-					org.springframework.batch:org.springframework.batch.test
-				</include>
-				<include>
-					org.springframework.batch:org.springframework.batch.core
-				</include>
-				<include>
-					org.springframework.batch:org.springframework.batch.infrastructure
-				</include>
-			</includes>
-			<binaries>
-				<includeDependencies>false</includeDependencies>
-				<outputDirectory>sources</outputDirectory>
-				<unpack>false</unpack>
-				<dependencySets>
-					<dependencySet>
-						<outputFileNameMapping>
-							lib/${module.artifactId}-${module.version}.${module.extension}
-						</outputFileNameMapping>
-						<scope>test</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>
-				</dependencySets>
-			</binaries>
-		</moduleSet>	
-		<moduleSet>
-			<includes>
-				<include>
-					org.springframework.batch:org.springframework.batch.samples
-				</include>
-			</includes>
-			<binaries>
-				<includeDependencies>true</includeDependencies>
-				<outputDirectory>samples</outputDirectory>
-				<unpack>false</unpack>
-				<dependencySets>
-					<dependencySet>
-						<outputFileNameMapping>
-							lib/${module.artifactId}-${module.version}.${module.extension}
-						</outputFileNameMapping>
-						<scope>test</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>
-				</dependencySets>
-			</binaries>
-		</moduleSet>
-	</moduleSets>
-</assembly>