diff --git a/pom.xml b/pom.xml
index c46837705..42ed9f523 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,84 +1,80 @@
-<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">
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
 	<groupId>org.springframework.batch</groupId>
 	<artifactId>spring-batch</artifactId>
-	<packaging>pom</packaging>
-	<version>1.0-m2-SNAPSHOT</version>
 	<name>Spring Batch</name>
 	<description>
 		<!--  Use CDATA to keep it on a single line in the manifest -->
 		<![CDATA[Spring Batch provides tools for enterprise batch or bulk processing. It can be used to wire up jobs, and track	their execution, or simply as an optimisation for repetitive processing in a transactional environment. Spring Batch is part of the Spring Portfolio.]]>
 	</description>
+	<version>1.0-m2-SNAPSHOT</version>
+	<packaging>pom</packaging>
 	<url>http://static.springframework.org/spring-batch</url>
-	<issueManagement>
-		<system>JIRA</system>
-		<url>http://opensource.atlassian.com/projects/spring/browse/BATCH</url>
-	</issueManagement>
-	<ciManagement>
-		<system>Bamboo</system>
-		<url>http://build.springframework.org:8085/bamboo/browse/BATCH</url>
-	</ciManagement>
-	<mailingLists>
-		<mailingList>
-			<name>Spring Batch Forum</name>
-			<post>http://forum.springframework.org/forumdisplay.php?f=41</post>
-			<archive>http://forum.springframework.org/forumdisplay.php?f=41</archive>
-		</mailingList>
-		<mailingList>
-			<subscribe>http://lists.interface21.com/listmanager/listinfo/spring-batch-announce</subscribe>
-			<unsubscribe>http://lists.interface21.com/listmanager/listinfo/spring-batch-announce</unsubscribe>
-			<name>Spring Batch Announce</name>
-			<archive>http://lists.interface21.com/archives/spring-batch-announce</archive>
-		</mailingList>
-	</mailingLists>
-	<distributionManagement>
-		<downloadUrl>http://www.springframework.org/spring-batch</downloadUrl>
-		<repository>
-			<id>local</id>
-			<url>file:///${user.dir}/target/staging</url>
-		</repository>
-        <snapshotRepository>
-            <id>spring-snapshot</id>
-            <name>Spring Snapshot Repository</name>
-            <url>s3://maven.springframework.org/snapshot</url>
-        </snapshotRepository>
-		<site>
-			<id>staging</id>
-			<url>file:///${user.dir}/target/staging</url>
-		</site>
-	</distributionManagement>
-	<inceptionYear>2007</inceptionYear>
-	<developers>
-		<developer>
-			<id>dsyer</id>
-			<name>Dave Syer</name>
-			<email>dsyer@interface21.com</email>
-		</developer>
-		<developer>
-			<id>lward</id>
-			<name>Lucas Ward</name>
-			<email>lucas.l.ward@accenture.com</email>
-		</developer>
-	</developers>
 	<organization>
 		<name>Interface 21</name>
 		<url>http://www.interface21.com</url>
 	</organization>
-	<licenses>
-        <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-	</licenses>
 	<scm>
-        <connection>scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-batch/trunk</connection>
-        <developerConnection>scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-batch/trunk</developerConnection>
-        <url>http://fisheye3.cenqua.com/browse/springframework/spring-batch/trunk</url>
-    </scm>
+		<url>
+			https://springframework.svn.sourceforge.net/svnroot/springframework/spring-batch/trunk
+		</url>
+		<connection>
+			scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-batch/trunk
+		</connection>
+		<developerConnection>
+			scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-batch/trunk
+		</developerConnection>
+	</scm>
+	<issueManagement>
+		<system>JIRA</system>
+		<url>
+			http://opensource.atlassian.com/projects/spring/browse/BATCH
+		</url>
+	</issueManagement>
+	<mailingLists>
+		<mailingList>
+			<name>Spring Batch Forum</name>
+			<post>
+				http://forum.springframework.org/forumdisplay.php?f=41
+			</post>
+			<archive>
+				http://forum.springframework.org/forumdisplay.php?f=41
+			</archive>
+		</mailingList>
+		<mailingList>
+			<subscribe>
+				http://lists.interface21.com/listmanager/listinfo/spring-batch-announce
+			</subscribe>
+			<unsubscribe>
+				http://lists.interface21.com/listmanager/listinfo/spring-batch-announce
+			</unsubscribe>
+			<name>Spring Batch Announce</name>
+			<archive>
+				http://lists.interface21.com/archives/spring-batch-announce
+			</archive>
+		</mailingList>
+	</mailingLists>
+	<ciManagement>
+		<system>Bamboo</system>
+		<url>
+			http://build.springframework.org:8085/bamboo/browse/BATCH
+		</url>
+	</ciManagement>
+	<licenses>
+		<license>
+			<name>Apache 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+		</license>
+	</licenses>
+
+	<properties>
+		<maven.test.failure.ignore>true</maven.test.failure.ignore>
+	</properties>
+
 	<modules>
 		<module>infrastructure</module>
 		<module>core</module>
