diff --git a/gradle.properties b/gradle.properties
index 331739fb..f8995a77 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1 @@
-version=2.1.0.BUILD-SNAPSHOT
+version=2.1.0.RELEASE
diff --git a/samples/odm/pom.xml b/samples/odm/pom.xml
index d5cdeee6..2b2d1122 100644
--- a/samples/odm/pom.xml
+++ b/samples/odm/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.springframework.ldap</groupId>
   <artifactId>spring-ldap-odm-sample</artifactId>
-  <version>2.1.0.RC1</version>
+  <version>2.1.0.RELEASE</version>
   <packaging>war</packaging>
   <name>spring-ldap-odm-sample</name>
   <description>spring-ldap-odm-sample</description>
@@ -75,13 +75,13 @@
     <dependency>
       <groupId>org.springframework.data</groupId>
       <artifactId>spring-data-commons</artifactId>
-      <version>1.12.0.RC1</version>
+      <version>1.12.1.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.ldap</groupId>
       <artifactId>spring-ldap-test</artifactId>
-      <version>2.1.0.RC1</version>
+      <version>2.1.0.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -114,6 +114,12 @@
       <version>4.11</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <version>2.3.0</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
@@ -121,12 +127,6 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <repositories>
-    <repository>
-      <id>spring-snasphot</id>
-      <url>http://repo.springsource.org/libs-snapshot</url>
-    </repository>
-  </repositories>
   <build>
     <plugins>
       <plugin>
diff --git a/samples/plain/pom.xml b/samples/plain/pom.xml
index c7a40915..82b4acc0 100644
--- a/samples/plain/pom.xml
+++ b/samples/plain/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.springframework.ldap</groupId>
   <artifactId>spring-ldap-plain-sample</artifactId>
-  <version>2.1.0.RC1</version>
+  <version>2.1.0.RELEASE</version>
   <packaging>war</packaging>
   <name>spring-ldap-plain-sample</name>
   <description>spring-ldap-plain-sample</description>
@@ -75,13 +75,13 @@
     <dependency>
       <groupId>org.springframework.data</groupId>
       <artifactId>spring-data-commons</artifactId>
-      <version>1.12.0.RC1</version>
+      <version>1.12.1.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.ldap</groupId>
       <artifactId>spring-ldap-test</artifactId>
-      <version>2.1.0.RC1</version>
+      <version>2.1.0.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -114,6 +114,12 @@
       <version>4.11</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <version>2.3.0</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
@@ -121,12 +127,6 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <repositories>
-    <repository>
-      <id>spring-snasphot</id>
-      <url>http://repo.springsource.org/libs-snapshot</url>
-    </repository>
-  </repositories>
   <build>
     <plugins>
       <plugin>
diff --git a/samples/user-admin/pom.xml b/samples/user-admin/pom.xml
index 33db9cd3..ac207246 100644
--- a/samples/user-admin/pom.xml
+++ b/samples/user-admin/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.springframework.ldap</groupId>
   <artifactId>spring-ldap-user-admin-sample</artifactId>
-  <version>2.1.0.RC1</version>
+  <version>2.1.0.RELEASE</version>
   <packaging>war</packaging>
   <name>spring-ldap-user-admin-sample</name>
   <description>spring-ldap-user-admin-sample</description>
@@ -87,13 +87,13 @@
     <dependency>
       <groupId>org.springframework.data</groupId>
       <artifactId>spring-data-commons</artifactId>
-      <version>1.12.0.RC1</version>
+      <version>1.12.1.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.ldap</groupId>
       <artifactId>spring-ldap-test</artifactId>
-      <version>2.1.0.RC1</version>
+      <version>2.1.0.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -139,12 +139,6 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <repositories>
-    <repository>
-      <id>spring-snasphot</id>
-      <url>http://repo.springsource.org/libs-snapshot</url>
-    </repository>
-  </repositories>
   <build>
     <plugins>
       <plugin>