diff --git a/archetype/pom.xml b/archetype/pom.xml
index 6130f876..28183951 100644
--- a/archetype/pom.xml
+++ b/archetype/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>spring-ws-parent</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>2.0.1-RELEASE-SNAPSHOT</version>
+        <version>2.0.0.RELEASE-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/archetype/src/main/resources/archetype-resources/pom.xml b/archetype/src/main/resources/archetype-resources/pom.xml
index 00f63318..2e86ca28 100644
--- a/archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetype/src/main/resources/archetype-resources/pom.xml
@@ -12,15 +12,10 @@
         <finalName>${artifactId}</finalName>
     </build>
     <dependencies>
-        <dependency>
-            <groupId>org.springframework.ws</groupId>
-            <artifactId>spring-oxm</artifactId>
-            <version>2.0.0-M1</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.ws</groupId>
             <artifactId>spring-ws-core</artifactId>
-            <version>2.0.0-M1</version>
+            <version>2.0.0.RELEASE</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/core/pom.xml b/core/pom.xml
index adf037f5..86f2d8c8 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <artifactId>spring-ws-parent</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>2.0.1-RELEASE-SNAPSHOT</version>
+        <version>2.0.0.RELEASE-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/parent/pom.xml b/parent/pom.xml
index 5242c3c8..526fe550 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -4,7 +4,7 @@
     <groupId>org.springframework.ws</groupId>
     <artifactId>spring-ws-parent</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.1-RELEASE-SNAPSHOT</version>
+    <version>2.0.0.RELEASE-SNAPSHOT</version>
     <name>Spring Web Services - Parent</name>
     <distributionManagement>
         <downloadUrl>http://static.springframework.org/spring-ws/site/downloads/releases.html</downloadUrl>
diff --git a/pom.xml b/pom.xml
index 36bea292..990bc391 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>org.springframework.ws</groupId>
     <artifactId>spring-ws</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.1-RELEASE-SNAPSHOT</version>
+    <version>2.0.0.RELEASE-SNAPSHOT</version>
     <name>Spring Web Services</name>
     <description>
         Spring Web Services is a product of the Spring community focused on creating document-driven Web services. It
