diff --git a/parent/pom.xml b/parent/pom.xml
index 77fd85b5..1e20a14d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -107,11 +107,11 @@
maven-project-info-reports-plugin
- 2.1.2
+ 2.2
maven-site-plugin
- 2.0.1
+ 2.1
maven-install-plugin
@@ -123,7 +123,7 @@
maven-dependency-plugin
- 2.0
+ 2.1
maven-clean-plugin
diff --git a/pom.xml b/pom.xml
index 5450fb20..86ce4a90 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,9 +38,9 @@
marthursson
Mattias Hellborg Arthursson
- mattias.arthursson@jayway.se
+ mattias.arthursson@jayway.com
Jayway
- http://www.jayway.se
+ http://www.jayway.com
Project Admin
Developer
@@ -50,9 +50,9 @@
ulsa
Ulrik Sandberg
- ulrik.sandberg@jayway.se
+ ulrik.sandberg@jayway.com
Jayway
- http://www.jayway.se
+ http://www.jayway.com
Project Admin
Developer
@@ -283,11 +283,11 @@
maven-project-info-reports-plugin
- 2.1.2
+ 2.2
maven-site-plugin
- 2.0.1
+ 2.1
maven-install-plugin
@@ -299,7 +299,7 @@
maven-dependency-plugin
- 2.0
+ 2.1
maven-clean-plugin
diff --git a/readme.txt b/readme.txt
index a7ff153f..3ff8dede 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,5 +1,5 @@
-Spring LDAP 1.3.0 (Jan 2009)
---------------------------------
+Spring LDAP 1.3.1 (Nov 2010)
+----------------------------
http://www.springframework.org/ldap
http://forum.springframework.org/forumdisplay.php?f=40
@@ -22,6 +22,8 @@ LDAP paths and Attributes.
As of version 1.2, support for client-side compensating transaction is provided, as well as
Java 5 generics support with the SimpleLdapTemplate.
+As of version 1.3.1, there is support for LDIF parsing and Object-Directory Mapping (ODM).
+
See changelog.txt for detailed information on the changes included in the current release.
2. RELEASE INFO
@@ -50,21 +52,36 @@ Spring LDAP is released under the terms of the Apache Software License (see lice
The following distinct jar files are included in the distribution. This list
specifies the respective contents and third-party dependencies.
-* spring-ldap-core-1.3.0.RELEASE.jar
+* spring-ldap-core-1.3.1.RELEASE.jar
- Contents: The Spring LDAP library
- Dependencies: Commons Logging, Commons Lang, Commons Pool, spring-beans,
spring-core, spring-context, spring-jdbc, spring-tx, ldapbp
-* spring-ldap-core-tiger-1.3.0.RELEASE.jar
+* spring-ldap-core-tiger-1.3.1.RELEASE.jar
- Contents: The Spring LDAP Java 5 support library
- Dependencies: Commons Logging, Commons Lang, Commons Pool, spring-beans,
spring-core, spring-context, spring-jdbc, spring-tx, ldapbp
-* spring-ldap-test-1.3.0.RELEASE.jar
+* spring-ldap-test-1.3.1.RELEASE.jar
- Contents: Support classes that helps LDAP with integration testing.
- Dependencies: Commons Logging, Commons Lang, Commons Pool, spring-beans,
spring-core, spring-context, spring-jdbc, spring-tx, ldapbp
+* spring-ldap-ldif-core-1.3.1.RELEASE.jar
+- Contents: The Spring LDAP LDIF parsing library.
+- Dependencies: Commons Logging, Commons Lang, spring-beans, spring-core,
+ spring-ldap-core
+
+* spring-ldap-ldif-batch-1.3.1.RELEASE.jar
+- Contents: The Spring Batch integration layer for the LDIF parsing library.
+- Dependencies: Commons Logging, spring-batch, spring-beans, spring-core,
+ spring-ldap-core, spring-ldap-ldif-core
+
+* spring-ldap-odm-1.3.1.RELEASE.jar
+- Contents: The Object-Directory Mapping (ODM) framework.
+- Dependencies: Commons Logging, Commons CLI, spring-beans, spring-ldap-core,
+ spring-ldap-core-tiger
+
4. MAVEN USERS
All major releases of this library are available in the central Maven repository.
@@ -72,13 +89,13 @@ Note that the artifacts have changed names between the 1.2.x and 1.3 releases:
spring-ldap is now spring-ldap-core
spring-ldap-tiger is now spring-ldap-core-tiger
-This means that in order to use the latest release (1.3.0.RELEASE), you need to
+This means that in order to use the latest release (1.3.1.RELEASE), you need to
include the following dependencies:
org.springframework.ldap
spring-ldap-core
- 1.3.0.RELEASE
+ 1.3.1.RELEASE
For Java 1.5 support:
@@ -86,7 +103,7 @@ For Java 1.5 support:
org.springframework.ldap
spring-ldap-core-tiger
- 1.3.0.RELEASE
+ 1.3.1.RELEASE
Milestone releases (such as release candidates) are available from the Spring
@@ -104,7 +121,7 @@ specify the repository above and include the following dependencies:
org.springframework.ldap
spring-ldap-core
- 1.3.1.RC1
+ 2.0.0.RC1
For Java 1.5 support:
@@ -112,7 +129,7 @@ For Java 1.5 support:
org.springframework.ldap
spring-ldap-core-tiger
- 1.3.1.RC1
+ 2.0.0.RC1
Nighly builds are published to the snapshot repository:
@@ -126,14 +143,14 @@ Nighly builds are published to the snapshot repository:
org.springframework.ldap
spring-ldap-core
- 1.3.1.CI-SNAPSHOT
+ 2.0.0.CI-SNAPSHOT
For Java 1.5 support:
org.springframework.ldap
spring-ldap-core-tiger
- 1.3.1.CI-SNAPSHOT
+ 2.0.0.CI-SNAPSHOT
5. WHERE TO START
diff --git a/src/site/apt/downloads/releases.apt b/src/site/apt/downloads/releases.apt
index 62bc2e9f..d6ab742b 100644
--- a/src/site/apt/downloads/releases.apt
+++ b/src/site/apt/downloads/releases.apt
@@ -6,7 +6,7 @@ Downloads
* Get the latest Spring LDAP releases here
- * <>
+ * <>
* {{{http://www.springsource.com/download/community?project=Spring%20LDAP}Download}} | {{{http://static.springframework.org/spring-ldap/docs/1.3.x/changelog.txt}Changelog}} | {{{http://static.springframework.org/spring-ldap/docs/1.3.x/reference/html/}Documentation (HTML)}} | {{{http://static.springframework.org/spring-ldap/docs/1.3.x/reference/pdf/spring-ldap-reference.pdf}Documentation (PDF)}} | {{{http://static.springframework.org/spring-ldap/docs/1.3.x/apidocs/}API}}
@@ -20,22 +20,42 @@ Sources
* http://src.springframework.org/svn/spring-ldap/trunk (latest sources)
- * http://src.springframework.org/svn/spring-ldap/tags/spring-ldap-1.3.0.RELEASE (1.3.0 release sources)
+ * http://src.springframework.org/svn/spring-ldap/tags/spring-ldap-1.3.1.RELEASE (1.3.1 release sources)
Maven Users
- Artifacts for all production releases are available from the central Maven repository. The dependencies in 1.3.0 are:
+ Artifacts for all production releases are available from the central Maven repository. The dependencies in 1.3.1 are:
+--------------------------------------------------+
org.springframework.ldap
spring-ldap-core
- 1.3.0.RELEASE
+ 1.3.1.RELEASE
org.springframework.ldap
spring-ldap-core-tiger
- 1.3.0.RELEASE
+ 1.3.1.RELEASE
+
+
+ org.springframework.ldap
+ spring-ldap-test
+ 1.3.1.RELEASE
+
+
+ org.springframework.ldap
+ spring-ldap-ldif-core
+ 1.3.1.RELEASE
+
+
+ org.springframework.ldap
+ spring-ldap-ldif-batch
+ 1.3.1.RELEASE
+
+
+ org.springframework.ldap
+ spring-ldap-odm
+ 1.3.1.RELEASE
+--------------------------------------------------+
diff --git a/src/site/apt/upgrading.apt b/src/site/apt/upgrading.apt
index 01fa0cda..ccd92440 100644
--- a/src/site/apt/upgrading.apt
+++ b/src/site/apt/upgrading.apt
@@ -2,6 +2,10 @@
Upgrading
---------
+Upgrading from version 1.3.0 to 1.3.1
+
+ No changes requiring upgrading were made between version 1.3.0 and 1.3.1.
+
Upgrading from version 1.3.0-RC1 to 1.3.0
Some minor changes were made between version 1.3.0-RC1 and 1.3.0.