From 3689b6303e418ce6dfdfa1c2ee835c019beb4ce2 Mon Sep 17 00:00:00 2001
From: Ulrik Sandberg <ulrik.sandberg@jayway.com>
Date: Thu, 19 Apr 2007 14:18:23 +0000
Subject: [PATCH] LDAP-51 Upgrade to Spring 2.0.4
 http://opensource.atlassian.com/projects/spring/browse/LDAP-51

---
 spring-ldap-article/ivy.xml |  2 +-
 spring-ldap-odm/.classpath  |  2 +-
 spring-ldap-odm/ivy.xml     | 12 ++++++------
 spring-ldap-person/ivy.xml  | 12 ++++++------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/spring-ldap-article/ivy.xml b/spring-ldap-article/ivy.xml
index 6a097bc0..beb1eed6 100644
--- a/spring-ldap-article/ivy.xml
+++ b/spring-ldap-article/ivy.xml
@@ -23,7 +23,7 @@
 
 		<!-- test-time only dependencies -->
 		<dependency org="com.cenqua.clover" name="clover" rev="1.3.12" conf="test->default" />
-		<dependency org="org.springframework" name="spring-mock" rev="2.0.2" conf="test->default" />
+		<dependency org="org.springframework" name="spring-mock" rev="2.0.4" conf="test->default" />
 		<dependency org="junit" name="junit" rev="3.8.1" conf="test->default" />
 		<dependency org="easymock" name="easymock" rev="1.2_Java1.3" conf="test->default"/>
 	</dependencies>
diff --git a/spring-ldap-odm/.classpath b/spring-ldap-odm/.classpath
index a462c42c..91a06f51 100644
--- a/spring-ldap-odm/.classpath
+++ b/spring-ldap-odm/.classpath
@@ -5,7 +5,6 @@
 	<classpathentry kind="src" path="src/itest/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="lib/global/xstream.jar"/>
-	<classpathentry kind="lib" path="lib/global/spring-ldap.jar"/>
 	<classpathentry kind="lib" path="lib/global/spring-dao.jar"/>
 	<classpathentry kind="lib" path="lib/global/spring-core.jar"/>
 	<classpathentry kind="lib" path="lib/global/spring-context.jar"/>
@@ -17,5 +16,6 @@
 	<classpathentry kind="lib" path="lib/test/testng.jar"/>
 	<classpathentry kind="lib" path="lib/test/junit.jar"/>
 	<classpathentry kind="lib" path="lib/test/spring-mock.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/spring-ldap"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/spring-ldap-odm/ivy.xml b/spring-ldap-odm/ivy.xml
index 32b86cbe..8c617626 100644
--- a/spring-ldap-odm/ivy.xml
+++ b/spring-ldap-odm/ivy.xml
@@ -23,11 +23,11 @@
 	<dependency org="commons-lang" name="commons-lang" rev="2.1" />
 	<dependency org="commons-collections" name="commons-collections" rev="3.1" />
 	<dependency org="org.springframework" name="spring-ldap" rev="latest.integration"/>
-	<dependency org="org.springframework" name="spring-beans" rev="2.0.2"/>
-	<dependency org="org.springframework" name="spring-core" rev="2.0.2"/>
-	<dependency org="org.springframework" name="spring-context" rev="2.0.2"/>
-	<dependency org="org.springframework" name="spring-dao" rev="2.0.2"/>
-	<dependency org="org.springframework" name="spring-src" rev="2.0.2" conf="source->source">
+	<dependency org="org.springframework" name="spring-beans" rev="2.0.4"/>
+	<dependency org="org.springframework" name="spring-core" rev="2.0.4"/>
+	<dependency org="org.springframework" name="spring-context" rev="2.0.4"/>
+	<dependency org="org.springframework" name="spring-dao" rev="2.0.4"/>
+	<dependency org="org.springframework" name="spring-src" rev="2.0.4" conf="source->source">
 		<artifact name="spring-src" type="zip"/>
 	</dependency>
 	<dependency org="com.sun" name="ldapbp" rev="1.0" />
@@ -42,7 +42,7 @@
 
 	<!-- test time only dependencies -->
 	<dependency org="com.cenqua.clover" name="clover" rev="1.3.12" conf="test->default" />
-	<dependency org="org.springframework" name="spring-mock" rev="2.0.2" 
+	<dependency org="org.springframework" name="spring-mock" rev="2.0.4" 
 	            conf="test->default"/>
 	<dependency org="gsbase" name="gsbase" rev="2.0.1" conf="test->default"/>
 	<dependency org="junit" name="junit" rev="3.8.1" conf="test->default"/>
diff --git a/spring-ldap-person/ivy.xml b/spring-ldap-person/ivy.xml
index 890e9740..c04657fc 100644
--- a/spring-ldap-person/ivy.xml
+++ b/spring-ldap-person/ivy.xml
@@ -21,8 +21,8 @@
 		<dependency org="jstl" name="jstl" rev="1.1.2" />
 
 		<dependency org="org.springframework" name="spring-ldap" rev="latest.integration" conf="global->default;source->@" />
-		<dependency org="org.springframework" name="spring-web" rev="2.0.2" />
-		<dependency org="org.springframework" name="spring-webmvc" rev="2.0.2" />
+		<dependency org="org.springframework" name="spring-web" rev="2.0.4" />
+		<dependency org="org.springframework" name="spring-webmvc" rev="2.0.4" />
 		<dependency org="org.springframework" name="spring-webflow" rev="1.0" />
 		<dependency org="org.springframework" name="spring-webflow-src" rev="1.0" conf="source->source">
 			<artifact name="spring-webflow-src" type="zip" ext="zip" />
@@ -37,9 +37,9 @@
 			<artifact name="acegi-security-src" type="zip"/>
 		</dependency>
 	    <!-- kind of nasty, acegi needs some 1.2.7 stuff, so we override with newer! -->
-		<dependency	org="org.springframework" name="spring-jdbc" rev="2.0.2" />
-		<dependency	org="org.springframework" name="spring-remoting" rev="2.0.2" />
-		<dependency	org="org.springframework" name="spring-support" rev="2.0.2" />
+		<dependency	org="org.springframework" name="spring-jdbc" rev="2.0.4" />
+		<dependency	org="org.springframework" name="spring-remoting" rev="2.0.4" />
+		<dependency	org="org.springframework" name="spring-support" rev="2.0.4" />
 
 		<!-- dependencies for Apache Directory Server -->
 		<dependency org="org.apache.directory.server" name="apacheds-core" rev="1.0.0"
@@ -84,7 +84,7 @@
 
 		<!-- test-time only dependencies -->
 		<dependency org="com.cenqua.clover" name="clover" rev="1.3.12" conf="test->default" />
-		<dependency org="org.springframework" name="spring-mock" rev="2.0.2"
+		<dependency org="org.springframework" name="spring-mock" rev="2.0.4"
 					conf="test->default" />
 		<dependency org="junit" name="junit" rev="3.8.1" conf="test->default" />
 		<dependency org="easymock" name="easymock" rev="1.2_Java1.3" conf="test->default"/>