@@ -87,6 +83,7 @@
 		<module>integration</module>
 		<module>docs</module>
 	</modules>
+
 	<profiles>
 		<profile>
 			<id>default</id>
@@ -99,14 +96,18 @@
 			<distributionManagement>
 				<site>
 					<id>static.springframework.org</id>
-					<url>scp://static.springframework.org:/var/www/domains/springframework.org/static/htdocs/spring-batch</url>
+					<url>
+						scp://static.springframework.org:/var/www/domains/springframework.org/static/htdocs/spring-batch
+					</url>
 				</site>
 			</distributionManagement>
 		</profile>
 		<profile>
 			<id>strict</id>
 			<properties>
-				<maven.test.failure.ignore>false</maven.test.failure.ignore>
+				<maven.test.failure.ignore>
+					false
+				</maven.test.failure.ignore>
 			</properties>
 		</profile>
 		<profile>
@@ -120,46 +121,22 @@
 			<pluginRepositories>
 				<pluginRepository>
 					<id>apache-snapshots</id>
-					<url>http://people.apache.org/maven-snapshot-repository</url>
+					<url>
+						http://people.apache.org/maven-snapshot-repository
+					</url>
 				</pluginRepository>
 			</pluginRepositories>
 		</profile>
 	</profiles>
-	<properties>
-		<maven.test.failure.ignore>true</maven.test.failure.ignore>
-	</properties>
-	<repositories>
-		<repository>
-			<id>apache-snapshots</id>
-			<url>http://people.apache.org/maven-snapshot-repository</url>
-		</repository>
-		<repository>
-			<id>spring-snapshots</id>
-			<url>https://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo-snapshots</url>
-		</repository>
-	</repositories>
-	<pluginRepositories>
-		<pluginRepository>
-			<id>spring</id>
-			<url>https://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo</url>
-		</pluginRepository>
-		<pluginRepository>
-			<id>spring-ext</id>
-			<url>https://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo-ext</url>
-		</pluginRepository>
-		<pluginRepository>
-			<id>objectstyle</id>
-			<url>http://objectstyle.org/maven2</url>
-		</pluginRepository>
-	</pluginRepositories>
+
+	<distributionManagement>
+		<site>
+			<id>staging</id>
+			<url>file:///${user.dir}/target/staging</url>
+		</site>
+	</distributionManagement>
+
 	<build>
-        <extensions>
-            <extension>
-                <groupId>org.springframework.aws</groupId>
-                <artifactId>spring-aws-maven</artifactId>
-                <version>1.1.1</version>
-            </extension>
-        </extensions>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -169,6 +146,18 @@
 					<target>1.4</target>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
@@ -193,12 +182,15 @@
 						<configuration>
 							<tasks>
 								<echo>Creating JUnit reports</echo>
-								<mkdir dir="target/surefire-reports"/>
-								<junitreport todir="target/surefire-reports">
-									<fileset dir="target/surefire-reports">
-										<include name="TEST-*.xml"/>
+								<mkdir dir="target/surefire-reports" />
+								<junitreport
+									todir="target/surefire-reports">
+									<fileset
+										dir="target/surefire-reports">
+										<include name="TEST-*.xml" />
 									</fileset>
-									<report todir="target/site/junit-reports"/>
+									<report
+										todir="target/site/junit-reports" />
 								</junitreport>
 							</tasks>
 						</configuration>
