diff --git a/archetypes/simple-cli/pom.xml b/archetypes/simple-cli/pom.xml
index d278b3c9c..3b745b49b 100644
--- a/archetypes/simple-cli/pom.xml
+++ b/archetypes/simple-cli/pom.xml
@@ -143,15 +143,15 @@
 						<outputFile>${project.basedir}/src/main/resources/META-INF/MANIFEST.MF</outputFile>
 						<manifestTemplatePath>${project.basedir}/template.mf</manifestTemplatePath>
 					</configuration>
-					<executions>
-						<execution>
-							<id>bundlor-manifest</id>
-							<phase>package</phase>
-							<goals>
-								<goal>manifest</goal>
-							</goals>
-						</execution>
-					</executions>
+				</plugin>
+				<plugin>
+					<artifactId>maven-assembly-plugin</artifactId>
+					<inherited>false</inherited>
+					<configuration>
+						<descriptorRefs>
+							<descriptorRef>project</descriptorRef>
+						</descriptorRefs>
+					</configuration>
 				</plugin>
 			</plugins>
 		</pluginManagement>
@@ -256,12 +256,12 @@
 		<repository>
 			<id>spring-milestone</id>
 			<name>Spring Milestone Repository</name>
-			<url>s3://maven.springframework.org/milestone</url>
+			<url>file:///${user.dir}/target/staging/milestone</url>
 		</repository>
 		<snapshotRepository>
 			<id>spring-snapshot</id>
 			<name>Spring Snapshot Repository</name>
-			<url>s3://maven.springframework.org/snapshot</url>
+			<url>file:///${user.dir}/target/staging/snapshot</url>
 		</snapshotRepository>
 	</distributionManagement>
 
diff --git a/pom.xml b/pom.xml
index ce06160a2..7e09f92c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,6 +12,7 @@
 	<version>2.0.0.CI-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<modules>
+		<module>spring-batch-parent</module>
 		<module>spring-batch-infrastructure</module>
 		<module>spring-batch-core</module>
 		<module>spring-batch-test</module>
@@ -47,21 +48,12 @@
 			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
 		</license>
 	</licenses>
-	<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>
-	</properties>
 	<profiles>
-		<profile>
-			<id>default</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-		</profile>
 		<profile>
 			<id>all</id>
 			<modules>
+				<module>spring-batch-samples</module>
+				<module>archetypes</module>
 				<module>spring-batch-infrastructure-tests</module>
 				<module>spring-batch-integration</module>
 				<module>build-central</module>
@@ -84,12 +76,12 @@
 					</plugin>
 					<plugin>
 						<artifactId>maven-assembly-plugin</artifactId>
-						<version>2.2-beta-3</version>
 						<inherited>false</inherited>
 						<executions>
 							<execution>
 								<id>zip-files</id>
 								<inherited>false</inherited>
+								<phase>package</phase>
 								<goals>
 									<goal>single</goal>
 								</goals>
@@ -334,19 +326,6 @@
 				</snapshotRepository>
 			</distributionManagement>
 		</profile>
-		<profile>
-			<id>strict</id>
-			<properties>
-				<maven.test.failure.ignore>false</maven.test.failure.ignore>
-			</properties>
-		</profile>
-		<profile>
-			<id>fast</id>
-			<properties>
-				<maven.test.skip>true</maven.test.skip>
-				<maven.javadoc.skip>true</maven.javadoc.skip>
-			</properties>
-		</profile>
 		<profile>
 			<id>snapshots</id>
 			<pluginRepositories>
@@ -399,27 +378,6 @@
 				</plugins>
 			</build>
 		</profile>
-		<profile>
-			<id>mysql</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<artifactId>maven-surefire-plugin</artifactId>
-						<configuration>
-							<systemProperties>
-								<property>
-									<name>environment</name>
-									<value>mysql</value>
-								</property>
-							</systemProperties>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
 	</profiles>
 	<distributionManagement>
 		<downloadUrl>http://www.springframework.org/download</downloadUrl>
@@ -450,31 +408,6 @@
 		</extensions>
 		<pluginManagement>
 			<plugins>
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>emma-maven-plugin</artifactId>
-					<version>1.0-20070912.011112-4</version>
-				</plugin>
-				<plugin>
-					<groupId>com.springsource.bundlor</groupId>
-					<artifactId>com.springsource.bundlor.maven</artifactId>
-					<version>${bundlor.version}</version>
-					<inherited>true</inherited>
-					<configuration>
-						<manifestTemplatePath>${project.basedir}/template.mf</manifestTemplatePath>
-						<outputFile>${project.basedir}/src/main/resources/META-INF/MANIFEST.MF</outputFile>
-					</configuration>
-					<executions>
-						<execution>
-							<id>bundlor-transform</id>
-							<!-- This isn't necessary, but Q4E barfs without it. -->
-							<phase>package</phase>
-							<goals>
-								<goal>transform</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-antrun-plugin</artifactId>
@@ -484,21 +417,11 @@
 							<artifactId>ant</artifactId>
 							<version>1.7.0</version>
 						</dependency>
