diff --git a/mvn-build/acegi-support/pom.xml b/mvn-build/acegi-support/pom.xml
index 0758029c..a7f96135 100644
--- a/mvn-build/acegi-support/pom.xml
+++ b/mvn-build/acegi-support/pom.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework.ldap</groupId>
-	<artifactId>spring-ldap-acegi-support</artifactId>
-	<name>Spring LDAP Acegi Support</name>
-	<version>1.2.2-SNAPSHOT</version>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
 	<parent>
 		<groupId>org.springframework.ldap</groupId>
-		<artifactId>master</artifactId>
-		<version>1.2.2-SNAPSHOT</version>
+		<artifactId>spring-ldap-parent</artifactId>
+		<version>1.3-SNAPSHOT</version>
 	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>spring-ldap-acegi-support</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring LDAP Acegi Support</name>
 
 	<build>
 		<plugins>
@@ -20,153 +22,36 @@
 					<target>1.4</target>
 				</configuration>
 			</plugin>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<descriptors>
-						<descriptor>
-							src/assemble/bin-with-dependencies.xml
-						</descriptor>
-					</descriptors>
-				</configuration>
-			</plugin>
-
 		</plugins>
 	</build>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.ldap</groupId>
-			<artifactId>spring-ldap</artifactId>
-			<version>1.2.2-SNAPSHOT</version>
+			<artifactId>spring-ldap-core</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
-			<version>1.0.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.acegisecurity</groupId>
 			<artifactId>acegi-security</artifactId>
-			<version>1.0.7</version>
 			<scope>provided</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>aspectj</groupId>
-					<artifactId>aspectj</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>cas</groupId>
-					<artifactId>casclient</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>commons-codec</groupId>
-					<artifactId>commons-codec</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>commons-collections</groupId>
-					<artifactId>commons-collections</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>commons-lang</groupId>
-					<artifactId>commons-lang</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>hsqldb</groupId>
-					<artifactId>hsqldb</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>javax.servlet</groupId>
-					<artifactId>jsp-api</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>javax.servlet</groupId>
-					<artifactId>servlet-api</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>jmock</groupId>
-					<artifactId>jmock</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>log4j</groupId>
-					<artifactId>log4j</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>net.sj.ehcache</groupId>
-					<artifactId>ehcache</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.apache.directory.server</groupId>
-					<artifactId>apacheds-core</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.slf4j</groupId>
-					<artifactId>slf4j-log4j12</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-core</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-jdbc</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-ldap</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-mock</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-remoting</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-support</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-web</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>oro</groupId>
-					<artifactId>oro</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>taglibs</groupId>
-					<artifactId>standard</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>3.8.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>easymock</groupId>
 			<artifactId>easymock</artifactId>
