diff --git a/archetypes/.settings/org.maven.ide.eclipse.prefs b/archetypes/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 35d804dc6..000000000
--- a/archetypes/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Sun May 31 12:40:03 BST 2009
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/spring-batch-parent/pom.xml b/spring-batch-parent/pom.xml
index 9fb4255e7..88a1dfb55 100644
--- a/spring-batch-parent/pom.xml
+++ b/spring-batch-parent/pom.xml
@@ -352,6 +352,12 @@
 				<groupId>org.codehaus.jettison</groupId>
 				<artifactId>jettison</artifactId>
 				<version>1.0</version>
+				<exclusions>
+					<exclusion>
+						<groupId>stax</groupId>
+						<artifactId>stax-api</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.ibatis</groupId>
diff --git a/src/site/apt/downloads.apt b/src/site/apt/downloads.apt
index c46db362c..67c6a8ac9 100644
--- a/src/site/apt/downloads.apt
+++ b/src/site/apt/downloads.apt
@@ -11,7 +11,7 @@ Spring Batch Downloads
 
 * Zip Downloads
 
-  There are ZIP based artifacts that contain the release JARs.  There are two ZIP files in the release.  The first zip file is called <<<org.springframework.batch.*-no-dependencies.zip>>>.  This file contains only the JAR files for the release.  The second zip file is called <<<org.springframework.batch.*-with-dependencies.zip>>>.  This file contains the JAR files for the release as well as all of the third-party dependencies for the release.  In addition, this release contains the Spring Batch source code including the samples and their third-party dependencies as well.
+  There are ZIP based artifacts that contain the release JARs:  <<<spring-batch-*-no-dependencies.zip>>>.  This file contains only the JAR files for the release.  In addition, this release contains the Spring Batch source code including the samples.
 
   * Full releases: {{{http://static.springframework.org/downloads/nightly/release-download.php?project=BATCH}here}}.  
 
@@ -52,7 +52,7 @@ Spring Batch Downloads
 </dependency>
 +---------------
 
-  With full releases there are also traditional "spring-*" artifacts deployed on the Maven central repo.  Full releases in this format also go in our s3 repository, browseable {{{http://s3browse.com/explore/maven.springframework.org/release/org/springframework/batch}here}}:
+  There are also traditional "spring-*" artifacts deployed on the Maven central repo.  Full releases in this format also go in our s3 repository, browseable {{{http://s3browse.com/explore/maven.springframework.org/release/org/springframework/batch}here}}:
 
 +---------------
 <repository>
@@ -106,7 +106,7 @@ Spring Batch Downloads
 </dependency>
 +---------------
 
-  Milestones are also published in the older s3 repository with Maven Central format dependencies {{{http://s3browse.com/explore/maven.springframework.org/milestone/org/springframework/batch}browseable here}}.  To use them, just add the following repository to your POM (inside a \<repositories\> element at the top level):
+  Milestones are also published in the other s3 repository with Maven Central format dependencies {{{http://s3browse.com/explore/maven.springframework.org/milestone/org/springframework/batch}browseable here}}.  To use them, just add the following repository to your POM (inside a \<repositories\> element at the top level):
 
 +---------------
 <repository>
diff --git a/src/site/apt/snapshots.apt b/src/site/apt/snapshots.apt
index cb95a23e7..b92814436 100644
--- a/src/site/apt/snapshots.apt
+++ b/src/site/apt/snapshots.apt
@@ -9,25 +9,24 @@ Snapshot Builds
 
   These builds are provided for testing and development purposes only. They are built by a Bamboo process automatically using the latest snapshot from Subversion.
 	
-  Snapshots are deployed every night to the {{{http://s3browse.com/explore/repository.springsource.com/maven/bundles/snapshot}SpringSource Enterprise Repository}}, so use this in your POM (inside a \<repositories\> element):
+  Snapshots are deployed in Maven Central format every night to the {{{{http://s3browse.com/explore/maven.springframework.org/milestone/org/springframework/batch}SpringSource Maven Repository}}, so use this in your POM (inside a \<repositories\> element):
 
 +---
 <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>
+    <id>spring-s3</id>
+    <name>Spring Maven Snapshot Repository</name>
+    <url>http://s3.amazonaws.com/maven.springframework.org/snapshot</url>
 </repository>
 +---
 
-  If you are downloading the jar files manually from there you can see the internal and external project dependencies in the <<<org.springframework.batch.*/*.pom>>> files.  You will probably need <<<spring-batch-org.springframework.batch.core>>> and <<<org.springframework.batch.infrastructure>>>.
+  If you are downloading the jar files manually from there you can see the internal and external project dependencies in the <<<spring-batch-*/*.pom>>> files.  You will probably need <<<spring-batch-core>>> and <<<spring-batch-infrastructure>>>.
 
   Individual dependencies can then by added like so (inside a \<dependencies\> element at the top level):
 
 +---------------
 <dependency>
     <groupId>org.springframework.batch</groupId>
-    <artifactId>org.springframework.batch.core</artifactId>
+    <artifactId>spring-batch-core</artifactId>
     <version>2.0.2.CI-SNAPSHOT</version>
 </dependency>
 +---------------