From 943fc70ecaf3c4412a55f15f0b7159e7927bf888 Mon Sep 17 00:00:00 2001
From: Ben Alex <ben.alex@springsource.com>
Date: Wed, 6 Apr 2005 06:38:55 +0000
Subject: [PATCH] Align Spring JAR dependencies with Spring 1.2RC1.

---
 .classpath  | 12 +++-------
 project.xml | 66 +++--------------------------------------------------
 2 files changed, 6 insertions(+), 72 deletions(-)

diff --git a/.classpath b/.classpath
index e868de9d46..2d722a419b 100644
--- a/.classpath
+++ b/.classpath
@@ -30,14 +30,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 kind="var" path="MAVEN_REPO/springframework/jars/spring-aop-1.1.5.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/springframework/jars/spring-context-1.1.5.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/springframework/jars/spring-core-1.1.5.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/springframework/jars/spring-dao-1.1.5.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/springframework/jars/spring-mock-1.1.5.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/springframework/jars/spring-orm-1.1.5.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/springframework/jars/spring-web-1.1.5.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/springframework/jars/spring-webmvc-1.1.5.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/springframework/jars/spring-1.2-rc1.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/springframework/jars/spring-mock-1.2-rc1.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/log4j/jars/log4j-1.2.9.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"/>
@@ -57,7 +51,7 @@
 	<classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/ehcache/jars/ehcache-1.1.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/jspapi/jars/jsp-api-2.0.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/hibernate/jars/hibernate-2.1.8.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/hibernate/jars/hibernate-3.0rc1.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/commons-lang/jars/commons-lang-2.0.jar"/>
 	<classpathentry sourcepath="DIST_BASE/commons-beanutils-1.6.1-src/src/java" kind="var" path="MAVEN_REPO/commons-beanutils/jars/commons-beanutils-1.6.1.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/apache-directory/jars/apacheds-main-0.9-SNAPSHOT.jar"/>
diff --git a/project.xml b/project.xml
index cfa71db5fe..9b1c09cc5a 100644
--- a/project.xml
+++ b/project.xml
@@ -247,68 +247,8 @@
     </dependency>
     <dependency>
       <groupId>springframework</groupId>
-      <artifactId>spring-core</artifactId>
-      <version>1.1.5</version>
-      <type>jar</type>
-      <url>http://www.springframework.org</url>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>springframework</groupId>
-      <artifactId>spring-dao</artifactId>
-      <version>1.1.5</version>
-      <type>jar</type>
-      <url>http://www.springframework.org</url>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>springframework</groupId>
-      <artifactId>spring-orm</artifactId>
-      <version>1.1.5</version>
-      <type>jar</type>
-      <url>http://www.springframework.org</url>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>1.1.5</version>
-      <type>jar</type>
-      <url>http://www.springframework.org</url>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>springframework</groupId>
-      <artifactId>spring-aop</artifactId>
-      <version>1.1.5</version>
-      <type>jar</type>
-      <url>http://www.springframework.org</url>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>springframework</groupId>
-      <artifactId>spring-web</artifactId>
-      <version>1.1.5</version>
-      <type>jar</type>
-      <url>http://www.springframework.org</url>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>springframework</groupId>
-      <artifactId>spring-webmvc</artifactId>
-      <version>1.1.5</version>
+      <artifactId>spring</artifactId>
+      <version>1.2-rc1</version>
       <type>jar</type>
       <url>http://www.springframework.org</url>
       <properties>
@@ -318,7 +258,7 @@
     <dependency>
       <groupId>springframework</groupId>
       <artifactId>spring-mock</artifactId>
-      <version>1.1.5</version>
+      <version>1.2-rc1</version>
       <type>jar</type>
       <url>http://www.springframework.org</url>
     </dependency>