diff --git a/samples/airline/client/axis1/pom.xml b/samples/airline/client/axis1/pom.xml
index f052fde5..74fd32d6 100644
--- a/samples/airline/client/axis1/pom.xml
+++ b/samples/airline/client/axis1/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>airline-client</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>2.0.1-RELEASE-SNAPSHOT</version>
+        <version>2.0.0.RELEASE-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/samples/airline/client/jax-ws/pom.xml b/samples/airline/client/jax-ws/pom.xml
index e58c76cb..e461bf6e 100644
--- a/samples/airline/client/jax-ws/pom.xml
+++ b/samples/airline/client/jax-ws/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>airline-client</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>2.0.1-RELEASE-SNAPSHOT</version>
+        <version>2.0.0.RELEASE-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/samples/airline/client/jms/pom.xml b/samples/airline/client/jms/pom.xml
index e4f43d00..d1e5bb22 100644
--- a/samples/airline/client/jms/pom.xml
+++ b/samples/airline/client/jms/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>airline-client</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>2.0.1-RELEASE-SNAPSHOT</version>
+        <version>2.0.0.RELEASE-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/samples/airline/client/pom.xml b/samples/airline/client/pom.xml
index ab247753..1470660a 100644
--- a/samples/airline/client/pom.xml
+++ b/samples/airline/client/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>airline</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>2.0.1-RELEASE-SNAPSHOT</version>
+        <version>2.0.0.RELEASE-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/samples/airline/client/saaj/pom.xml b/samples/airline/client/saaj/pom.xml
index 195a2221..6ccdcba9 100644
--- a/samples/airline/client/saaj/pom.xml
+++ b/samples/airline/client/saaj/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>airline-client</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>2.0.1-RELEASE-SNAPSHOT</version>
+        <version>2.0.0.RELEASE-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/samples/airline/client/spring-ws/pom.xml b/samples/airline/client/spring-ws/pom.xml
index c0d9324f..5727fe57 100644
--- a/samples/airline/client/spring-ws/pom.xml
+++ b/samples/airline/client/spring-ws/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>airline-client</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>2.0.1-RELEASE-SNAPSHOT</version>
+        <version>2.0.0.RELEASE-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/samples/airline/pom.xml b/samples/airline/pom.xml
index a1b35a51..c1b180e9 100644
--- a/samples/airline/pom.xml
+++ b/samples/airline/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>spring-ws-samples</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>2.0.1-RELEASE-SNAPSHOT</version>
+        <version>2.0.0.RELEASE-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/samples/airline/server/pom.xml b/samples/airline/server/pom.xml
index e015f5a3..da48f3d2 100644
--- a/samples/airline/server/pom.xml
+++ b/samples/airline/server/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <artifactId>airline</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>2.0.1-RELEASE-SNAPSHOT</version>
+        <version>2.0.0.RELEASE-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/samples/echo/client/pom.xml b/samples/echo/client/pom.xml
index e8ac77cb..16cb472c 100644
--- a/samples/echo/client/pom.xml
+++ b/samples/echo/client/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>echo</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>2.0.1-RELEASE-SNAPSHOT</version>
+        <version>2.0.0.RELEASE-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/samples/echo/client/saaj/pom.xml b/samples/echo/client/saaj/pom.xml
index 0402d110..0de6df4f 100644
--- a/samples/echo/client/saaj/pom.xml
+++ b/samples/echo/client/saaj/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>echo-client</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>2.0.1-RELEASE-SNAPSHOT</version>
+        <version>2.0.0.RELEASE-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/samples/echo/client/spring-ws/pom.xml b/samples/echo/client/spring-ws/pom.xml
index cf42cfc9..afcdc000 100644
--- a/samples/echo/client/spring-ws/pom.xml
+++ b/samples/echo/client/spring-ws/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>echo-client</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>2.0.1-RELEASE-SNAPSHOT</version>
+        <version>2.0.0.RELEASE-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/samples/echo/pom.xml b/samples/echo/pom.xml
index 9303954c..726430cf 100644
--- a/samples/echo/pom.xml
+++ b/samples/echo/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>spring-ws-samples</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>2.0.1-RELEASE-SNAPSHOT</version>
+        <version>2.0.0.RELEASE-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/samples/echo/server/pom.xml b/samples/echo/server/pom.xml
index 4df3c4b3..8cebfeca 100644
--- a/samples/echo/server/pom.xml
+++ b/samples/echo/server/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <artifactId>echo</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>2.0.1-RELEASE-SNAPSHOT</version>
+        <version>2.0.0.RELEASE-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/samples/mtom/client/jax-ws/pom.xml b/samples/mtom/client/jax-ws/pom.xml
index 06bd1358..68c0b79c 100644
--- a/samples/mtom/client/jax-ws/pom.xml
+++ b/samples/mtom/client/jax-ws/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>mtom-client</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>2.0.1-RELEASE-SNAPSHOT</version>
+        <version>2.0.0.RELEASE-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/samples/mtom/client/pom.xml b/samples/mtom/client/pom.xml
index a3ad0a26..2c87e972 100644
--- a/samples/mtom/client/pom.xml
+++ b/samples/mtom/client/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>mtom</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>2.0.1-RELEASE-SNAPSHOT</version>
+        <version>2.0.0.RELEASE-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/samples/mtom/client/spring-ws/pom.xml b/samples/mtom/client/spring-ws/pom.xml
index 594a7c8b..2ab35bd6 100644
--- a/samples/mtom/client/spring-ws/pom.xml
+++ b/samples/mtom/client/spring-ws/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>mtom-client</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>2.0.1-RELEASE-SNAPSHOT</version>
+        <version>2.0.0.RELEASE-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/samples/mtom/pom.xml b/samples/mtom/pom.xml
index 76913814..cb63c9d7 100644
--- a/samples/mtom/pom.xml
+++ b/samples/mtom/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>spring-ws-samples</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>2.0.1-RELEASE-SNAPSHOT</version>
+        <version>2.0.0.RELEASE-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/samples/mtom/server/pom.xml b/samples/mtom/server/pom.xml
index 70946938..ee9ec54c 100644
--- a/samples/mtom/server/pom.xml
+++ b/samples/mtom/server/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <artifactId>mtom</artifactId>
       <groupId>org.springframework.ws</groupId>
