diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml
index 548e875a7..00ebe7b96 100644
--- a/archiva-cli/pom.xml
+++ b/archiva-cli/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-cli</artifactId>
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-dependency-tree-consumer</artifactId>
-      <version>1.3.6-SNAPSHOT</version>
+      <version>1.3.6</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
diff --git a/archiva-docs/pom.xml b/archiva-docs/pom.xml
index e22cd3535..584089278 100644
--- a/archiva-docs/pom.xml
+++ b/archiva-docs/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-docs</artifactId>
diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml
index 353c73687..8a0df359d 100644
--- a/archiva-jetty/pom.xml
+++ b/archiva-jetty/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
   <artifactId>archiva-jetty</artifactId>
   <packaging>pom</packaging>
diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
index 271b16891..af6933510 100644
--- a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
+++ b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
   <artifactId>archiva-artifact-converter</artifactId>
   <name>Archiva Artifact Converter</name>
diff --git a/archiva-modules/archiva-base/archiva-checksum/pom.xml b/archiva-modules/archiva-base/archiva-checksum/pom.xml
index 41ca43fcb..c67c9fca8 100644
--- a/archiva-modules/archiva-base/archiva-checksum/pom.xml
+++ b/archiva-modules/archiva-base/archiva-checksum/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
   <artifactId>archiva-checksum</artifactId>
   <name>Archiva Checksum</name>
diff --git a/archiva-modules/archiva-base/archiva-common/pom.xml b/archiva-modules/archiva-base/archiva-common/pom.xml
index 14107382d..c21a36c71 100644
--- a/archiva-modules/archiva-base/archiva-common/pom.xml
+++ b/archiva-modules/archiva-base/archiva-common/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-common</artifactId>
diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml
index a701e4e1c..237b6a577 100644
--- a/archiva-modules/archiva-base/archiva-configuration/pom.xml
+++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-configuration</artifactId>
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml
index 58c39fb10..794c0db20 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-consumers</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
 
   <artifactId>archiva-consumer-api</artifactId>
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
index 52dff293f..79c89c487 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-consumers</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
 
   <artifactId>archiva-core-consumers</artifactId>
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml
index 6df53aaaa..c801e932b 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-consumers</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
 
   <artifactId>archiva-database-consumers</artifactId>
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml
index 6902b328a..216b6f213 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-consumers</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
   <artifactId>archiva-dependency-tree-consumer</artifactId>
   <name>Archiva Consumers :: Dependency Tree Consumer</name>
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
index c74e273d2..21e106435 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-consumers</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
 
   <artifactId>archiva-lucene-consumers</artifactId>
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml
index 5fabb0ac4..037382d4f 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-consumers</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
 
   <artifactId>archiva-signature-consumers</artifactId>
diff --git a/archiva-modules/archiva-base/archiva-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/pom.xml
index 67f52d80d..7805403e6 100644
--- a/archiva-modules/archiva-base/archiva-consumers/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
 
   <artifactId>archiva-consumers</artifactId>
diff --git a/archiva-modules/archiva-base/archiva-converter/pom.xml b/archiva-modules/archiva-base/archiva-converter/pom.xml
index 2f012b1a7..f399a3fc2 100644
--- a/archiva-modules/archiva-base/archiva-converter/pom.xml
+++ b/archiva-modules/archiva-base/archiva-converter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-converter</artifactId>
diff --git a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml
index 3e503b85d..0d1a3029c 100644
--- a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml
+++ b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-dependency-graph</artifactId>
diff --git a/archiva-modules/archiva-base/archiva-indexer/pom.xml b/archiva-modules/archiva-base/archiva-indexer/pom.xml
index 9dec369a8..dd69e974b 100644
--- a/archiva-modules/archiva-base/archiva-indexer/pom.xml
+++ b/archiva-modules/archiva-base/archiva-indexer/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-indexer</artifactId>
diff --git a/archiva-modules/archiva-base/archiva-model/pom.xml b/archiva-modules/archiva-base/archiva-model/pom.xml
index ab4957374..7239528b9 100755
--- a/archiva-modules/archiva-base/archiva-model/pom.xml
+++ b/archiva-modules/archiva-base/archiva-model/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-model</artifactId>
diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml
index 8847268a3..0a406dfef 100644
--- a/archiva-modules/archiva-base/archiva-policies/pom.xml
+++ b/archiva-modules/archiva-base/archiva-policies/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-policies</artifactId>
diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml
index a7fb90bd3..04d39423a 100644
--- a/archiva-modules/archiva-base/archiva-proxy/pom.xml
+++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-proxy</artifactId>
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
index 4b2598700..c10a91ba6 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-repository-layer</artifactId>
diff --git a/archiva-modules/archiva-base/archiva-transaction/pom.xml b/archiva-modules/archiva-base/archiva-transaction/pom.xml
index d69040b9e..7edd56ae6 100644
--- a/archiva-modules/archiva-base/archiva-transaction/pom.xml
+++ b/archiva-modules/archiva-base/archiva-transaction/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
   <artifactId>archiva-transaction</artifactId>
   <name>Archiva Transactions</name>
