diff --git a/execution/pom.xml b/execution/pom.xml
index 7e27a2f09..3371f3eba 100644
--- a/execution/pom.xml
+++ b/execution/pom.xml
@@ -26,7 +26,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-mock</artifactId>
+			<artifactId>spring-test</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>hsqldb</groupId>
diff --git a/infrastructure/pom.xml b/infrastructure/pom.xml
index c877d26fa..5ab7c898f 100644
--- a/infrastructure/pom.xml
+++ b/infrastructure/pom.xml
@@ -74,7 +74,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-mock</artifactId>
+			<artifactId>spring-test</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>easymock</groupId>
@@ -93,7 +93,7 @@
 		<dependency>
 	        <groupId>org.springframework.ws</groupId>
 			<artifactId>spring-oxm</artifactId>
-	        <version>1.0-rc2</version>
+	        <version>1.0.0</version>
 	        <optional>true</optional>
 	        <exclusions>
 	        	<exclusion>
diff --git a/integration/pom.xml b/integration/pom.xml
index c41ad0fa5..9b341c5a1 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -22,15 +22,6 @@
 		<maven.test.skip>true</maven.test.skip>
 	</properties>
 
-	<repositories>
-		<repository>
-			<id>spring-ext</id>
-			<url>
-				https://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo-ext
-			</url>
-		</repository>
-	</repositories>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.batch</groupId>
@@ -39,7 +30,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-mock</artifactId>
+			<artifactId>spring-test</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>hsqldb</groupId>
@@ -58,7 +49,7 @@
 		<dependency>
 			<groupId>org.apache.activemq</groupId>
 			<artifactId>activemq-core</artifactId>
-			<version>4.2-incubator-35</version>
+			<version>5.0-SNAPSHOT</version>
 			<exclusions>
 				<exclusion>
 					<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index 4b0ce8165..448f9d0a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -321,7 +321,7 @@
 			<dependency>
 				<groupId>org.springframework</groupId>
 				<artifactId>spring</artifactId>
-				<version>2.1-m3</version>
+				<version>2.1-m4</version>
 			</dependency>
 			<dependency>
 				<groupId>commons-logging</groupId>
@@ -359,51 +359,9 @@
 			</dependency>
 			<dependency>
 				<groupId>org.springframework</groupId>
-				<artifactId>spring-mock</artifactId>
-				<version>2.1-m3</version>
+				<artifactId>spring-test</artifactId>
+				<version>2.1-m4</version>
 				<scope>test</scope>
-				<exclusions>
-					<exclusion>
-						<groupId>org.springframework</groupId>
-						<artifactId>spring-aop</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>org.springframework</groupId>
-						<artifactId>spring-beans</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>org.springframework</groupId>
-						<artifactId>spring-context</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>org.springframework</groupId>
-						<artifactId>spring-core</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>org.springframework</groupId>
-						<artifactId>spring-dao</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>org.springframework</groupId>
-						<artifactId>spring-jdbc</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>org.springframework</groupId>
-						<artifactId>spring-jpa</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>org.springframework</groupId>
-						<artifactId>spring-support</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>org.springframework</groupId>
-						<artifactId>spring-web</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>org.springframework</groupId>
-						<artifactId>spring-webmvc</artifactId>
-					</exclusion>
-				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>easymock</groupId>
@@ -439,31 +397,27 @@
 
 	<repositories>
 		<repository>
-			<id>apache-snapshots</id>
-			<url>
-				http://people.apache.org/maven-snapshot-repository
-			</url>
+			<id>spring-milestone</id>
+			<name>Spring Portfolio Milestone Repository</name>
+			<url>http://s3.amazonaws.com/maven.springframework.org/milestone</url>
 		</repository>
 		<repository>
-			<id>spring-snapshots</id>
-			<url>
-				https://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo-snapshots
-			</url>
+			<id>spring-external</id>
+			<name>Spring Portfolio Milestone Repository</name>
+			<url>http://s3.amazonaws.com/maven.springframework.org/external</url>
+		</repository>
+		<repository>
+			<id>apache-snapshot</id>
+			<name>Apache Foundation Snapshot Repository</name>
+			<url>http://people.apache.org/maven-snapshot-repository</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>
+			<id>spring-external</id>
+			<name>Spring Portfolio Milestone Repository</name>
+			<url>http://s3.amazonaws.com/maven.springframework.org/external</url>
 		</pluginRepository>
 		<pluginRepository>
 			<id>objectstyle</id>
diff --git a/samples/pom.xml b/samples/pom.xml
index b8060852e..b212a6bad 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -47,7 +47,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-mock</artifactId>
+			<artifactId>spring-test</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>quartz</groupId>
@@ -84,7 +84,7 @@
 		<dependency>
 	        <groupId>org.springframework.ws</groupId>
 			<artifactId>spring-oxm</artifactId>
-	        <version>1.0-rc2</version>
+	        <version>1.0.0</version>
 	        <optional>true</optional>
 	        <exclusions>
 	        	<exclusion>