diff --git a/all/pom.xml b/all/pom.xml
index 08c4849..43b93c7 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
   
   <artifactId>api-all</artifactId>
diff --git a/asn1/api/pom.xml b/asn1/api/pom.xml
index 10e59bf..6980fce 100644
--- a/asn1/api/pom.xml
+++ b/asn1/api/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-asn1-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
   
   <artifactId>api-asn1-api</artifactId>
diff --git a/asn1/ber/pom.xml b/asn1/ber/pom.xml
index 2a56d4e..ebd6887 100644
--- a/asn1/ber/pom.xml
+++ b/asn1/ber/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-asn1-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
   
   <artifactId>api-asn1-ber</artifactId>
diff --git a/asn1/pom.xml b/asn1/pom.xml
index bb97c80..8cd3ac4 100644
--- a/asn1/pom.xml
+++ b/asn1/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
   
   <artifactId>api-asn1-parent</artifactId>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 52c9604..b286767 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
   
   <artifactId>apache-ldap-api</artifactId>
diff --git a/dsml/engine/pom.xml b/dsml/engine/pom.xml
index c8b633a..17e269b 100644
--- a/dsml/engine/pom.xml
+++ b/dsml/engine/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-dsml-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>api-dsml-engine</artifactId>
diff --git a/dsml/parser/pom.xml b/dsml/parser/pom.xml
index bc0e67f..bf3e1a8 100644
--- a/dsml/parser/pom.xml
+++ b/dsml/parser/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-dsml-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>api-dsml-parser</artifactId>
diff --git a/dsml/pom.xml b/dsml/pom.xml
index 98e855f..d51df4e 100644
--- a/dsml/pom.xml
+++ b/dsml/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
   
   <artifactId>api-dsml-parent</artifactId>
diff --git a/i18n/pom.xml b/i18n/pom.xml
index 33bf156..037bd0b 100644
--- a/i18n/pom.xml
+++ b/i18n/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
   
   <artifactId>api-i18n</artifactId>
diff --git a/integ-osgi/pom.xml b/integ-osgi/pom.xml
index d900753..d510482 100644
--- a/integ-osgi/pom.xml
+++ b/integ-osgi/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>api-integ-osgi</artifactId>
diff --git a/integ/pom.xml b/integ/pom.xml
index fc16d6d..6b4189a 100644
--- a/integ/pom.xml
+++ b/integ/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
   
   <artifactId>api-integ</artifactId>
diff --git a/ldap/client/all/pom.xml b/ldap/client/all/pom.xml
index a0d4360..4ef7696 100644
--- a/ldap/client/all/pom.xml
+++ b/ldap/client/all/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-ldap-client-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
   
   <artifactId>api-ldap-client-all</artifactId>
diff --git a/ldap/client/api/pom.xml b/ldap/client/api/pom.xml
index efd9674..d103e10 100644
--- a/ldap/client/api/pom.xml
+++ b/ldap/client/api/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-ldap-client-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>api-ldap-client-api</artifactId>
diff --git a/ldap/client/pom.xml b/ldap/client/pom.xml
index 4fc67cc..6ac8931 100644
--- a/ldap/client/pom.xml
+++ b/ldap/client/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-ldap-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
   
   <artifactId>api-ldap-client-parent</artifactId>
diff --git a/ldap/codec/core/pom.xml b/ldap/codec/core/pom.xml
index bf002a5..b84b60b 100644
--- a/ldap/codec/core/pom.xml
+++ b/ldap/codec/core/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-ldap-codec-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
   
   <artifactId>api-ldap-codec-core</artifactId>
diff --git a/ldap/codec/pom.xml b/ldap/codec/pom.xml
index 81554d7..9d351dd 100644
--- a/ldap/codec/pom.xml
+++ b/ldap/codec/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-ldap-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
   
   <artifactId>api-ldap-codec-parent</artifactId>
diff --git a/ldap/codec/standalone/pom.xml b/ldap/codec/standalone/pom.xml
index 952ce43..304023a 100644
--- a/ldap/codec/standalone/pom.xml
+++ b/ldap/codec/standalone/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-ldap-codec-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
   
   <artifactId>api-ldap-codec-standalone</artifactId>
diff --git a/ldap/extras/aci/pom.xml b/ldap/extras/aci/pom.xml
index b1f7ea2..ba21bd1 100644
--- a/ldap/extras/aci/pom.xml
+++ b/ldap/extras/aci/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-ldap-extras-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
   
   <artifactId>api-ldap-extras-aci</artifactId>
diff --git a/ldap/extras/codec-api/pom.xml b/ldap/extras/codec-api/pom.xml
index 6a364a1..de11a92 100644
--- a/ldap/extras/codec-api/pom.xml
+++ b/ldap/extras/codec-api/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-ldap-extras-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
   
   <artifactId>api-ldap-extras-codec-api</artifactId>