@@ -213,10 +205,10 @@
 							<tasks>
 								<echo>Removing test data</echo>
 								<delete failonerror="false">
-									<fileset dir="amqstore"/>
-									<fileset dir="activemq-data"/>
-									<fileset dir="derby-home"/>
-                				</delete>
+									<fileset dir="amqstore" />
+									<fileset dir="activemq-data" />
+									<fileset dir="derby-home" />
+								</delete>
 							</tasks>
 						</configuration>
 						<goals>
@@ -257,6 +249,41 @@
 			</plugin>
 		</plugins>
 	</build>
+
+	<repositories>
+		<repository>
+			<id>apache-snapshots</id>
+			<url>
+				http://people.apache.org/maven-snapshot-repository
+			</url>
+		</repository>
+		<repository>
+			<id>spring-snapshots</id>
+			<url>
+				https://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo-snapshots
+			</url>
+		</repository>
+	</repositories>
+
+	<pluginRepositories>
+		<pluginRepository>
+			<id>spring</id>
+			<url>
+				https://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo
+			</url>
+		</pluginRepository>
+		<pluginRepository>
+			<id>spring-ext</id>
+			<url>
+				https://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo-ext
+			</url>
+		</pluginRepository>
+		<pluginRepository>
+			<id>objectstyle</id>
+			<url>http://objectstyle.org/maven2</url>
+		</pluginRepository>
+	</pluginRepositories>
+
 	<reporting>
 		<excludeDefaults>true</excludeDefaults>
 		<plugins>
@@ -270,7 +297,9 @@
 				<version>1.0</version>
 				<configuration>
 					<name>JUnit Report</name>
-					<description>JUnit test results for this project</description>
+					<description>
+						JUnit test results for this project
+					</description>
 					<base>junit-reports</base>
 				</configuration>
 			</plugin>
@@ -282,21 +311,57 @@
 				<artifactId>maven-javadoc-plugin</artifactId>
 				<configuration>
 					<links>
-						<link>http://java.sun.com/j2ee/1.4/docs/api</link>
-						<link>http://java.sun.com/j2se/1.5.0/docs/api</link>
-						<link>http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/</link>
-						<link>http://jakarta.apache.org/commons/dbcp/apidocs/</link>
-						<link>http://jakarta.apache.org/commons/fileupload/apidocs/</link>
-						<link>http://jakarta.apache.org/commons/httpclient/apidocs/</link>
-						<link>http://jakarta.apache.org/commons/logging/api/</link>
-						<link>http://jakarta.apache.org/commons/pool/apidocs/</link>
+						<link>
+							http://java.sun.com/j2ee/1.4/docs/api
+						</link>
+						<link>
+							http://java.sun.com/j2se/1.5.0/docs/api
+						</link>
+						<link>
+							http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/
+						</link>
+						<link>
+							http://jakarta.apache.org/commons/dbcp/apidocs/
+						</link>
+						<link>
+							http://jakarta.apache.org/commons/fileupload/apidocs/
+						</link>
+						<link>
+							http://jakarta.apache.org/commons/httpclient/apidocs/
+						</link>
+						<link>
+							http://jakarta.apache.org/commons/logging/api/
+						</link>
+						<link>
+							http://jakarta.apache.org/commons/pool/apidocs/
+						</link>
 						<link>http://www.junit.org/junit/javadoc/</link>
-						<link>http://logging.apache.org/log4j/docs/api/</link>
-						<link>http://jakarta.apache.org/regexp/apidocs/</link>
-						<link>http://jakarta.apache.org/velocity/api/</link>
+						<link>
+							http://logging.apache.org/log4j/docs/api/
+						</link>
+						<link>
+							http://jakarta.apache.org/regexp/apidocs/
+						</link>
+						<link>
+							http://jakarta.apache.org/velocity/api/
+						</link>
 					</links>
 				</configuration>
 			</plugin>
 		</plugins>
 	</reporting>
+
+	<developers>
+		<developer>
+			<id>dsyer</id>
+			<name>Dave Syer</name>
+			<email>dsyer@interface21.com</email>
+		</developer>
+		<developer>
+			<id>lward</id>
+			<name>Lucas Ward</name>
+			<email>lucas.l.ward@accenture.com</email>
+		</developer>
+	</developers>
+
 </project>