-      <version>2.0.1-RELEASE-SNAPSHOT</version>
+      <version>2.0.0.RELEASE-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
diff --git a/samples/pom.xml b/samples/pom.xml
index 3b0de400..0ed88d33 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>spring-ws-parent</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>2.0.1-RELEASE-SNAPSHOT</version>
+        <version>2.0.0.RELEASE-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/samples/pox/client/pom.xml b/samples/pox/client/pom.xml
index 7446cd27..334362f9 100644
--- a/samples/pox/client/pom.xml
+++ b/samples/pox/client/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>pox</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>2.0.1-RELEASE-SNAPSHOT</version>
+        <version>2.0.0.RELEASE-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/samples/pox/client/spring-ws/pom.xml b/samples/pox/client/spring-ws/pom.xml
index 02e3cb75..0504daf2 100644
--- a/samples/pox/client/spring-ws/pom.xml
+++ b/samples/pox/client/spring-ws/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>pox-client</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>2.0.1-RELEASE-SNAPSHOT</version>
+        <version>2.0.0.RELEASE-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/samples/pox/pom.xml b/samples/pox/pom.xml
index 55b44802..a45100fa 100644
--- a/samples/pox/pom.xml
+++ b/samples/pox/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>spring-ws-samples</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>2.0.1-RELEASE-SNAPSHOT</version>
+        <version>2.0.0.RELEASE-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/samples/pox/server/pom.xml b/samples/pox/server/pom.xml
index 2954fff8..efdc4f42 100644
--- a/samples/pox/server/pom.xml
+++ b/samples/pox/server/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <artifactId>pox</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>2.0.1-RELEASE-SNAPSHOT</version>
+        <version>2.0.0.RELEASE-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/samples/stockquote/client/jax-ws/pom.xml b/samples/stockquote/client/jax-ws/pom.xml
index 5907f4bd..dd366f34 100644
--- a/samples/stockquote/client/jax-ws/pom.xml
+++ b/samples/stockquote/client/jax-ws/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>stockquote-client</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>2.0.1-RELEASE-SNAPSHOT</version>
+        <version>2.0.0.RELEASE-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/samples/stockquote/client/pom.xml b/samples/stockquote/client/pom.xml
index 2b5a0553..6ecdb2eb 100644
--- a/samples/stockquote/client/pom.xml
+++ b/samples/stockquote/client/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>stockquote</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>2.0.1-RELEASE-SNAPSHOT</version>
+        <version>2.0.0.RELEASE-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/samples/stockquote/client/spring-ws/pom.xml b/samples/stockquote/client/spring-ws/pom.xml
index 2e4e7738..d42601cc 100644
--- a/samples/stockquote/client/spring-ws/pom.xml
+++ b/samples/stockquote/client/spring-ws/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>stockquote-client</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>2.0.1-RELEASE-SNAPSHOT</version>
+        <version>2.0.0.RELEASE-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/samples/stockquote/pom.xml b/samples/stockquote/pom.xml
index 8c265f2b..86897af0 100644
--- a/samples/stockquote/pom.xml
+++ b/samples/stockquote/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>spring-ws-samples</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>2.0.1-RELEASE-SNAPSHOT</version>
+        <version>2.0.0.RELEASE-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/samples/stockquote/server/pom.xml b/samples/stockquote/server/pom.xml
index 5c34bc94..cb1359a4 100644
--- a/samples/stockquote/server/pom.xml
+++ b/samples/stockquote/server/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <artifactId>stockquote</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>2.0.1-RELEASE-SNAPSHOT</version>
+        <version>2.0.0.RELEASE-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/samples/tutorial/pom.xml b/samples/tutorial/pom.xml
index e3a40214..b32d7bc5 100644
--- a/samples/tutorial/pom.xml
+++ b/samples/tutorial/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>spring-ws-samples</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>2.0.1-RELEASE-SNAPSHOT</version>
+        <version>2.0.0.RELEASE-SNAPSHOT</version>
         <relativePath>../samples/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/sandbox/pom.xml b/sandbox/pom.xml
index 77f48a1d..62618a40 100644
--- a/sandbox/pom.xml
+++ b/sandbox/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>spring-ws-parent</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>2.0.0-RELEASE-SNAPSHOT</version>
+        <version>2.0.0.RELEASE-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/security/pom.xml b/security/pom.xml
index 9472cdd9..0753b8c4 100644
--- a/security/pom.xml
+++ b/security/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <artifactId>spring-ws-parent</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>2.0.1-RELEASE-SNAPSHOT</version>
+        <version>2.0.0.RELEASE-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/support/pom.xml b/support/pom.xml
index b42e589f..c5db293d 100644
--- a/support/pom.xml
+++ b/support/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <artifactId>spring-ws-parent</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>2.0.1-RELEASE-SNAPSHOT</version>
+        <version>2.0.0.RELEASE-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/test/pom.xml b/test/pom.xml
index 12d030c8..3288432d 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <artifactId>spring-ws-parent</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>2.0.1-RELEASE-SNAPSHOT</version>
+        <version>2.0.0.RELEASE-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/xml/pom.xml b/xml/pom.xml
index 18175925..f8f11620 100644
--- a/xml/pom.xml
+++ b/xml/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <artifactId>spring-ws-parent</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>2.0.1-RELEASE-SNAPSHOT</version>
+        <version>2.0.0.RELEASE-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>