-						<dependency>
-							<groupId>org.apache.ant</groupId>
-							<artifactId>ant-trax</artifactId>
-							<version>1.7.0</version>
-						</dependency>
 						<dependency>
 							<groupId>org.apache.ant</groupId>
 							<artifactId>ant-apache-regexp</artifactId>
 							<version>1.7.0</version>
 						</dependency>
-						<dependency>
-							<groupId>foundrylogic.vpp</groupId>
-							<artifactId>vpp</artifactId>
-							<version>2.2.1</version>
-						</dependency>
 					</dependencies>
 				</plugin>
 				<plugin>
@@ -606,329 +529,7 @@
 				</plugin>
 			</plugins>
 		</pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.5</source>
-					<target>1.5</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<includes>
-						<include>**/*Tests.java</include>
-					</includes>
-					<excludes>
-						<exclude>**/Abstract*.java</exclude>
-					</excludes>
-					<junitArtifactName>org.junit:com.springsource.org.junit</junitArtifactName>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-clean-plugin</artifactId>
-				<configuration>
-					<filesets>
-						<fileset>
-							<directory>${basedir}</directory>
-							<includes>
-								<include>activemq-data</include>
-								<include>derby-home</include>
-								<include>amqstore</include>
-								<include>.clover</include>
-								<include>surefire*</include>
-								<include>derby.log</include>
-							</includes>
-							<followSymlinks>false</followSymlinks>
-						</fileset>
-					</filesets>
-				</configuration>
-			</plugin>
-		</plugins>
 	</build>
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.aspectj</groupId>
-				<artifactId>com.springsource.org.aspectj.runtime</artifactId>
-				<version>1.5.4</version>
-			</dependency>
-			<dependency>
-				<groupId>org.aspectj</groupId>
-				<artifactId>com.springsource.org.aspectj.weaver</artifactId>
-				<version>1.5.4</version>
-			</dependency>
-			<dependency>
-				<groupId>org.junit</groupId>
-				<artifactId>com.springsource.org.junit</artifactId>
-				<version>4.4.0</version>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.easymock</groupId>
-				<artifactId>com.springsource.org.easymock</artifactId>
-				<version>2.3.0</version>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>javax.jms</groupId>
-				<artifactId>com.springsource.javax.jms</artifactId>
-				<version>1.1.0</version>
-				<optional>true</optional>
-			</dependency>
-			<dependency>
-				<groupId>javax.transaction</groupId>
-				<artifactId>com.springsource.javax.transaction</artifactId>
-				<version>1.1.0</version>
-				<optional>true</optional>
-			</dependency>
-			<dependency>
-				<groupId>javax.annotation</groupId>
-				<artifactId>com.springsource.javax.annotation</artifactId>
-				<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>
-				<version>3.2.6.ga</version>
-				<optional>true</optional>
-				<exclusions>
-					<exclusion>
-						<groupId>org.objectweb.asm</groupId>
-						<artifactId>com.springsource.org.objectweb.asm</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>org.objectweb.asm</groupId>
-						<artifactId>com.springsource.org.objectweb.asm.attrs</artifactId>
-					</exclusion>
-					<exclusion>
-						<!-- This one isn't in BRITS but is needed by Maven Central -->
-						<groupId>javax.transaction</groupId>
-						<artifactId>jta</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>org.hibernate</groupId>
-				<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>
-				<artifactId>com.springsource.org.hibernate.annotations</artifactId>
-				<version>3.3.1.ga</version>
-				<optional>true</optional>
-			</dependency>
-			<dependency>
-				<groupId>net.sourceforge.cglib</groupId>
-				<artifactId>com.springsource.net.sf.cglib</artifactId>
-				<version>2.1.3</version>
-				<optional>true</optional>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.commons</groupId>
-				<artifactId>com.springsource.org.apache.commons.logging</artifactId>
-				<version>1.1.1</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.commons</groupId>
-				<artifactId>com.springsource.org.apache.commons.lang</artifactId>
-				<version>2.1.0</version>
-				<optional>true</optional>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.commons</groupId>
-				<artifactId>com.springsource.org.apache.commons.io</artifactId>
-				<version>1.4.0</version>
-				<optional>true</optional>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.commons</groupId>
-				<artifactId>com.springsource.org.apache.commons.collections</artifactId>
-				<version>3.2.0</version>
-				<optional>true</optional>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.commons</groupId>
-				<artifactId>com.springsource.org.apache.commons.dbcp</artifactId>
-				<version>1.2.2.osgi</version>
-				<optional>true</optional>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.log4j</groupId>
-				<artifactId>com.springsource.org.apache.log4j</artifactId>
-				<version>1.2.15</version>
-				<optional>true</optional>
-			</dependency>
-			<dependency>
-				<groupId>org.hsqldb</groupId>
-				<artifactId>com.springsource.org.hsqldb</artifactId>
-				<version>1.8.0.9</version>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.derby</groupId>
-				<artifactId>com.springsource.org.apache.derby</artifactId>
-				<version>10.3.2000001.599110</version>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>com.thoughtworks.xstream</groupId>
-				<artifactId>com.springsource.com.thoughtworks.xstream</artifactId>
-				<version>1.3.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.codehaus.jettison</groupId>
-				<artifactId>com.springsource.org.codehaus.jettison</artifactId>
-				<version>1.0.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.ibatis</groupId>
-				<artifactId>com.springsource.com.ibatis</artifactId>
-				<version>2.3.0.677</version>
-				<optional>true</optional>
-			</dependency>
-			<dependency>
-				<groupId>javax.persistence</groupId>
-				<artifactId>com.springsource.javax.persistence</artifactId>
-				<version>1.0.0</version>
-				<optional>true</optional>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.osgi</groupId>
-				<artifactId>org.eclipse.osgi</artifactId>
-				<version>3.4.2.R34x_v20080826-1230</version>
-				<optional>true</optional>
-			</dependency>
-			<dependency>
-				<groupId>org.objectweb.asm</groupId>
-				<artifactId>com.springsource.org.objectweb.asm</artifactId>
-				<version>2.2.3</version>
-				<scope>runtime</scope>
-				<optional>true</optional>
-			</dependency>
-			<dependency>
-				<groupId>org.objectweb.asm</groupId>
-				<artifactId>com.springsource.org.objectweb.asm.attrs</artifactId>
-				<version>2.2.3</version>
-				<scope>runtime</scope>
-				<optional>true</optional>
-			</dependency>
-			<dependency>
-				<groupId>org.objectweb.asm</groupId>
-				<artifactId>com.springsource.org.objectweb.asm.commons</artifactId>
-				<version>2.2.3</version>
-				<scope>runtime</scope>
-				<optional>true</optional>
-			</dependency>
-			<dependency>
-				<groupId>javax.servlet</groupId>
-				<artifactId>com.springsource.javax.servlet</artifactId>
-				<version>2.5.0</version>
-				<scope>provided</scope>
-				<optional>true</optional>
-			</dependency>
-			<dependency>
-				<!-- TODO: remove this or find a replacement in Java 5 / BRITS -->
-				<groupId>stax</groupId>
-				<artifactId>stax</artifactId>
-				<version>1.2.0</version>
-				<optional>true</optional>
-			</dependency>
-			<!-- Spring Dependencies -->
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>org.springframework.aop</artifactId>
-				<version>${spring.framework.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>org.springframework.beans</artifactId>
-				<version>${spring.framework.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>org.springframework.context</artifactId>
-				<version>${spring.framework.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>org.springframework.context.support</artifactId>
-				<version>${spring.framework.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>org.springframework.core</artifactId>
-				<version>${spring.framework.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>org.springframework.expression</artifactId>
-				<version>${spring.framework.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>org.springframework.jdbc</artifactId>
-				<version>${spring.framework.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>org.springframework.jms</artifactId>
-				<version>${spring.framework.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>org.springframework.orm</artifactId>
-				<version>${spring.framework.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>org.springframework.test</artifactId>
-				<version>${spring.framework.version}</version>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>org.springframework.transaction</artifactId>
-				<version>${spring.framework.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>org.springframework.web</artifactId>
-				<version>${spring.framework.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.ws</groupId>
-				<artifactId>org.springframework.oxm</artifactId>
-				<version>1.5.5.A</version>
-				<optional>true</optional>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.osgi</groupId>
-				<artifactId>org.springframework.osgi.core</artifactId>
-				<version>1.1.2.A</version>
-				<optional>true</optional>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
 	<reporting>
 		<excludeDefaults>true</excludeDefaults>
 		<plugins>
@@ -991,52 +592,6 @@
 			<email>daniel.h.garrette@accenture.com</email>
 		</developer>
 	</developers>
-	<repositories>
-		<repository>
-			<id>objectstyle</id>
-			<name>ObjectStyle.org Repository</name>
-			<url>http://objectstyle.org/maven2/</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<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>
-		</repository>
-		<repository>
-			<id>com.springsource.repository.bundles.milestone</id>
-			<name>SpringSource Enterprise Bundle Repository -
-				SpringSource Bundle Milestoness</name>
-			<url>http://repository.springsource.com/maven/bundles/milestone</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>com.springsource.repository.bundles.external</id>
-			<name>SpringSource Enterprise Bundle Repository -
-				External Bundle Releases</name>
-			<url>http://repository.springsource.com/maven/bundles/external</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>com.springsource.repository.bundles.snapshot</id>
-			<name>SpringSource Enterprise Bundle Repository -
-				Snapshot Bundle Releases</name>
-			<url>http://repository.springsource.com/maven/bundles/snapshot</url>
-			<snapshots>
-				<updatePolicy>never</updatePolicy>
-			</snapshots>
-		</repository>
-	</repositories>
 	<pluginRepositories>
 		<pluginRepository>
 			<id>com.springsource.repository.bundles.milestone</id>
diff --git a/spring-batch-core/pom.xml b/spring-batch-core/pom.xml
index b41bacd1f..9e40e8b6d 100644
--- a/spring-batch-core/pom.xml
+++ b/spring-batch-core/pom.xml
@@ -12,9 +12,9 @@
 
 	<parent>
 		<groupId>org.springframework.batch</groupId>
-		<artifactId>org.springframework.batch</artifactId>
+		<artifactId>org.springframework.batch.parent</artifactId>
 		<version>2.0.0.CI-SNAPSHOT</version>
-		<relativePath>..</relativePath>
+		<relativePath>../spring-batch-parent</relativePath>
 	</parent>
 
 	<profiles>
diff --git a/spring-batch-infrastructure-tests/pom.xml b/spring-batch-infrastructure-tests/pom.xml
index 4974be90e..57738b8c7 100644
--- a/spring-batch-infrastructure-tests/pom.xml
+++ b/spring-batch-infrastructure-tests/pom.xml
@@ -7,9 +7,9 @@
 	<description> Integration tests for the Spring Batch Infrastructure </description>
 	<parent>
 		<groupId>org.springframework.batch</groupId>
+		<artifactId>org.springframework.batch.parent</artifactId>
 		<version>2.0.0.CI-SNAPSHOT</version>
-		<artifactId>org.springframework.batch</artifactId>
-		<relativePath>..</relativePath>
+		<relativePath>../spring-batch-parent</relativePath>
 	</parent>
 	<profiles>
 		<profile>
diff --git a/spring-batch-infrastructure/pom.xml b/spring-batch-infrastructure/pom.xml
index b8fffd0d5..de2191a83 100644
--- a/spring-batch-infrastructure/pom.xml
+++ b/spring-batch-infrastructure/pom.xml
@@ -10,9 +10,9 @@
 	</description>
 	<parent>
 		<groupId>org.springframework.batch</groupId>
-		<artifactId>org.springframework.batch</artifactId>
+		<artifactId>org.springframework.batch.parent</artifactId>
 		<version>2.0.0.CI-SNAPSHOT</version>
-		<relativePath>..</relativePath>
+		<relativePath>../spring-batch-parent</relativePath>
 	</parent>
 	<properties>
 		<bundle.symbolic.name>${pom.groupId}.infrastructure</bundle.symbolic.name>
diff --git a/spring-batch-integration/pom.xml b/spring-batch-integration/pom.xml
index 4aed5c716..a4b52d9ca 100644
--- a/spring-batch-integration/pom.xml
+++ b/spring-batch-integration/pom.xml
@@ -5,11 +5,10 @@
 	<artifactId>org.springframework.batch.integration</artifactId>
 	<name>Enterprise Integration</name>
 	<parent>
-		<artifactId>org.springframework.batch
-		</artifactId>
 		<groupId>org.springframework.batch</groupId>
+		<artifactId>org.springframework.batch.parent</artifactId>
 		<version>2.0.0.CI-SNAPSHOT</version>
-		<relativePath>..</relativePath>
+		<relativePath>../spring-batch-parent</relativePath>
 	</parent>
 	<profiles>
 		<profile>
diff --git a/spring-batch-samples/pom.xml b/spring-batch-samples/pom.xml
index fea5cd502..5b1c180d8 100644
--- a/spring-batch-samples/pom.xml
+++ b/spring-batch-samples/pom.xml
@@ -10,9 +10,9 @@
 	</description>
 	<parent>
 		<groupId>org.springframework.batch</groupId>
-		<artifactId>org.springframework.batch</artifactId>
+		<artifactId>org.springframework.batch.parent</artifactId>
 		<version>2.0.0.CI-SNAPSHOT</version>
-		<relativePath>..</relativePath>
+		<relativePath>../spring-batch-parent</relativePath>
 	</parent>
 	<dependencies>
 		<dependency>
diff --git a/spring-batch-test/pom.xml b/spring-batch-test/pom.xml
index 1f16bdcc4..1712019e6 100755
--- a/spring-batch-test/pom.xml
+++ b/spring-batch-test/pom.xml
@@ -9,10 +9,10 @@
 	<description>Domain for batch job testing</description>
 
 	<parent>
-		<artifactId>org.springframework.batch</artifactId>
 		<groupId>org.springframework.batch</groupId>
+		<artifactId>org.springframework.batch.parent</artifactId>
 		<version>2.0.0.CI-SNAPSHOT</version>
-		<relativePath>..</relativePath>
+		<relativePath>../spring-batch-parent</relativePath>
 	</parent>
 
 	<profiles>
diff --git a/src/assembly/docs.xml b/src/assembly/docs.xml
index 6db23ec7a..55f3291a8 100644
--- a/src/assembly/docs.xml
+++ b/src/assembly/docs.xml
@@ -2,9 +2,11 @@
 <component>
 	<fileSets>
 		<fileSet>
+			<directory>src/assembly</directory>
+			<outputDirectory></outputDirectory>
 			<includes>
-				<include>src/assembly/license.txt</include>
-				<include>src/assembly/notice.txt</include>
+				<include>license.txt</include>
+				<include>notice.txt</include>
 			</includes>
 		</fileSet>
 	 	<fileSet>
diff --git a/src/assembly/no-dependencies.xml b/src/assembly/no-dependencies.xml
index 466a3c54b..dc39aa0b4 100644
--- a/src/assembly/no-dependencies.xml
+++ b/src/assembly/no-dependencies.xml
@@ -10,6 +10,9 @@
 	<moduleSets>
 		<moduleSet>
 			<includes>
+				<include>
+					org.springframework.batch:org.springframework.batch.parent
+				</include>
 				<include>
 					org.springframework.batch:org.springframework.batch.test
 				</include>
diff --git a/src/assembly/with-dependencies.xml b/src/assembly/with-dependencies.xml
index d391718af..7cb36a807 100644
--- a/src/assembly/with-dependencies.xml
+++ b/src/assembly/with-dependencies.xml
@@ -10,6 +10,9 @@
 	<moduleSets>
 		<moduleSet>
 			<includes>
+				<include>
+					org.springframework.batch:org.springframework.batch.parent
+				</include>
 				<include>
 					org.springframework.batch:org.springframework.batch.test
 				</include>
@@ -58,6 +61,9 @@
 		</moduleSet>
 		<moduleSet>
 			<includes>
+				<include>
+					org.springframework.batch:org.springframework.batch.parent
+				</include>
 				<include>
 					org.springframework.batch:org.springframework.batch.test
 				</include>
@@ -84,6 +90,9 @@
 		</moduleSet>
 		<moduleSet>
 			<includes>
+				<include>
+					org.springframework.batch:org.springframework.batch.parent
+				</include>
 				<include>
 					org.springframework.batch:org.springframework.batch.test
 				</include>
@@ -106,7 +115,7 @@
 						<scope>runtime</scope>
 						<excludes>
 							<exclude>
-								org.springframework.batch:org.springframework.batch
+								org.springframework.batch:org.springframework.batch.parent
 							</exclude>
 							<exclude>
 								org.springframework.batch:org.springframework.batch.test
@@ -146,7 +155,7 @@
 						<scope>runtime</scope>
 						<excludes>
 							<exclude>
-								org.springframework.batch:org.springframework.batch
+								org.springframework.batch:org.springframework.batch.parent
 							</exclude>
 							<exclude>
 								org.springframework.batch:org.springframework.batch.test
@@ -166,7 +175,7 @@
 						<scope>provided</scope>
 						<excludes>
 							<exclude>
-								org.springframework.batch:org.springframework.batch
+								org.springframework.batch:org.springframework.batch.parent
 							</exclude>
 							<exclude>
 								org.springframework.batch:org.springframework.batch.test
@@ -186,7 +195,7 @@
 						<scope>test</scope>
 						<excludes>
 							<exclude>
-								org.springframework.batch:org.springframework.batch
+								org.springframework.batch:org.springframework.batch.parent
 							</exclude>
 							<exclude>
 								org.springframework.batch:org.springframework.batch.test