diff --git a/.classpath b/.classpath
index a429c786a0..fab810afdb 100644
--- a/.classpath
+++ b/.classpath
@@ -33,8 +33,8 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="MAVEN_REPO/resin/jars/resin-3.0.9.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/retroweaver/jars/retroweaver-1.0fcs.jar"/>
-	<classpathentry sourcepath="/MAVEN_REPO/springframework/src/spring-1.2.6.jar" kind="var" path="MAVEN_REPO/springframework/jars/spring-1.2.6.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/springframework/jars/spring-mock-1.2.6.jar"/>
+	<classpathentry sourcepath="/MAVEN_REPO/springframework/src/spring-2.0-m2.zip" kind="var" path="MAVEN_REPO/springframework/jars/spring-2.0-m2.jar"/>
+	<classpathentry sourcepath="/MAVEN_REPO/springframework/src/spring-2.0-m2.zip" kind="var" path="MAVEN_REPO/springframework/jars/spring-mock-2.0-m2.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/aopalliance/jars/aopalliance-1.0.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/aspectj/jars/aspectjrt-1.2.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/cas/jars/casclient-2.0.11.jar"/>
@@ -79,5 +79,6 @@
 	<classpathentry kind="var" path="MAVEN_REPO/org.apache.directory/jars/org.apache.ldap.common-0.9.4-20060201.032106-10.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/antlr/jars/antlr-2.7.2.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/ldapsdk/jars/ldapsdk-4.1.jar"/>
+	<classpathentry sourcepath="/MAVEN_REPO/springframework/src/spring-2.0-m2.zip" kind="var" path="MAVEN_REPO/springframework/jars/spring-hibernate3-2.0-m2.jar"/>
 	<classpathentry kind="output" path="target/eclipseclasses"/>
 </classpath>
diff --git a/core/pom.xml b/core/pom.xml
index 0e5f0d477e..09543793a7 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -14,17 +14,17 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-remoting</artifactId>
-      <version>1.2.6</version>
+      <version>2.0-m2</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>1.2.6</version>
+      <version>2.0-m2</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-support</artifactId>
-      <version>1.2.6</version>
+      <version>2.0-m2</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
diff --git a/domain/pom.xml b/domain/pom.xml
index 0164da6bff..4d0ddcf9a1 100644
--- a/domain/pom.xml
+++ b/domain/pom.xml
@@ -23,8 +23,8 @@
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-hibernate</artifactId>
-      <version>1.2.6</version>
+      <artifactId>spring-hibernate3</artifactId>
+      <version>2.0-m2</version>
     </dependency>
     <dependency>
       <groupId>commons-beanutils</groupId>
diff --git a/domain/project.xml b/domain/project.xml
index 0b710b8b27..6c34beffbf 100644
--- a/domain/project.xml
+++ b/domain/project.xml
@@ -37,6 +37,13 @@
       <type>jar</type>
     </dependency>
   </dependencies>
+    <dependency>
+      <groupId>springframework</groupId>
+      <artifactId>spring-hibernate3</artifactId>
+      <version>2.0-m2</version>
+      <type>jar</type>
+      <url>http://www.springframework.org</url>
+    </dependency>
   <build>
     <resources>
       <resource>
diff --git a/pom.xml b/pom.xml
index 3df55d9c3c..4ba61f5be1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -252,7 +252,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-mock</artifactId>
-      <version>1.2.6</version>
+      <version>2.0-m2</version>
     </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/project.xml b/project.xml
index 56cd5894f7..77a915c343 100644
--- a/project.xml
+++ b/project.xml
@@ -265,7 +265,7 @@
     <dependency>
       <groupId>springframework</groupId>
       <artifactId>spring</artifactId>
-      <version>1.2.6</version>
+      <version>2.0-m2</version>
       <type>jar</type>
       <url>http://www.springframework.org</url>
       <properties>
@@ -275,7 +275,7 @@
     <dependency>
       <groupId>springframework</groupId>
       <artifactId>spring-mock</artifactId>
-      <version>1.2.6</version>
+      <version>2.0-m2</version>
       <type>jar</type>
       <url>http://www.springframework.org</url>
     </dependency>