diff --git a/all/pom.xml b/all/pom.xml
index bc19322..f9aa3a7 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>1.0.0-M18-SNAPSHOT</version>
+    <version>1.0.0-M18</version>
   </parent>
   
   <artifactId>api-all</artifactId>
diff --git a/asn1/api/pom.xml b/asn1/api/pom.xml
index 421714a..afb4923 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>1.0.0-M18-SNAPSHOT</version>
+    <version>1.0.0-M18</version>
   </parent>
   
   <artifactId>api-asn1-api</artifactId>
diff --git a/asn1/ber/pom.xml b/asn1/ber/pom.xml
index 55f3c11..ce714c0 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>1.0.0-M18-SNAPSHOT</version>
+    <version>1.0.0-M18</version>
   </parent>
   
   <artifactId>api-asn1-ber</artifactId>
diff --git a/asn1/pom.xml b/asn1/pom.xml
index b8ee88e..b73bbd1 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>1.0.0-M18-SNAPSHOT</version>
+    <version>1.0.0-M18</version>
   </parent>
   
   <artifactId>api-asn1-parent</artifactId>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 9b5db59..b55cbbc 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>1.0.0-M18-SNAPSHOT</version>
+    <version>1.0.0-M18</version>
   </parent>
   
   <artifactId>apache-ldap-api</artifactId>
diff --git a/dsml/engine/pom.xml b/dsml/engine/pom.xml
index f8c8a83..9b2e5a3 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>1.0.0-M18-SNAPSHOT</version>
+    <version>1.0.0-M18</version>
   </parent>
 
   <artifactId>api-dsml-engine</artifactId>
diff --git a/dsml/parser/pom.xml b/dsml/parser/pom.xml
index 3df9e1f..2c31cb5 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>1.0.0-M18-SNAPSHOT</version>
+    <version>1.0.0-M18</version>
   </parent>
 
   <artifactId>api-dsml-parser</artifactId>
diff --git a/dsml/pom.xml b/dsml/pom.xml
index 9e91228..ad5371f 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>1.0.0-M18-SNAPSHOT</version>
+    <version>1.0.0-M18</version>
   </parent>
   
   <artifactId>api-dsml-parent</artifactId>
diff --git a/i18n/pom.xml b/i18n/pom.xml
index 9821b50..3ea8a55 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>1.0.0-M18-SNAPSHOT</version>
+    <version>1.0.0-M18</version>
   </parent>
   
   <artifactId>api-i18n</artifactId>
diff --git a/integ/pom.xml b/integ/pom.xml
index 3e2cc54..2070bb9 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>1.0.0-M18-SNAPSHOT</version>
+    <version>1.0.0-M18</version>
   </parent>
   
   <artifactId>api-integ</artifactId>
diff --git a/ldap/client/all/pom.xml b/ldap/client/all/pom.xml
index 4079ef1..882fe59 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>1.0.0-M18-SNAPSHOT</version>
+    <version>1.0.0-M18</version>
   </parent>
   
   <artifactId>api-ldap-client-all</artifactId>
diff --git a/ldap/client/api/pom.xml b/ldap/client/api/pom.xml
index 1ce51e9..e5b6a32 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>1.0.0-M18-SNAPSHOT</version>
+    <version>1.0.0-M18</version>
   </parent>
 
   <artifactId>api-ldap-client-api</artifactId>
@@ -38,9 +38,9 @@
   </issueManagement>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/directory/clients/ldap/trunk/ldap-client-api</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/directory/clients/ldap/trunk/ldap-client-api</developerConnection>
-    <url>http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-api</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/directory/clients/ldap/tags/1.0.0-M18/ldap/trunk/ldap-client-api</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/directory/clients/ldap/tags/1.0.0-M18/ldap/trunk/ldap-client-api</developerConnection>
+    <url>http://svn.apache.org/viewvc/directory/clients/ldap/tags/1.0.0-M18/ldap/trunk/ldap-client-api</url>
   </scm>
 
   <description>
diff --git a/ldap/client/pom.xml b/ldap/client/pom.xml
index aaa33b8..780cafa 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>1.0.0-M18-SNAPSHOT</version>
+    <version>1.0.0-M18</version>
   </parent>
   
   <artifactId>api-ldap-client-parent</artifactId>
diff --git a/ldap/codec/core/pom.xml b/ldap/codec/core/pom.xml
index 298030f..ea6d591 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>1.0.0-M18-SNAPSHOT</version>
+    <version>1.0.0-M18</version>
   </parent>
   
   <artifactId>api-ldap-codec-core</artifactId>
diff --git a/ldap/codec/pom.xml b/ldap/codec/pom.xml
index 21e4e24..4d2e409 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>1.0.0-M18-SNAPSHOT</version>
+    <version>1.0.0-M18</version>
   </parent>
   
   <artifactId>api-ldap-codec-parent</artifactId>
diff --git a/ldap/codec/standalone/pom.xml b/ldap/codec/standalone/pom.xml
index 23c9949..29c534e 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>1.0.0-M18-SNAPSHOT</version>
+    <version>1.0.0-M18</version>
   </parent>
   
   <artifactId>api-ldap-codec-standalone</artifactId>