diff --git a/ldap/extras/codec/pom.xml b/ldap/extras/codec/pom.xml
index c56babd..46a14ee 100644
--- a/ldap/extras/codec/pom.xml
+++ b/ldap/extras/codec/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-ldap-extras-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
   
   <artifactId>api-ldap-extras-codec</artifactId>
diff --git a/ldap/extras/pom.xml b/ldap/extras/pom.xml
index eaaa9e6..76cd438 100644
--- a/ldap/extras/pom.xml
+++ b/ldap/extras/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-ldap-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
   
   <artifactId>api-ldap-extras-parent</artifactId>
diff --git a/ldap/extras/sp/pom.xml b/ldap/extras/sp/pom.xml
index 77d2fab..bd4cfd6 100644
--- a/ldap/extras/sp/pom.xml
+++ b/ldap/extras/sp/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-ldap-extras-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
   
   <artifactId>api-ldap-extras-sp</artifactId>
diff --git a/ldap/extras/trigger/pom.xml b/ldap/extras/trigger/pom.xml
index ba59210..a4a1a1e 100644
--- a/ldap/extras/trigger/pom.xml
+++ b/ldap/extras/trigger/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-ldap-extras-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
   
   <artifactId>api-ldap-extras-trigger</artifactId>
diff --git a/ldap/extras/util/pom.xml b/ldap/extras/util/pom.xml
index dbdabf5..5c9ac09 100644
--- a/ldap/extras/util/pom.xml
+++ b/ldap/extras/util/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-ldap-extras-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
   
   <artifactId>api-ldap-extras-util</artifactId>
diff --git a/ldap/model/pom.xml b/ldap/model/pom.xml
index 128e471..eb577cf 100644
--- a/ldap/model/pom.xml
+++ b/ldap/model/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-ldap-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
   
   <artifactId>api-ldap-model</artifactId>
diff --git a/ldap/net/mina/pom.xml b/ldap/net/mina/pom.xml
index 855a8fb..17aeb47 100644
--- a/ldap/net/mina/pom.xml
+++ b/ldap/net/mina/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-ldap-net-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
   
   <artifactId>api-ldap-net-mina</artifactId>
diff --git a/ldap/net/pom.xml b/ldap/net/pom.xml
index 5f9a4db..122ea2b 100644
--- a/ldap/net/pom.xml
+++ b/ldap/net/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-ldap-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
   
   <artifactId>api-ldap-net-parent</artifactId>
diff --git a/ldap/pom.xml b/ldap/pom.xml
index 477b005..6c83dc1 100644
--- a/ldap/pom.xml
+++ b/ldap/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
   
   <artifactId>api-ldap-parent</artifactId>
diff --git a/ldap/schema/converter/pom.xml b/ldap/schema/converter/pom.xml
index 9fd8b1b..bbe29cc 100644
--- a/ldap/schema/converter/pom.xml
+++ b/ldap/schema/converter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-ldap-schema-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
   
   <artifactId>api-ldap-schema-converter</artifactId>
diff --git a/ldap/schema/data/pom.xml b/ldap/schema/data/pom.xml
index ffc046f..8eea371 100644
--- a/ldap/schema/data/pom.xml
+++ b/ldap/schema/data/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-ldap-schema-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
   
   <artifactId>api-ldap-schema-data</artifactId>
diff --git a/ldap/schema/pom.xml b/ldap/schema/pom.xml
index 2d2cd2a..2cad81b 100644
--- a/ldap/schema/pom.xml
+++ b/ldap/schema/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-ldap-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
   
   <artifactId>api-ldap-schema-parent</artifactId>
diff --git a/pom.xml b/pom.xml
index f5f2b88..34fa2e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
   <artifactId>api-parent</artifactId>
   <name>Apache Directory LDAP API</name>
   <packaging>pom</packaging>
-  <version>2.1.0-SNAPSHOT</version>
+  <version>2.1.0</version>
 
   <properties>
     <projectName>ApacheDS-LDAP-API</projectName>
@@ -681,7 +681,7 @@
     <connection>scm:git:https://gitbox.apache.org/repos/asf/directory-ldap-api.git</connection>
     <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/directory-ldap-api.git</developerConnection>
     <url>https://github.com/apache/directory-ldap-api/tree/${project.scm.tag}</url>
-    <tag>master</tag>
+    <tag>2.1.0</tag>
   </scm>
 
   <reporting>
diff --git a/util/pom.xml b/util/pom.xml
index ed6cb6a..3a2ecd9 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.api</groupId>
     <artifactId>api-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
   
   <artifactId>api-util</artifactId>