diff --git a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml
index 9c5eef2ab..722c0143d 100644
--- a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml
+++ b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-xml-tools</artifactId>
diff --git a/archiva-modules/archiva-base/pom.xml b/archiva-modules/archiva-base/pom.xml
index e2c000e9e..38e931cc4 100644
--- a/archiva-modules/archiva-base/pom.xml
+++ b/archiva-modules/archiva-base/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-modules</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
 
   <artifactId>archiva-base</artifactId>
diff --git a/archiva-modules/archiva-database/pom.xml b/archiva-modules/archiva-database/pom.xml
index 7803a5cde..9c7d130a8 100755
--- a/archiva-modules/archiva-database/pom.xml
+++ b/archiva-modules/archiva-database/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-modules</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-database</artifactId>
diff --git a/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml b/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml
index afb6eb8a0..d357d73d7 100755
--- a/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml
+++ b/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-reporting</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-artifact-reports</artifactId>
diff --git a/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml b/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml
index 77fc6dc2b..dfbcb80ba 100755
--- a/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml
+++ b/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-reporting</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-report-manager</artifactId>
diff --git a/archiva-modules/archiva-reporting/pom.xml b/archiva-modules/archiva-reporting/pom.xml
index d56898233..44f1a1812 100644
--- a/archiva-modules/archiva-reporting/pom.xml
+++ b/archiva-modules/archiva-reporting/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-modules</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
 
   <artifactId>archiva-reporting</artifactId>
diff --git a/archiva-modules/archiva-scheduled/pom.xml b/archiva-modules/archiva-scheduled/pom.xml
index d8b8eb2e6..3a1ea988e 100644
--- a/archiva-modules/archiva-scheduled/pom.xml
+++ b/archiva-modules/archiva-scheduled/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-modules</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-scheduled</artifactId>
diff --git a/archiva-modules/archiva-web/archiva-applet/pom.xml b/archiva-modules/archiva-web/archiva-applet/pom.xml
index 72790a038..1d3f89591 100644
--- a/archiva-modules/archiva-web/archiva-applet/pom.xml
+++ b/archiva-modules/archiva-web/archiva-applet/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-web</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
   <artifactId>archiva-applet</artifactId>
   <name>Archiva Web :: Applet</name>
diff --git a/archiva-modules/archiva-web/archiva-rss/pom.xml b/archiva-modules/archiva-web/archiva-rss/pom.xml
index 2d9939a6a..7383e5db0 100644
--- a/archiva-modules/archiva-web/archiva-rss/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rss/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>archiva-web</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-rss</artifactId>
diff --git a/archiva-modules/archiva-web/archiva-security/pom.xml b/archiva-modules/archiva-web/archiva-security/pom.xml
index 2a2d0a2e1..e0ae8b86a 100644
--- a/archiva-modules/archiva-web/archiva-security/pom.xml
+++ b/archiva-modules/archiva-web/archiva-security/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-web</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-security</artifactId>
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 84a81b069..1e322b6e7 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-web</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
   <artifactId>archiva-webapp</artifactId>
   <packaging>war</packaging>
diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml
index 476428306..bdf6b3d74 100644
--- a/archiva-modules/archiva-web/archiva-webdav/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-web</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
 
   <artifactId>archiva-webdav</artifactId>
diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml
index ef58ed697..c27b0c831 100644
--- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml
+++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-xmlrpc</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
   <artifactId>archiva-xmlrpc-api</artifactId>
   <name>Archiva Web :: XML-RPC API</name>
diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml
index 6a7ccfd8d..ca10a8bb1 100644
--- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml
+++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>archiva-xmlrpc</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-xmlrpc-client</artifactId>
diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml
index 1d7bca0ea..85cd43ba0 100644
--- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml
+++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-xmlrpc</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
   <artifactId>archiva-xmlrpc-security</artifactId>
   <name>Archiva Web :: XML-RPC Security</name>
diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml
index f6313cd2a..08ab42e8f 100644
--- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml
+++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-xmlrpc</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
   <artifactId>archiva-xmlrpc-services</artifactId>
   <name>Archiva Web :: XML-RPC Services</name>
diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml
index 6fb330223..1d9d9b14f 100644
--- a/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml
+++ b/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-web</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
   <artifactId>archiva-xmlrpc</artifactId>
   <name>Archiva Web :: XML-RPC</name>
diff --git a/archiva-modules/archiva-web/pom.xml b/archiva-modules/archiva-web/pom.xml
index 125c2f353..809b66526 100644
--- a/archiva-modules/archiva-web/pom.xml
+++ b/archiva-modules/archiva-web/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-modules</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
 
   <artifactId>archiva-web</artifactId>
