diff --git a/org.springframework.context/pom.xml b/org.springframework.context/pom.xml
index 9e2b417bfd..c930113f69 100644
--- a/org.springframework.context/pom.xml
+++ b/org.springframework.context/pom.xml
@@ -1,12 +1,9 @@
 <?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</groupId>
 	<artifactId>spring-context</artifactId>
 	<packaging>jar</packaging>
-	<version>3.1.0.BUILD-SNAPSHOT</version>
 	<parent>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-parent</artifactId>
@@ -28,9 +25,15 @@
 			<optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>javax.ejb</groupId>
-			<artifactId>com.springsource.javax.ejb</artifactId>
-			<version>3.0.0</version>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-ejb_3.0_spec</artifactId>
+			<version>1.0.1</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-interceptor_3.0_spec</artifactId>
+			<version>1.0.1</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
@@ -41,8 +44,8 @@
 		</dependency>
 		<dependency>
 			<groupId>javax.inject</groupId>
-			<artifactId>com.springsource.org.atinject.tck</artifactId>
-			<version>1.0.0</version>
+			<artifactId>javax.inject-tck</artifactId>
+			<version>1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -160,12 +163,12 @@
 			<version>1.1</version>
 			<optional>true</optional>
 		</dependency>
-    <dependency>
-      <groupId>net.sf.ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.6.2</version>
-      <optional>true</optional>
-    </dependency>
+		<dependency>
+			<groupId>net.sf.ehcache</groupId>
+			<artifactId>ehcache-core</artifactId>
+			<version>2.0.0</version>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>javax.xml</groupId>
 			<artifactId>jaxrpc-api</artifactId>
diff --git a/org.springframework.jms/pom.xml b/org.springframework.jms/pom.xml
index 9a1c57ea5f..a8bb5b9b4f 100644
--- a/org.springframework.jms/pom.xml
+++ b/org.springframework.jms/pom.xml
@@ -1,10 +1,8 @@
 <?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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.springframework</groupId>
   <artifactId>spring-jms</artifactId>
   <packaging>jar</packaging>
-  <version>3.1.0.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>