From eace6e2d66bb322c67e42a99fd1147ae8058470a Mon Sep 17 00:00:00 2001
From: Ulrik Sandberg <ulrik.sandberg@jayway.com>
Date: Thu, 21 Aug 2008 21:46:59 +0000
Subject: [PATCH] Upgraded Spring to 2.5.5 (LDAP-125)

---
 mvn-build/core/changelog.txt | 4 +++-
 mvn-build/parent/pom.xml     | 2 +-
 mvn-build/pom.xml            | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/mvn-build/core/changelog.txt b/mvn-build/core/changelog.txt
index 31f31966..43391bb1 100644
--- a/mvn-build/core/changelog.txt
+++ b/mvn-build/core/changelog.txt
@@ -11,7 +11,7 @@ http://www.ietf.org/rfc/rfc2255.txt
 http://www.ietf.org/rfc/rfc2256.txt
 http://www.ietf.org/rfc/rfc2696.txt
 
-Changes in version 1.2.2 (XXX 2008)
+Changes in version 1.3 (XXX 2008)
 -------------------------------------------
 * Removed deprecated method setUserName() in AbstractContextSource.
 
@@ -32,6 +32,8 @@ Changes in version 1.2.2 (XXX 2008)
 
 * Upgraded commons-lang to 2.3.
 
+* Upgraded Spring to 2.5.5. (LDAP-125)
+
 Changes in version 1.2.1 (Dec 2007)
 -------------------------------------------
 * Added pooling library which features flexible connection validation
diff --git a/mvn-build/parent/pom.xml b/mvn-build/parent/pom.xml
index 285e0b97..4d2359fd 100644
--- a/mvn-build/parent/pom.xml
+++ b/mvn-build/parent/pom.xml
@@ -31,7 +31,7 @@
 		<url>http://fisheye3.cenqua.com/browse/springframework/spring-ldap/trunk</url>
 	</scm>
 	<properties>
-		<spring.version>2.5.4</spring.version>
+		<spring.version>2.5.5</spring.version>
 	</properties>
 	<repositories>
 		<repository>
diff --git a/mvn-build/pom.xml b/mvn-build/pom.xml
index 2f1febf5..4eaad6ae 100644
--- a/mvn-build/pom.xml
+++ b/mvn-build/pom.xml
@@ -106,7 +106,7 @@
 	<properties>
 		<docbook.source>${basedir}/src/docbkx</docbook.source>
 		<docbook.target>${basedir}/target/site/guide</docbook.target>
-		<spring.version>2.5.4</spring.version>
+		<spring.version>2.5.5</spring.version>
 	</properties>
 	<modules>
 		<module>parent</module>