diff --git a/ldap/extras/aci/pom.xml b/ldap/extras/aci/pom.xml
index eefb13a..b38b3df 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>1.0.0-M18-SNAPSHOT</version>
+    <version>1.0.0-M18</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 3a055bd..d1983be 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>1.0.0-M18-SNAPSHOT</version>
+    <version>1.0.0-M18</version>
   </parent>
   
   <artifactId>api-ldap-extras-codec-api</artifactId>
diff --git a/ldap/extras/codec/pom.xml b/ldap/extras/codec/pom.xml
index c722c16..d7a89a8 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>1.0.0-M18-SNAPSHOT</version>
+    <version>1.0.0-M18</version>
   </parent>
   
   <artifactId>api-ldap-extras-codec</artifactId>
diff --git a/ldap/extras/pom.xml b/ldap/extras/pom.xml
index 5e6d8e6..34cf3ed 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>1.0.0-M18-SNAPSHOT</version>
+    <version>1.0.0-M18</version>
   </parent>
   
   <artifactId>api-ldap-extras-parent</artifactId>
diff --git a/ldap/extras/sp/pom.xml b/ldap/extras/sp/pom.xml
index 6866e91..066fa51 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>1.0.0-M18-SNAPSHOT</version>
+    <version>1.0.0-M18</version>
   </parent>
   
   <artifactId>api-ldap-extras-sp</artifactId>
diff --git a/ldap/extras/trigger/pom.xml b/ldap/extras/trigger/pom.xml
index eb4f8539..e3bb452 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>1.0.0-M18-SNAPSHOT</version>
+    <version>1.0.0-M18</version>
   </parent>
   
   <artifactId>api-ldap-extras-trigger</artifactId>
diff --git a/ldap/extras/util/pom.xml b/ldap/extras/util/pom.xml
index 00d6a65..ae2a738 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>1.0.0-M18-SNAPSHOT</version>
+    <version>1.0.0-M18</version>
   </parent>
   
   <artifactId>api-ldap-extras-util</artifactId>
diff --git a/ldap/model/pom.xml b/ldap/model/pom.xml
index da1000b..446f854 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>1.0.0-M18-SNAPSHOT</version>
+    <version>1.0.0-M18</version>
   </parent>
   
   <artifactId>api-ldap-model</artifactId>
diff --git a/ldap/net/mina/pom.xml b/ldap/net/mina/pom.xml
index ac865a1..0f4117d 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>1.0.0-M18-SNAPSHOT</version>
+    <version>1.0.0-M18</version>
   </parent>
   
   <artifactId>api-ldap-net-mina</artifactId>
diff --git a/ldap/net/pom.xml b/ldap/net/pom.xml
index 6d233b7..29b82c7 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>1.0.0-M18-SNAPSHOT</version>
+    <version>1.0.0-M18</version>
   </parent>
   
   <artifactId>api-ldap-net-parent</artifactId>
diff --git a/ldap/pom.xml b/ldap/pom.xml
index adf3623..8e73669 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>1.0.0-M18-SNAPSHOT</version>
+    <version>1.0.0-M18</version>
   </parent>
   
   <artifactId>api-ldap-parent</artifactId>
diff --git a/ldap/schema/converter/pom.xml b/ldap/schema/converter/pom.xml
index 1198d1f..7da686f 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>1.0.0-M18-SNAPSHOT</version>
+    <version>1.0.0-M18</version>
   </parent>
   
   <artifactId>api-ldap-schema-converter</artifactId>
diff --git a/ldap/schema/data/pom.xml b/ldap/schema/data/pom.xml
index e9d4466..72d368d 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>1.0.0-M18-SNAPSHOT</version>
+    <version>1.0.0-M18</version>
   </parent>
   
   <artifactId>api-ldap-schema-data</artifactId>
diff --git a/ldap/schema/pom.xml b/ldap/schema/pom.xml
index 5de3043..2bc60e7 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>1.0.0-M18-SNAPSHOT</version>
+    <version>1.0.0-M18</version>
   </parent>
   
   <artifactId>api-ldap-schema-parent</artifactId>
diff --git a/pom.xml b/pom.xml
index 7b64036..868cb07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
   <artifactId>api-parent</artifactId>
   <name>Apache Directory LDAP API</name>
   <packaging>pom</packaging>
-  <version>1.0.0-M18-SNAPSHOT</version>
+  <version>1.0.0-M18</version>
 
   <properties>
     <projectName>ApacheDS-LDAP-API</projectName>
@@ -722,9 +722,9 @@
   </dependencies>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/directory/shared/trunk</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/directory/shared/trunk</developerConnection>
-    <url>http://svn.apache.org/viewvc/directory/shared/trunk</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/directory/shared/tags/1.0.0-M18</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/directory/shared/tags/1.0.0-M18</developerConnection>
+    <url>http://svn.apache.org/viewvc/directory/shared/tags/1.0.0-M18</url>
   </scm>
 
   <profiles>
diff --git a/util/pom.xml b/util/pom.xml
index 962e059..ab3607c 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>1.0.0-M18-SNAPSHOT</version>
+    <version>1.0.0-M18</version>
   </parent>
   
   <artifactId>api-util</artifactId>