diff --git a/archiva-modules/pom.xml b/archiva-modules/pom.xml
index db0ce8b2b..26e7a7f9f 100644
--- a/archiva-modules/pom.xml
+++ b/archiva-modules/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>archiva</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.3.6</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-modules</artifactId>
diff --git a/pom.xml b/pom.xml
index 5aa5c221b..3010b1ba3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,12 +34,12 @@
   <name>Archiva</name>
   <artifactId>archiva</artifactId>
   <packaging>pom</packaging>
-  <version>1.3.6-SNAPSHOT</version>
+  <version>1.3.6</version>
   <url>http://archiva.apache.org</url>
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/archiva/branches/archiva-1.3.x</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/archiva/branches/archiva-1.3.x</developerConnection>
-    <url>http://svn.apache.org/repos/asf/archiva/branches/archiva-1.3.x</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/archiva/tags/archiva-1.3.6</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/archiva/tags/archiva-1.3.6</developerConnection>
+    <url>http://svn.apache.org/repos/asf/archiva/tags/archiva-1.3.6</url>
   </scm>
 
   <build>
@@ -294,160 +294,160 @@
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-applet</artifactId>
-        <version>1.3.6-SNAPSHOT</version>
+        <version>1.3.6</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-artifact-converter</artifactId>
-        <version>1.3.6-SNAPSHOT</version>
+        <version>1.3.6</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-artifact-reports</artifactId>
-        <version>1.3.6-SNAPSHOT</version>
+        <version>1.3.6</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-checksum</artifactId>
-        <version>1.3.6-SNAPSHOT</version>
+        <version>1.3.6</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-common</artifactId>
-        <version>1.3.6-SNAPSHOT</version>
+        <version>1.3.6</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-configuration</artifactId>
-        <version>1.3.6-SNAPSHOT</version>
+        <version>1.3.6</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-consumer-api</artifactId>
-        <version>1.3.6-SNAPSHOT</version>
+        <version>1.3.6</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-converter</artifactId>
-        <version>1.3.6-SNAPSHOT</version>
+        <version>1.3.6</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-dependency-graph</artifactId>
-        <version>1.3.6-SNAPSHOT</version>
+        <version>1.3.6</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-core-consumers</artifactId>
-        <version>1.3.6-SNAPSHOT</version>
+        <version>1.3.6</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-database</artifactId>
-        <version>1.3.6-SNAPSHOT</version>
+        <version>1.3.6</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-database-consumers</artifactId>
-        <version>1.3.6-SNAPSHOT</version>
+        <version>1.3.6</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-indexer</artifactId>
-        <version>1.3.6-SNAPSHOT</version>
+        <version>1.3.6</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-lucene-consumers</artifactId>
-        <version>1.3.6-SNAPSHOT</version>
+        <version>1.3.6</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-model</artifactId>
-        <version>1.3.6-SNAPSHOT</version>
+        <version>1.3.6</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-policies</artifactId>
-        <version>1.3.6-SNAPSHOT</version>
+        <version>1.3.6</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-proxy</artifactId>
-        <version>1.3.6-SNAPSHOT</version>
+        <version>1.3.6</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-report-manager</artifactId>
-        <version>1.3.6-SNAPSHOT</version>
+        <version>1.3.6</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-repository-layer</artifactId>
-        <version>1.3.6-SNAPSHOT</version>
+        <version>1.3.6</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-scheduled</artifactId>
-        <version>1.3.6-SNAPSHOT</version>
+        <version>1.3.6</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-security</artifactId>
-        <version>1.3.6-SNAPSHOT</version>
+        <version>1.3.6</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-signature-consumers</artifactId>
-        <version>1.3.6-SNAPSHOT</version>
+        <version>1.3.6</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-transaction</artifactId>
-        <version>1.3.6-SNAPSHOT</version>
+        <version>1.3.6</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-docs</artifactId>
-        <version>1.3.6-SNAPSHOT</version>
+        <version>1.3.6</version>
         <type>zip</type>
         <classifier>docs</classifier>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-webapp</artifactId>
-        <version>1.3.6-SNAPSHOT</version>
+        <version>1.3.6</version>
         <type>war</type>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-xml-tools</artifactId>
-        <version>1.3.6-SNAPSHOT</version>
+        <version>1.3.6</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-webdav</artifactId>
-        <version>1.3.6-SNAPSHOT</version>
+        <version>1.3.6</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-rss</artifactId>
-        <version>1.3.6-SNAPSHOT</version>
+        <version>1.3.6</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>      
         <artifactId>archiva-xmlrpc-api</artifactId>
-        <version>1.3.6-SNAPSHOT</version>
+        <version>1.3.6</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-xmlrpc-services</artifactId>
-        <version>1.3.6-SNAPSHOT</version>
+        <version>1.3.6</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-xmlrpc-security</artifactId>
-        <version>1.3.6-SNAPSHOT</version>
+        <version>1.3.6</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>