-			<version>1.2_Java1.3</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>3.8.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
-			<version>${spring.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/mvn-build/tiger/pom.xml b/mvn-build/core-tiger/pom.xml
similarity index 63%
rename from mvn-build/tiger/pom.xml
rename to mvn-build/core-tiger/pom.xml
index 40559709..c59f8cb1 100644
--- a/mvn-build/tiger/pom.xml
+++ b/mvn-build/core-tiger/pom.xml
@@ -2,17 +2,16 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework.ldap</groupId>
-	<artifactId>spring-ldap-tiger</artifactId>
-	<name>Spring LDAP Java 5 support</name>
-	<version>1.2.2-SNAPSHOT</version>
 
 	<parent>
 		<groupId>org.springframework.ldap</groupId>
-		<artifactId>master</artifactId>
-		<version>1.2.2-SNAPSHOT</version>
+		<artifactId>spring-ldap-parent</artifactId>
+		<version>1.3-SNAPSHOT</version>
 	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>spring-ldap-core-tiger</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring LDAP Java 5 support</name>
 
 	<build>
 		<plugins>
@@ -24,16 +23,6 @@
 					<target>1.5</target>
 				</configuration>
 			</plugin>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<descriptors>
-						<descriptor>
-							src/assemble/bin-with-source.xml
-						</descriptor>
-					</descriptors>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 
@@ -41,13 +30,11 @@
 		<!-- Spring Dependencies -->
 		<dependency>
 			<groupId>org.springframework.ldap</groupId>
-			<artifactId>spring-ldap</artifactId>
-			<version>1.2.2-SNAPSHOT</version>
+			<artifactId>spring-ldap-core</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>3.8.2</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/mvn-build/tiger/src/assemble/bin-with-source.xml b/mvn-build/core-tiger/src/assemble/bin-with-source.xml
similarity index 100%
rename from mvn-build/tiger/src/assemble/bin-with-source.xml
rename to mvn-build/core-tiger/src/assemble/bin-with-source.xml
diff --git a/mvn-build/tiger/src/main/java/org/springframework/ldap/core/simple/AbstractParameterizedContextMapper.java b/mvn-build/core-tiger/src/main/java/org/springframework/ldap/core/simple/AbstractParameterizedContextMapper.java
similarity index 100%
rename from mvn-build/tiger/src/main/java/org/springframework/ldap/core/simple/AbstractParameterizedContextMapper.java
rename to mvn-build/core-tiger/src/main/java/org/springframework/ldap/core/simple/AbstractParameterizedContextMapper.java
diff --git a/mvn-build/tiger/src/main/java/org/springframework/ldap/core/simple/ParameterizedContextMapper.java b/mvn-build/core-tiger/src/main/java/org/springframework/ldap/core/simple/ParameterizedContextMapper.java
similarity index 100%
rename from mvn-build/tiger/src/main/java/org/springframework/ldap/core/simple/ParameterizedContextMapper.java
rename to mvn-build/core-tiger/src/main/java/org/springframework/ldap/core/simple/ParameterizedContextMapper.java
diff --git a/mvn-build/tiger/src/main/java/org/springframework/ldap/core/simple/SimpleLdapOperations.java b/mvn-build/core-tiger/src/main/java/org/springframework/ldap/core/simple/SimpleLdapOperations.java
similarity index 100%
rename from mvn-build/tiger/src/main/java/org/springframework/ldap/core/simple/SimpleLdapOperations.java
rename to mvn-build/core-tiger/src/main/java/org/springframework/ldap/core/simple/SimpleLdapOperations.java
diff --git a/mvn-build/tiger/src/main/java/org/springframework/ldap/core/simple/SimpleLdapTemplate.java b/mvn-build/core-tiger/src/main/java/org/springframework/ldap/core/simple/SimpleLdapTemplate.java
similarity index 100%
rename from mvn-build/tiger/src/main/java/org/springframework/ldap/core/simple/SimpleLdapTemplate.java
rename to mvn-build/core-tiger/src/main/java/org/springframework/ldap/core/simple/SimpleLdapTemplate.java
diff --git a/mvn-build/tiger/src/main/java/org/springframework/ldap/core/simple/package.html b/mvn-build/core-tiger/src/main/java/org/springframework/ldap/core/simple/package.html
similarity index 100%
rename from mvn-build/tiger/src/main/java/org/springframework/ldap/core/simple/package.html
rename to mvn-build/core-tiger/src/main/java/org/springframework/ldap/core/simple/package.html
diff --git a/mvn-build/tiger/src/main/java/overview.html b/mvn-build/core-tiger/src/main/java/overview.html
similarity index 100%
rename from mvn-build/tiger/src/main/java/overview.html
rename to mvn-build/core-tiger/src/main/java/overview.html
diff --git a/mvn-build/core/docs/reference/src/simple.xml b/mvn-build/core/docs/reference/src/simple.xml
index 95056634..967cbe71 100644
--- a/mvn-build/core/docs/reference/src/simple.xml
+++ b/mvn-build/core/docs/reference/src/simple.xml
@@ -6,7 +6,7 @@
   <sect1 id="simple-ldap-template">
     <title>SimpleLdapTemplate</title>
 
-    <para>As of version 1.2 Spring LDAP includes the spring-ldap-tiger.jar distributable, which adds
+    <para>As of version 1.3 Spring LDAP includes the spring-ldap-core-tiger.jar distributable, which adds
     a thin layer of Java 5 functionality on top of Spring LDAP.</para>
     
     <para>The <literal>SimpleLdapTemplate</literal> class adds search and lookup methods that take a 
@@ -32,4 +32,4 @@
     </example>
     </para>
   </sect1>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/mvn-build/core/pom.xml b/mvn-build/core/pom.xml
index 2ab77bbd..f73c9228 100644
--- a/mvn-build/core/pom.xml
+++ b/mvn-build/core/pom.xml
@@ -3,16 +3,15 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework.ldap</groupId>
-	<artifactId>spring-ldap</artifactId>
-	<name>Spring LDAP Core</name>
-	<version>1.2.2-SNAPSHOT</version>
 	<parent>
 		<groupId>org.springframework.ldap</groupId>
-		<artifactId>master</artifactId>
-		<version>1.2.2-SNAPSHOT</version>
+		<artifactId>spring-ldap-parent</artifactId>
+		<version>1.3-SNAPSHOT</version>
 	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>spring-ldap-core</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring LDAP Core</name>
 
 	<build>
 		<plugins>
@@ -35,16 +34,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<descriptors>
-						<descriptor>
-							src/assemble/bin-with-dependencies.xml
-						</descriptor>
-					</descriptors>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 
@@ -53,23 +42,14 @@
 		<dependency>
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
-			<version>1.0.4</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-lang</groupId>
 			<artifactId>commons-lang</artifactId>
-			<version>2.1</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-pool</groupId>
 			<artifactId>commons-pool</artifactId>
-			<version>1.3</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.sun</groupId>
-			<artifactId>ldapbp</artifactId>
-			<version>1.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -82,48 +62,40 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
-			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-beans</artifactId>
-			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
-			<version>${spring.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-jdbc</artifactId>
-			<version>${spring.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-orm</artifactId>
-			<version>${spring.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<!-- Test Dependencies -->
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>3.8.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>easymock</groupId>
 			<artifactId>easymock</artifactId>
-			<version>1.2_Java1.3</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>gsbase</groupId>
 			<artifactId>gsbase</artifactId>
-			<version>2.0.1</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/mvn-build/core/src/assemble/bin-with-dependencies.xml b/mvn-build/core/src/assemble/bin-with-dependencies.xml
deleted file mode 100644
index f251d2df..00000000
--- a/mvn-build/core/src/assemble/bin-with-dependencies.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<assembly>
-	<id>assembly</id>
-	<formats>
-		<format>dir</format>
-	</formats>
-	<includeBaseDirectory>false</includeBaseDirectory>
-	<fileSets>
-		<fileSet>
-			<directory>target</directory>
-			<includes>
-				<include>*.jar</include>
-			</includes>
-			<outputDirectory>dist</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>src/main/java</directory>
-			<includes>
-				<include>**/*.java</include>
-			</includes>
-			<outputDirectory>src</outputDirectory>
-		</fileSet>
-	</fileSets>
-	<dependencySets>
-		<dependencySet>
-			<outputDirectory>lib</outputDirectory>
-			<unpack>false</unpack>
-			<scope>provided</scope>
-		</dependencySet>
-	</dependencySets>
-</assembly>
diff --git a/mvn-build/integration-tests/pom.xml b/mvn-build/integration-tests/pom.xml
index 7e72cdef..cb9c5172 100644
--- a/mvn-build/integration-tests/pom.xml
+++ b/mvn-build/integration-tests/pom.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework.ldap</groupId>
-	<artifactId>spring-ldap-integration-tests</artifactId>
-	<name>Spring LDAP Integration Tests</name>
-	<version>1.2.2-SNAPSHOT</version>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<parent>
 		<groupId>org.springframework.ldap</groupId>
-		<artifactId>master</artifactId>
-		<version>1.2.2-SNAPSHOT</version>
+		<artifactId>spring-ldap-parent</artifactId>
+		<version>1.3-SNAPSHOT</version>
 	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>spring-ldap-integration-tests</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring LDAP Integration Tests</name>
 
 	<build>
 		<plugins>
@@ -27,36 +28,30 @@
 		<dependency>
 			<groupId>org.springframework.ldap</groupId>
 			<artifactId>spring-ldap-test</artifactId>
-			<version>1.2.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.ldap</groupId>
-			<artifactId>spring-ldap-tiger</artifactId>
-			<version>1.2.2-SNAPSHOT</version>
+			<artifactId>spring-ldap-core-tiger</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>commons-pool</groupId>
 			<artifactId>commons-pool</artifactId>
-			<version>1.3</version>
 			<scope>provided</scope>
 		</dependency>
 		<!-- Spring Dependencies -->
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-jdbc</artifactId>
-			<version>${spring.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-aop</artifactId>
-			<version>${spring.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-orm</artifactId>
-			<version>${spring.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -68,7 +63,6 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-orm</artifactId>
-			<version>${spring.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -86,7 +80,6 @@
 		<dependency>
 			<groupId>gsbase</groupId>
 			<artifactId>gsbase</artifactId>
-			<version>2.0.1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -101,5 +94,10 @@
 			<version>4.4</version>
 			<scope>test</scope>
 		</dependency>
+      <dependency>
+         <groupId>org.springframework</groupId>
+         <artifactId>spring-test</artifactId>
+         <scope>test</scope>
+      </dependency>
 	</dependencies>
 </project>
diff --git a/mvn-build/parent/pom.xml b/mvn-build/parent/pom.xml
new file mode 100644
index 00000000..285e0b97
--- /dev/null
+++ b/mvn-build/parent/pom.xml
@@ -0,0 +1,412 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.springframework.ldap</groupId>
+	<artifactId>spring-ldap-parent</artifactId>
+	<packaging>pom</packaging>
+	<version>1.3-SNAPSHOT</version>
+	<name>Spring LDAP - Parent</name>
+	<distributionManagement>
+		<downloadUrl>http://static.springframework.org/spring-ldap/site/downloads/releases.html</downloadUrl>
+		<snapshotRepository>
+			<id>spring-s3</id>
+			<name>Spring Snapshot Repository</name>
+			<url>s3://maven.springframework.org/snapshot</url>
+		</snapshotRepository>
+		<site>
+			<id>static.springframework.org</id>
+			<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-ldap/sites/1.5</url>
+		</site>
+	</distributionManagement>
+	<scm>
+		<connection>
+			scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-ldap/trunk
+		</connection>
+		<developerConnection>
+			scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-ldap/trunk
+		</developerConnection>
+		<url>http://fisheye3.cenqua.com/browse/springframework/spring-ldap/trunk</url>
+	</scm>
+	<properties>
+		<spring.version>2.5.4</spring.version>
+	</properties>
+	<repositories>
+		<repository>
+			<id>maven central repo</id>
+			<url>http://repo1.maven.org/maven2/</url>
+		</repository>
+		<repository>
+			<id>java.net repo</id>
+			<url>http://download.java.net/maven/2/</url>
+		</repository>
+		<repository>
+			<id>spring release</id>
+			<url>http://maven.springframework.org/release/</url>
+		</repository>
+		<repository>
+			<id>spring external</id>
+			<url>http://maven.springframework.org/external/</url>
+		</repository>
+	</repositories>
+	<build>
+		<extensions>
+			<extension>
+				<groupId>org.springframework.aws</groupId>
+				<artifactId>spring-aws-maven</artifactId>
+				<version>1.2.2</version>
+			</extension>
+		</extensions>
+		<plugins>
+			<!-- Building -->
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.3</source>
+					<target>1.4</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.4.2</version>
+				<configuration>
+					<forkMode>once</forkMode>
+					<childDelegation>false</childDelegation>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifest>
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+						</manifest>
+						<manifestEntries>
+							<Spring-LDAP-Version>${pom.version}</Spring-LDAP-Version>
+						</manifestEntries>
+					</archive>
+				</configuration>
+			</plugin>
+			<!-- IDEs -->
+			<plugin>
+				<artifactId>maven-eclipse-plugin</artifactId>
+				<configuration>
+					<downloadSources>true</downloadSources>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-idea-plugin</artifactId>
+				<configuration>
+					<downloadSources>true</downloadSources>
+					<downloadJavadocs>true</downloadJavadocs>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<reporting>
+		<plugins>
+            <plugin>
+                <artifactId>maven-jxr-plugin</artifactId>
+                <configuration>
+                    <aggregate>true</aggregate>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-report-plugin</artifactId>
+                <configuration>
+                    <aggregate>true</aggregate>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+            </plugin>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<configuration>
+					<quiet>true</quiet>
+				</configuration>
+				<reportSets>
+					<reportSet>
+						<reports>
+							<report>javadoc</report>
+						</reports>
+					</reportSet>
+				</reportSets>
+			</plugin>
+		</plugins>
+	</reporting>
+    <dependencyManagement>
+        <dependencies>
+            <!-- Spring-LDAP dependencies -->
+            <dependency>
+                <groupId>org.springframework.ldap</groupId>
+                <artifactId>spring-ldap-core</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.ldap</groupId>
+                <artifactId>spring-ldap-core-tiger</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.ldap</groupId>
+                <artifactId>spring-ldap-test</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.ldap</groupId>
+                <artifactId>spring-ldap-acegi-support</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.ldap</groupId>
+                <artifactId>spring-ldap-samples-utils</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <!-- Spring dependencies -->
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-core</artifactId>
+                <version>${spring.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-beans</artifactId>
+                <version>${spring.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-context</artifactId>
+                <version>${spring.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-aop</artifactId>
+                <version>${spring.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-web</artifactId>
+                <version>${spring.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-webmvc</artifactId>
+                <version>${spring.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>struts</groupId>
+                        <artifactId>struts</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-orm</artifactId>
+                <version>${spring.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-jdbc</artifactId>
+                <version>${spring.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-tx</artifactId>
+                <version>${spring.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-test</artifactId>
+                <version>${spring.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <!-- Acegi -->
+            <dependency>
+                <groupId>org.acegisecurity</groupId>
+                <artifactId>acegi-security</artifactId>
+                <version>1.0.7</version>
+                <exclusions>
+                                <exclusion>
+                                        <groupId>aspectj</groupId>
+                                        <artifactId>aspectj</artifactId>
+                                </exclusion>
+                                <exclusion>
+                                        <groupId>cas</groupId>
+                                        <artifactId>casclient</artifactId>
+                                </exclusion>
+                                <exclusion>
+                                        <groupId>commons-codec</groupId>
+                                        <artifactId>commons-codec</artifactId>
+                                </exclusion>
+                                <exclusion>
+                                        <groupId>commons-collections</groupId>
+                                        <artifactId>commons-collections</artifactId>
+                                </exclusion>
+                                <exclusion>
+                                        <groupId>commons-lang</groupId>
+                                        <artifactId>commons-lang</artifactId>
+                                </exclusion>
+                                <exclusion>
+                                        <groupId>commons-logging</groupId>
+                                        <artifactId>commons-logging</artifactId>
+                                </exclusion>
+                                <exclusion>
+                                        <groupId>hsqldb</groupId>
+                                        <artifactId>hsqldb</artifactId>
+                                </exclusion>
+                                <exclusion>
+                                        <groupId>javax.servlet</groupId>
+                                        <artifactId>jsp-api</artifactId>
+                                </exclusion>
+                                <exclusion>
+                                        <groupId>javax.servlet</groupId>
+                                        <artifactId>servlet-api</artifactId>
+                                </exclusion>
+                                <exclusion>
+                                        <groupId>jmock</groupId>
+                                        <artifactId>jmock</artifactId>
+                                </exclusion>
+                                <exclusion>
+                                        <groupId>log4j</groupId>
+                                        <artifactId>log4j</artifactId>
+                                </exclusion>
+                                <exclusion>
+                                        <groupId>net.sj.ehcache</groupId>
+                                        <artifactId>ehcache</artifactId>
+                                </exclusion>
+                                <exclusion>
+                                        <groupId>org.apache.directory.server</groupId>
+                                        <artifactId>apacheds-core</artifactId>
+                                </exclusion>
+                                <exclusion>
+                                        <groupId>org.slf4j</groupId>
+                                        <artifactId>slf4j-log4j12</artifactId>
+                                </exclusion>
+                                <exclusion>
+                                        <groupId>org.springframework</groupId>
+                                        <artifactId>spring-core</artifactId>
+                                </exclusion>
+                                <exclusion>
+                                        <groupId>org.springframework</groupId>
+                                        <artifactId>spring-jdbc</artifactId>
+                                </exclusion>
+                                <exclusion>
+                                        <groupId>org.springframework</groupId>
+                                        <artifactId>spring-ldap</artifactId>
+                                </exclusion>
+                                <exclusion>
+                                        <groupId>org.springframework</groupId>
+                                        <artifactId>spring-mock</artifactId>
+                                </exclusion>
+                                <exclusion>
+                                        <groupId>org.springframework</groupId>
+                                        <artifactId>spring-remoting</artifactId>
+                                </exclusion>
+                                <exclusion>
+                                        <groupId>org.springframework</groupId>
+                                        <artifactId>spring-support</artifactId>
+                                </exclusion>
+                                <exclusion>
+                                        <groupId>org.springframework</groupId>
+                                        <artifactId>spring-web</artifactId>
+                                </exclusion>
+                                <exclusion>
+                                        <groupId>oro</groupId>
+                                        <artifactId>oro</artifactId>
+                                </exclusion>
+                                <exclusion>
+                                        <groupId>taglibs</groupId>
+                                        <artifactId>standard</artifactId>
+                                </exclusion>
+                </exclusions>
+            </dependency>
+            <!-- Spring Security -->
+            <dependency>
+                <groupId>org.springframework.security</groupId>
+                <artifactId>spring-security-core</artifactId>
+                <version>2.0.2</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.security</groupId>
+                <artifactId>spring-security-core-tiger</artifactId>
+                <version>2.0.2</version>
+            </dependency>
+            <!-- JEE dependencies -->
+            <dependency>
+                <groupId>javax.servlet</groupId>
+                <artifactId>servlet-api</artifactId>
+                <version>2.5</version>
+                <scope>provided</scope>
+            </dependency>
+            <!-- Commons dependencies -->
+            <dependency>
+                <groupId>commons-lang</groupId>
+                <artifactId>commons-lang</artifactId>
+                <version>2.1</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-pool</groupId>
+                <artifactId>commons-pool</artifactId>
+                <version>1.3</version>
+            </dependency>
+            <!-- Logging dependencies -->
+            <dependency>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+                <version>1.0.4</version>
+            </dependency>
+            <dependency>
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+                <version>1.2.9</version>
+                <optional>true</optional>
+            </dependency>
+            <!-- Test dependencies -->
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>3.8.2</version>
+                <scope>test</scope>
+            </dependency>
+                <dependency>
+                        <groupId>easymock</groupId>
+                        <artifactId>easymock</artifactId>
+                        <version>1.2_Java1.3</version>
+                        <scope>test</scope>
+                </dependency>
+                <dependency>
+                        <groupId>gsbase</groupId>
+                        <artifactId>gsbase</artifactId>
+                        <version>2.0.1</version>
+                        <scope>test</scope>
+                </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <dependencies>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/mvn-build/pom.xml b/mvn-build/pom.xml
index c438eee5..10329f2a 100644
--- a/mvn-build/pom.xml
+++ b/mvn-build/pom.xml
@@ -5,8 +5,8 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>org.springframework.ldap</groupId>
-	<artifactId>master</artifactId>
-	<version>1.2.2-SNAPSHOT</version>
+	<artifactId>spring-ldap</artifactId>
+	<version>1.3-SNAPSHOT</version>
 
 	<packaging>pom</packaging>
 	<name>Spring LDAP</name>
@@ -109,12 +109,128 @@
 		<spring.version>2.5.4</spring.version>
 	</properties>
 	<modules>
+		<module>parent</module>
 		<module>core</module>
-		<module>tiger</module>
+		<module>core-tiger</module>
 		<module>acegi-support</module>
 		<module>test-support</module>
 		<module>integration-tests</module>
 	</modules>
+    <profiles>
+        <profile>
+            <id>samples</id>
+            <modules>
+                <module>samples</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>copy-dependencies</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>copy</goal>
+                                </goals>
+                                <configuration>
+                                    <artifactItems>
+                                        <!--Spring-->
+                                        <artifactItem>
+                                            <groupId>org.springframework</groupId>
+                                            <artifactId>spring-core</artifactId>
+                                            <version>${spring.version}</version>
+                                            <outputDirectory>${project.build.directory}/dependency/spring/</outputDirectory>
+                                        </artifactItem>
+                                        <artifactItem>
+                                            <groupId>org.springframework</groupId>
+                                            <artifactId>spring-beans</artifactId>
+                                            <version>${spring.version}</version>
+                                            <outputDirectory>${project.build.directory}/dependency/spring/</outputDirectory>
+                                        </artifactItem>
+                                        <artifactItem>
+                                            <groupId>org.springframework</groupId>
+                                            <artifactId>spring-context</artifactId>
+                                            <version>${spring.version}</version>
+                                            <outputDirectory>${project.build.directory}/dependency/spring/</outputDirectory>
+                                        </artifactItem>
+                                        <artifactItem>
+                                            <groupId>org.springframework</groupId>
+                                            <artifactId>spring-jdbc</artifactId>
+                                            <version>${spring.version}</version>
+                                            <outputDirectory>${project.build.directory}/dependency/spring/</outputDirectory>
+                                        </artifactItem>
+                                        <artifactItem>
+                                            <groupId>org.springframework</groupId>
+                                            <artifactId>spring-tx</artifactId>
+                                            <version>${spring.version}</version>
+                                            <outputDirectory>${project.build.directory}/dependency/spring/</outputDirectory>
+                                        </artifactItem>
+                                        <!--Java EE-->
+                                        <artifactItem>
+                                            <groupId>com.sun</groupId>
+                                            <artifactId>ldapbp</artifactId>
+                                            <version>1.0</version>
+                                            <outputDirectory>${project.build.directory}/dependency/sun/</outputDirectory>
+                                        </artifactItem>
+                                        <!-- Commons dependendencies -->
+                                        <artifactItem>
+                                            <groupId>commons-lang</groupId>
+                                            <artifactId>commons-lang</artifactId>
+                                            <version>2.3</version>
+                                            <outputDirectory>${project.build.directory}/dependency/jakarta-commons/</outputDirectory>
+                                        </artifactItem>
+                                        <artifactItem>
+                                            <groupId>commons-pool</groupId>
+                                            <artifactId>commons-pool</artifactId>
+                                            <version>1.3</version>
+                                            <outputDirectory>${project.build.directory}/dependency/jakarta-commons/</outputDirectory>
+                                        </artifactItem>
+                                        <!-- Logging dependencies -->
+                                        <artifactItem>
+                                            <groupId>commons-logging</groupId>
+                                            <artifactId>commons-logging</artifactId>
+                                            <version>1.0.4</version>
+                                            <outputDirectory>${project.build.directory}/dependency/jakarta-commons/</outputDirectory>
+                                        </artifactItem>
+                                        <artifactItem>
+                                            <groupId>log4j</groupId>
+                                            <artifactId>log4j</artifactId>
+                                            <version>1.2.9</version>
+                                            <outputDirectory>${project.build.directory}/dependency/log4j/</outputDirectory>
+                                        </artifactItem>
+                                    </artifactItems>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <version>2.2-beta-2</version>
+                        <inherited>false</inherited>
+                        <executions>
+                            <execution>
+                                <id>with-dependencies</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <descriptors>
+                                        <descriptor>src/assembly/with-dependencies.xml</descriptor>
+                                    </descriptors>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
 	<repositories>
 		<repository>
 			<id>maven central repo</id>
@@ -138,13 +254,73 @@
 			</extension>
 		</extensions>
 		<plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.2-beta-2</version>
+                <inherited>false</inherited>
+                <executions>
+                    <execution>
+                        <id>all-jar</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <appendAssemblyId>false</appendAssemblyId>
+                            <archive>
+                                <manifest>
+                                    <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                                </manifest>
+                                <manifestEntries>
+                                    <Spring-LDAP-Version>${pom.version}</Spring-LDAP-Version>
+                                </manifestEntries>
+                            </archive>
+                            <descriptors>
+                                <descriptor>src/assembly/all.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>sources</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <archive>
+                                <manifest>
+                                    <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                                </manifest>
+                                <manifestEntries>
+                                    <Spring-LDAP-Version>${pom.version}</Spring-LDAP-Version>
+                                </manifestEntries>
+                            </archive>
+                            <descriptors>
+                                <descriptor>src/assembly/sources.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>minimal-zip</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <appendAssemblyId>false</appendAssemblyId>
+                            <descriptors>
+                                <descriptor>src/assembly/minimal.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
 			<plugin>
 				<artifactId>maven-eclipse-plugin</artifactId>
 				<configuration>
 					<downloadSources>true</downloadSources>
 				</configuration>
 			</plugin>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
@@ -153,16 +329,6 @@
 					<forkMode>once</forkMode>
 				</configuration>
 			</plugin>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<descriptors>
-						<descriptor>
-							src/assemble/bin-with-dependencies.xml
-						</descriptor>
-					</descriptors>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>com.agilejava.docbkx</groupId>
 				<artifactId>docbkx-maven-plugin</artifactId>
@@ -224,18 +390,34 @@
 	</build>
 	<reporting>
 		<plugins>
+            <plugin>
+                <artifactId>maven-jxr-plugin</artifactId>
+                <configuration>
+                    <aggregate>true</aggregate>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-report-plugin</artifactId>
+                <configuration>
+                    <aggregate>true</aggregate>
+                </configuration>
+            </plugin>
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.4</version>
 				<configuration>
 					<aggregate>true</aggregate>
+					<breakiterator>true</breakiterator>
 					<header>Spring LDAP Integration</header>
-					<link>http://java.sun.com/j2se/1.5.0/docs/api</link>
-					<link>
-						http://static.springframework.org/spring/docs/2.5.x/api/
-					</link>
-					<link>http://commons.apache.org/pool/apidocs/</link>
+					<quiet>true</quiet>
+					<stylesheetfile>${basedir}/src/main/javadoc/javadoc.css</stylesheetfile>
+					<overview>${basedir}/src/main/javadoc/overview.html</overview>
+					<javadocDirectory>${basedir}/src/main/javadoc</javadocDirectory>
+					<excludePackageNames>org.springframework.ldap.samples</excludePackageNames>
+					<links>
+						<link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+						<link>http://static.springframework.org/spring/docs/2.5.x/api/</link>
+						<link>http://commons.apache.org/pool/apidocs/</link>
+					</links>
 				</configuration>
 				<reportSets>
 					<reportSet>
@@ -245,6 +427,9 @@
 					</reportSet>
 				</reportSets>
 			</plugin>
+            <plugin>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+            </plugin>
 		</plugins>
 	</reporting>
 </project>
diff --git a/mvn-build/samples/spring-ldap-article/.springBeans b/mvn-build/samples/article/.springBeans
similarity index 100%
rename from mvn-build/samples/spring-ldap-article/.springBeans
rename to mvn-build/samples/article/.springBeans
diff --git a/mvn-build/samples/spring-ldap-article/pom.xml b/mvn-build/samples/article/pom.xml
similarity index 78%
rename from mvn-build/samples/spring-ldap-article/pom.xml
rename to mvn-build/samples/article/pom.xml
index f3fbe486..ff204562 100644
--- a/mvn-build/samples/spring-ldap-article/pom.xml
+++ b/mvn-build/samples/article/pom.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
 	<parent>
-		<artifactId>master</artifactId>
 		<groupId>org.springframework.ldap</groupId>
-		<version>1.2.2-SNAPSHOT</version>
+		<artifactId>spring-ldap-parent</artifactId>
+		<version>1.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework</groupId>
-	<artifactId>spring-ldap-person-article</artifactId>
-	<name>Spring LDAP Article Source Code Sample</name>
-	<version>1.2</version>
+	<artifactId>spring-ldap-article</artifactId>
+	<name>Spring LDAP Article Sample</name>
 	<packaging>war</packaging>
 	<description>
 		Example code that matches the article published on java.net on
@@ -32,45 +33,37 @@
 		</plugins>
 	</build>
 
-
 	<dependencies>
 		<!-- Spring Dependencies -->
 		<dependency>
 			<groupId>org.springframework.ldap</groupId>
 			<artifactId>spring-ldap-test</artifactId>
-			<version>1.2.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.ldap</groupId>
 			<artifactId>spring-ldap-samples-utils</artifactId>
-			<version>1.2.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-jdbc</artifactId>
-			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
-			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
-			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>
-			<version>2.4</version>
 			<scope>provided</scope>
 		</dependency>
 		<!-- Test Dependencies -->
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-test</artifactId>
-			<version>${spring.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/mvn-build/samples/spring-ldap-article/readme.txt b/mvn-build/samples/article/readme.txt
similarity index 100%
rename from mvn-build/samples/spring-ldap-article/readme.txt
rename to mvn-build/samples/article/readme.txt
diff --git a/mvn-build/samples/spring-ldap-article/src/itest/java/org/springframework/ldap/samples/article/dao/AbstractPersonDaoIntegrationTest.java b/mvn-build/samples/article/src/itest/java/org/springframework/ldap/samples/article/dao/AbstractPersonDaoIntegrationTest.java
similarity index 100%
rename from mvn-build/samples/spring-ldap-article/src/itest/java/org/springframework/ldap/samples/article/dao/AbstractPersonDaoIntegrationTest.java
rename to mvn-build/samples/article/src/itest/java/org/springframework/ldap/samples/article/dao/AbstractPersonDaoIntegrationTest.java
diff --git a/mvn-build/samples/spring-ldap-article/src/itest/java/org/springframework/ldap/samples/article/dao/PersonDaoImplIntegrationTest.java b/mvn-build/samples/article/src/itest/java/org/springframework/ldap/samples/article/dao/PersonDaoImplIntegrationTest.java
similarity index 100%
rename from mvn-build/samples/spring-ldap-article/src/itest/java/org/springframework/ldap/samples/article/dao/PersonDaoImplIntegrationTest.java
rename to mvn-build/samples/article/src/itest/java/org/springframework/ldap/samples/article/dao/PersonDaoImplIntegrationTest.java
diff --git a/mvn-build/samples/spring-ldap-article/src/itest/java/org/springframework/ldap/samples/article/dao/TraditionalPersonDaoImplIntegrationTest.java b/mvn-build/samples/article/src/itest/java/org/springframework/ldap/samples/article/dao/TraditionalPersonDaoImplIntegrationTest.java
similarity index 100%
rename from mvn-build/samples/spring-ldap-article/src/itest/java/org/springframework/ldap/samples/article/dao/TraditionalPersonDaoImplIntegrationTest.java
rename to mvn-build/samples/article/src/itest/java/org/springframework/ldap/samples/article/dao/TraditionalPersonDaoImplIntegrationTest.java
diff --git a/mvn-build/samples/spring-ldap-article/src/main/java/log4j.properties b/mvn-build/samples/article/src/main/java/log4j.properties
similarity index 100%
rename from mvn-build/samples/spring-ldap-article/src/main/java/log4j.properties
rename to mvn-build/samples/article/src/main/java/log4j.properties
diff --git a/mvn-build/samples/spring-ldap-article/src/main/java/org/springframework/ldap/samples/article/dao/PersonDao.java b/mvn-build/samples/article/src/main/java/org/springframework/ldap/samples/article/dao/PersonDao.java
similarity index 100%
rename from mvn-build/samples/spring-ldap-article/src/main/java/org/springframework/ldap/samples/article/dao/PersonDao.java
rename to mvn-build/samples/article/src/main/java/org/springframework/ldap/samples/article/dao/PersonDao.java
diff --git a/mvn-build/samples/spring-ldap-article/src/main/java/org/springframework/ldap/samples/article/dao/PersonDaoImpl.java b/mvn-build/samples/article/src/main/java/org/springframework/ldap/samples/article/dao/PersonDaoImpl.java
similarity index 100%
rename from mvn-build/samples/spring-ldap-article/src/main/java/org/springframework/ldap/samples/article/dao/PersonDaoImpl.java
rename to mvn-build/samples/article/src/main/java/org/springframework/ldap/samples/article/dao/PersonDaoImpl.java
diff --git a/mvn-build/samples/spring-ldap-article/src/main/java/org/springframework/ldap/samples/article/dao/TraditionalPersonDaoImpl.java b/mvn-build/samples/article/src/main/java/org/springframework/ldap/samples/article/dao/TraditionalPersonDaoImpl.java
similarity index 100%
rename from mvn-build/samples/spring-ldap-article/src/main/java/org/springframework/ldap/samples/article/dao/TraditionalPersonDaoImpl.java
rename to mvn-build/samples/article/src/main/java/org/springframework/ldap/samples/article/dao/TraditionalPersonDaoImpl.java
diff --git a/mvn-build/samples/spring-ldap-article/src/main/java/org/springframework/ldap/samples/article/domain/Person.java b/mvn-build/samples/article/src/main/java/org/springframework/ldap/samples/article/domain/Person.java
similarity index 100%
rename from mvn-build/samples/spring-ldap-article/src/main/java/org/springframework/ldap/samples/article/domain/Person.java
rename to mvn-build/samples/article/src/main/java/org/springframework/ldap/samples/article/domain/Person.java
diff --git a/mvn-build/samples/spring-ldap-article/src/main/java/org/springframework/ldap/samples/article/web/DefaultController.java b/mvn-build/samples/article/src/main/java/org/springframework/ldap/samples/article/web/DefaultController.java
similarity index 100%
rename from mvn-build/samples/spring-ldap-article/src/main/java/org/springframework/ldap/samples/article/web/DefaultController.java
rename to mvn-build/samples/article/src/main/java/org/springframework/ldap/samples/article/web/DefaultController.java
diff --git a/mvn-build/samples/spring-ldap-article/src/main/java/overview.html b/mvn-build/samples/article/src/main/java/overview.html
similarity index 100%
rename from mvn-build/samples/spring-ldap-article/src/main/java/overview.html
rename to mvn-build/samples/article/src/main/java/overview.html
diff --git a/mvn-build/samples/spring-ldap-article/src/main/webapp/WEB-INF/applicationContext.xml b/mvn-build/samples/article/src/main/webapp/WEB-INF/applicationContext.xml
similarity index 100%
rename from mvn-build/samples/spring-ldap-article/src/main/webapp/WEB-INF/applicationContext.xml
rename to mvn-build/samples/article/src/main/webapp/WEB-INF/applicationContext.xml
diff --git a/mvn-build/samples/spring-ldap-article/src/main/webapp/WEB-INF/basic-servlet.xml b/mvn-build/samples/article/src/main/webapp/WEB-INF/basic-servlet.xml
similarity index 100%
rename from mvn-build/samples/spring-ldap-article/src/main/webapp/WEB-INF/basic-servlet.xml
rename to mvn-build/samples/article/src/main/webapp/WEB-INF/basic-servlet.xml
diff --git a/mvn-build/samples/spring-ldap-article/src/main/webapp/WEB-INF/jsp/showPerson.jsp b/mvn-build/samples/article/src/main/webapp/WEB-INF/jsp/showPerson.jsp
similarity index 100%
rename from mvn-build/samples/spring-ldap-article/src/main/webapp/WEB-INF/jsp/showPerson.jsp
rename to mvn-build/samples/article/src/main/webapp/WEB-INF/jsp/showPerson.jsp
diff --git a/mvn-build/samples/spring-ldap-article/src/main/webapp/WEB-INF/jsp/showTree.jsp b/mvn-build/samples/article/src/main/webapp/WEB-INF/jsp/showTree.jsp
similarity index 100%
rename from mvn-build/samples/spring-ldap-article/src/main/webapp/WEB-INF/jsp/showTree.jsp
rename to mvn-build/samples/article/src/main/webapp/WEB-INF/jsp/showTree.jsp
diff --git a/mvn-build/samples/spring-ldap-article/src/main/webapp/WEB-INF/ldap.properties b/mvn-build/samples/article/src/main/webapp/WEB-INF/ldap.properties
similarity index 100%
rename from mvn-build/samples/spring-ldap-article/src/main/webapp/WEB-INF/ldap.properties
rename to mvn-build/samples/article/src/main/webapp/WEB-INF/ldap.properties
diff --git a/mvn-build/samples/spring-ldap-article/src/main/webapp/WEB-INF/setup_data.ldif b/mvn-build/samples/article/src/main/webapp/WEB-INF/setup_data.ldif
similarity index 100%
rename from mvn-build/samples/spring-ldap-article/src/main/webapp/WEB-INF/setup_data.ldif
rename to mvn-build/samples/article/src/main/webapp/WEB-INF/setup_data.ldif
diff --git a/mvn-build/samples/spring-ldap-article/src/main/webapp/WEB-INF/web.xml b/mvn-build/samples/article/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from mvn-build/samples/spring-ldap-article/src/main/webapp/WEB-INF/web.xml
rename to mvn-build/samples/article/src/main/webapp/WEB-INF/web.xml
diff --git a/mvn-build/samples/spring-ldap-article/src/main/webapp/index.htm b/mvn-build/samples/article/src/main/webapp/index.htm
similarity index 100%
rename from mvn-build/samples/spring-ldap-article/src/main/webapp/index.htm
rename to mvn-build/samples/article/src/main/webapp/index.htm
diff --git a/mvn-build/samples/spring-ldap-article/src/test/java/.dummy b/mvn-build/samples/article/src/test/java/.dummy
similarity index 100%
rename from mvn-build/samples/spring-ldap-article/src/test/java/.dummy
rename to mvn-build/samples/article/src/test/java/.dummy
diff --git a/mvn-build/samples/spring-ldap-article/src/test/resources/config/ldap.properties b/mvn-build/samples/article/src/test/resources/config/ldap.properties
similarity index 100%
rename from mvn-build/samples/spring-ldap-article/src/test/resources/config/ldap.properties
rename to mvn-build/samples/article/src/test/resources/config/ldap.properties
diff --git a/mvn-build/samples/spring-ldap-article/src/test/resources/config/testContext.xml b/mvn-build/samples/article/src/test/resources/config/testContext.xml
similarity index 100%
rename from mvn-build/samples/spring-ldap-article/src/test/resources/config/testContext.xml
rename to mvn-build/samples/article/src/test/resources/config/testContext.xml
diff --git a/mvn-build/samples/pom.xml b/mvn-build/samples/pom.xml
new file mode 100644
index 00000000..15798516
--- /dev/null
+++ b/mvn-build/samples/pom.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <parent>
+        <groupId>org.springframework.ldap</groupId>
+        <artifactId>spring-ldap-parent</artifactId>
+        <version>1.3-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>spring-ldap-samples</artifactId>
+    <packaging>pom</packaging>
+    <name>Spring LDAP Samples</name>
+    <modules>
+        <module>samples-utils</module>
+        <module>article</module>
+    </modules>
+    <repositories>
+        <repository>
+            <id>spring-milestone</id>
+            <name>Spring Milestone Repository</name>
+            <url>http://maven.springframework.org/milestone</url>
+        </repository>        
+    </repositories>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>maven-jetty-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <warName>${pom.artifactId}</warName>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <!-- Logging dependencies -->
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/mvn-build/samples/samples-utils/pom.xml b/mvn-build/samples/samples-utils/pom.xml
index 84918002..28a37387 100644
--- a/mvn-build/samples/samples-utils/pom.xml
+++ b/mvn-build/samples/samples-utils/pom.xml
@@ -1,17 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework.ldap</groupId>
-	<artifactId>spring-ldap-samples-utils</artifactId>
-	<packaging>jar</packaging>
-	<version>1.2.2-SNAPSHOT</version>
-	<name>Spring LDAP utilities for samples</name>
+
 	<parent>
 		<groupId>org.springframework.ldap</groupId>
-		<artifactId>master</artifactId>
-		<version>1.2.2-SNAPSHOT</version>
+		<artifactId>spring-ldap-parent</artifactId>
+		<version>1.3-SNAPSHOT</version>
 	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>spring-ldap-samples-utils</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring LDAP Samples Utilities</name>
 
 	<build>
 		<plugins>
@@ -27,18 +27,15 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.ldap</groupId>
-			<artifactId>spring-ldap-tiger</artifactId>
-			<version>1.2.2-SNAPSHOT</version>
+			<artifactId>spring-ldap-core-tiger</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.ldap</groupId>
 			<artifactId>spring-ldap-test</artifactId>
-			<version>1.2.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-test</artifactId>
-			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
diff --git a/mvn-build/src/assembly/all.xml b/mvn-build/src/assembly/all.xml
new file mode 100644
index 00000000..fa196eda
--- /dev/null
+++ b/mvn-build/src/assembly/all.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly>
+    <id>all</id>
+    <formats>
+        <format>jar</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <moduleSets>
+        <moduleSet>
+            <includes>
+                <include>org.springframework.ldap:spring-ldap-core</include>
+                <include>org.springframework.ldap:spring-ldap-core-tiger</include>
+                <include>org.springframework.ldap:spring-ldap-acegi-support</include>
+            </includes>
+            <binaries>
+                <outputDirectory/>
+                <includeDependencies>false</includeDependencies>
+                <unpack>true</unpack>
+                <unpackOptions>
+                    <excludes>
+                        <exclude>**/spring.handlers</exclude>
+                        <exclude>**/spring.schemas</exclude>
+                    </excludes>
+                </unpackOptions>
+            </binaries>
+        </moduleSet>
+    </moduleSets>
+    <fileSets>
+        <fileSet>
+            <directory>src/main/resources/META-INF</directory>
+            <outputDirectory>META-INF</outputDirectory>
+        </fileSet>
+    </fileSets>
+</assembly>
diff --git a/mvn-build/src/assembly/docs.xml b/mvn-build/src/assembly/docs.xml
new file mode 100644
index 00000000..e1bd529a
--- /dev/null
+++ b/mvn-build/src/assembly/docs.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component>
+    <fileSets>
+        <fileSet>
+            <directory>.</directory>
+            <includes>
+                <include>readme.txt</include>
+                <include>license.txt</include>
+                <include>notice.txt</include>
+            </includes>
+            <outputDirectory/>
+            <lineEnding>dos</lineEnding>
+        </fileSet>
+    </fileSets>
+</component>
\ No newline at end of file
diff --git a/mvn-build/src/assembly/minimal.xml b/mvn-build/src/assembly/minimal.xml
new file mode 100644
index 00000000..a2bcaa75
--- /dev/null
+++ b/mvn-build/src/assembly/minimal.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly>
+    <id>minimal</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <componentDescriptors>
+        <componentDescriptor>src/assembly/docs.xml</componentDescriptor>
+    </componentDescriptors>
+    <includeBaseDirectory>true</includeBaseDirectory>
+    <moduleSets>
+        <moduleSet>
+            <includes>
+                <include>org.springframework.ldap:spring-ldap-core</include>
+                <include>org.springframework.ldap:spring-ldap-core-tiger</include>
+                <include>org.springframework.ldap:spring-ldap-test</include>
+                <include>org.springframework.ldap:spring-ldap-acegi-support</include>
+            </includes>
+            <binaries>
+                <includeDependencies>false</includeDependencies>
+                <unpack>false</unpack>
+                <outputFileNameMapping>dist/modules/${module.artifactId}-${module.version}.${module.extension}</outputFileNameMapping>
+            </binaries>
+        </moduleSet>
+    </moduleSets>
+    <files>
+        <file>
+            <source>target/${artifactId}-${version}.jar</source>
+            <outputDirectory>dist</outputDirectory>
+        </file>
+    </files>
+</assembly>
diff --git a/mvn-build/src/assembly/sources.xml b/mvn-build/src/assembly/sources.xml
new file mode 100644
index 00000000..8ea0f705
--- /dev/null
+++ b/mvn-build/src/assembly/sources.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly>
+    <id>sources</id>
+    <formats>
+        <format>jar</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>core/src/main/java</directory>
+            <outputDirectory/>
+        </fileSet>
+        <fileSet>
+            <directory>core-tiger/src/main/java</directory>
+            <outputDirectory/>
+        </fileSet>
+        <fileSet>
+            <directory>test-support/src/main/java</directory>
+            <outputDirectory/>
+        </fileSet>
+        <fileSet>
+            <directory>acegi-support/src/main/java</directory>
+            <outputDirectory/>
+        </fileSet>
+    </fileSets>
+</assembly>
diff --git a/mvn-build/src/assembly/with-dependencies.xml b/mvn-build/src/assembly/with-dependencies.xml
new file mode 100644
index 00000000..cc9ed071
--- /dev/null
+++ b/mvn-build/src/assembly/with-dependencies.xml
@@ -0,0 +1,88 @@
+<assembly>
+    <id>with-dependencies</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <componentDescriptors>
+        <componentDescriptor>src/assembly/docs.xml</componentDescriptor>
+    </componentDescriptors>
+    <includeBaseDirectory>true</includeBaseDirectory>
+    <moduleSets>
+        <moduleSet>
+            <includes>
+                <include>org.springframework.ldap:spring-ldap-parent</include>
+                <include>org.springframework.ldap:spring-ldap-core</include>
+                <include>org.springframework.ldap:spring-ldap-core-tiger</include>
+                <include>org.springframework.ldap:spring-ldap-test</include>
+                <include>org.springframework.ldap:spring-ldap-acegi-support</include>
+            </includes>
+            <binaries>
+                <includeDependencies>false</includeDependencies>
+                <unpack>false</unpack>
+                <outputFileNameMapping>dist/modules/${module.artifactId}-${module.version}.${module.extension}</outputFileNameMapping>
+            </binaries>
+            <sources>
+                <fileSets>
+                    <fileSet>
+                        <directory>src/main/java</directory>
+                    </fileSet>
+                </fileSets>
+                <outputDirectoryMapping>dist/module-sources/${module.artifactId}</outputDirectoryMapping>
+            </sources>
+        </moduleSet>
+    </moduleSets>
+    <files>
+        <file>
+            <source>target/${artifactId}-${version}.jar</source>
+            <outputDirectory>dist</outputDirectory>
+        </file>
+        <file>
+            <source>target/${artifactId}-${version}-sources.jar</source>
+            <outputDirectory>dist</outputDirectory>
+        </file>
+    </files>
+    <fileSets>
+        <!-- Documentation -->
+        <fileSet>
+            <directory>target/site/apidocs</directory>
+            <outputDirectory>docs/api</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>target/site/reference</directory>
+            <outputDirectory>docs/reference</outputDirectory>
+        </fileSet>
+        <!-- Dependencies -->
+        <fileSet>
+            <directory>target/dependency</directory>
+            <outputDirectory>lib</outputDirectory>
+            <includes>
+                <include>**/*.jar</include>
+            </includes>
+        </fileSet>
+        <!-- Samples -->
+        <fileSet>
+            <directory>samples</directory>
+            <outputDirectory>samples</outputDirectory>
+            <includes>
+                <include>**/readme.txt</include>
+            </includes>
+            <lineEnding>dos</lineEnding>
+        </fileSet>
+        <fileSet>
+            <directory>samples</directory>
+            <outputDirectory>samples</outputDirectory>
+            <includes>
+                <include>**/src/**</include>
+                <include>**/build*.xml</include>
+                <include>**/*.bat</include>
+                <include>**/pom.xml</include>
+            </includes>
+            <excludes>
+                <exclude>**/target</exclude>
+                <exclude>**/target/**</exclude>
+                <exclude>**/bin</exclude>
+                <exclude>**/bin/**</exclude>
+            </excludes>
+        </fileSet>
+    </fileSets>
+</assembly>
diff --git a/mvn-build/src/docbkx/simple.xml b/mvn-build/src/docbkx/simple.xml
index 95056634..967cbe71 100644
--- a/mvn-build/src/docbkx/simple.xml
+++ b/mvn-build/src/docbkx/simple.xml
@@ -6,7 +6,7 @@
   <sect1 id="simple-ldap-template">
     <title>SimpleLdapTemplate</title>
 
-    <para>As of version 1.2 Spring LDAP includes the spring-ldap-tiger.jar distributable, which adds
+    <para>As of version 1.3 Spring LDAP includes the spring-ldap-core-tiger.jar distributable, which adds
     a thin layer of Java 5 functionality on top of Spring LDAP.</para>
     
     <para>The <literal>SimpleLdapTemplate</literal> class adds search and lookup methods that take a 
@@ -32,4 +32,4 @@
     </example>
     </para>
   </sect1>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/mvn-build/src/main/javadoc/javadoc.css b/mvn-build/src/main/javadoc/javadoc.css
new file mode 100644
index 00000000..1f009c4b
--- /dev/null
+++ b/mvn-build/src/main/javadoc/javadoc.css
@@ -0,0 +1,48 @@
+/* Spring-specific Javadoc style sheet rules */
+
+#overviewBody {
+
+}
+
+.code {
+	border: 1px solid black;
+	background-color: #F4F4F4;
+	padding: 5px;
+}
+
+/* Vanilla Javadoc style sheet rules */
+
+body {
+	font-family: Helvetica, Arial, sans-serif;
+	background-color: white;
+	font-size: 10pt;
+}
+
+td { font-size: 10pt; font-family: Helvetica, Arial, sans-serif }/* Javadoc style sheet */
+
+/* Define colors, fonts and other style attributes here to override the defaults */
+
+/* Page background color */
+body { background-color: #FFFFFF }
+
+/* Headings */
+h1 { font-size: 145% }
+
+/* Table colors */
+.TableHeadingColor     { background: #CCCCFF } /* Dark mauve */
+.TableSubHeadingColor  { background: #EEEEFF } /* Light mauve */
+.TableRowColor         { background: #FFFFFF } /* White */
+
+/* Font used in left-hand frame lists */
+.FrameTitleFont   { font-size: 100%; font-family: Helvetica, Arial, sans-serif }
+.FrameHeadingFont { font-size:  90%; font-family: Helvetica, Arial, sans-serif }
+.FrameItemFont    { font-size:  90%; font-family: Helvetica, Arial, sans-serif }
+
+/* Navigation bar fonts and colors */
+.NavBarCell1    { background-color:#EEEEFF;} /* Light mauve */
+.NavBarCell1Rev { background-color:#00008B;} /* Dark Blue */
+.NavBarFont1    { font-family: Arial, Helvetica, sans-serif; color:#000000;}
+.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;}
+
+.NavBarCell2    { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
+.NavBarCell3    { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
diff --git a/mvn-build/src/main/javadoc/overview.html b/mvn-build/src/main/javadoc/overview.html
new file mode 100644
index 00000000..ace359ea
--- /dev/null
+++ b/mvn-build/src/main/javadoc/overview.html
@@ -0,0 +1,16 @@
+<html>
+<body>
+This document is the API specification for the Spring LDAP Framework
+<hr/>
+<div id="overviewBody">
+    <p>
+        For further API reference and developer documentation, see the
+        <a href="http://static.springframework.org/spring-ldap/site/reference.html" target="_top">Spring
+            LDAP reference documentation</a>.
+        That documentation contains more detailed, developer-targeted
+        descriptions, with conceptual overviews, definitions of terms,
+        workarounds, and working code examples.
+    </p>
+</div>
+</body>
+</html>
diff --git a/mvn-build/test-support/pom.xml b/mvn-build/test-support/pom.xml
index 0b6b71c9..8b83e866 100644
--- a/mvn-build/test-support/pom.xml
+++ b/mvn-build/test-support/pom.xml
@@ -3,19 +3,15 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-	<modelVersion>4.0.0</modelVersion>
-
-	<groupId>org.springframework.ldap</groupId>
-	<artifactId>spring-ldap-test</artifactId>
-	<name>Spring LDAP Automated Test Support</name>
-	<version>1.2.2-SNAPSHOT</version>
-
 	<parent>
 		<groupId>org.springframework.ldap</groupId>
-		<artifactId>master</artifactId>
-		<version>1.2.2-SNAPSHOT</version>
+		<artifactId>spring-ldap-parent</artifactId>
+		<version>1.3-SNAPSHOT</version>
 	</parent>
-
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>spring-ldap-test</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring LDAP Automated Test Support</name>
 
 	<build>
 		<plugins>
@@ -31,8 +27,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.ldap</groupId>
-			<artifactId>spring-ldap</artifactId>
-			<version>1.2.2-SNAPSHOT</version>
+			<artifactId>spring-ldap-core</artifactId>
 		</dependency>
 		<!-- External Dependencies -->
 		<dependency>
@@ -70,32 +65,27 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
-			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-beans</artifactId>
-			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
-			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-test</artifactId>
-			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
-			<version>1.2.9</version>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>3.8.2</version>
 		</dependency>
+      <dependency>
+         <groupId>junit</groupId>
+         <artifactId>junit</artifactId>
+         <scope>provided</scope>
+      </dependency>
 	</dependencies>
 </project>
diff --git a/mvn-build/with-dependencies.sh b/mvn-build/with-dependencies.sh
new file mode 100755
index 00000000..38ee546b
--- /dev/null
+++ b/mvn-build/with-dependencies.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+export MAVEN_OPTS=-Xmx512m
+mvn -Dmaven.test.skip=true -P release clean javadoc:javadoc docbkx:generate-html docbkx:generate-pdf install