diff --git a/archetype/pom.xml b/archetype/pom.xml
index 492fbfad..4640c6fb 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.0-M1</version>
+        <version>2.0.0-M2-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/core/pom.xml b/core/pom.xml
index b3b87d41..a7c2d2b4 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.0-M1</version>
+        <version>2.0.0-M2-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/parent/pom.xml b/parent/pom.xml
index 28ec2ce7..61674e13 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.0-M1</version>
+    <version>2.0.0-M2-SNAPSHOT</version>
     <name>Spring Web Services - Parent</name>
     <distributionManagement>
         <downloadUrl>http://static.springframework.org/spring-ws/site/downloads/releases.html</downloadUrl>
@@ -23,9 +23,9 @@
         </site>
     </distributionManagement>
     <scm>
-        <connection>scm:svn:https://src.springframework.org/svn/spring-ws/tags/spring-ws-2.0.0-M1</connection>
-        <developerConnection>scm:svn:https://src.springframework.org/svn/spring-ws/tags/spring-ws-2.0.0-M1</developerConnection>
-        <url>https://fisheye.springframework.org/browse/spring-ws/tags/spring-ws-2.0.0-M1</url>
+        <connection>scm:svn:https://src.springframework.org/svn/spring-ws/trunk</connection>
+        <developerConnection>scm:svn:https://src.springframework.org/svn/spring-ws/trunk</developerConnection>
+        <url>https://fisheye.springframework.org/browse/spring-ws/trunk</url>
     </scm>
     <properties>
         <spring.framework.version>3.0.1.RELEASE</spring.framework.version>
diff --git a/pom.xml b/pom.xml
index 682fa8e4..6bfc922f 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.0-M1</version>
+    <version>2.0.0-M2-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
@@ -83,9 +83,9 @@
         </site>
     </distributionManagement>
     <scm>
-        <connection>scm:svn:https://src.springframework.org/svn/spring-ws/tags/spring-ws-2.0.0-M1</connection>
-        <developerConnection>scm:svn:https://src.springframework.org/svn/spring-ws/tags/spring-ws-2.0.0-M1</developerConnection>
-        <url>https://fisheye.springframework.org/browse/spring-ws/tags/spring-ws-2.0.0-M1</url>
+        <connection>scm:svn:https://src.springframework.org/svn/spring-ws/tags/spring-ws-1.5.6</connection>
+        <developerConnection>scm:svn:https://src.springframework.org/svn/spring-ws/tags/spring-ws-1.5.6</developerConnection>
+        <url>https://fisheye.springframework.org/browse/spring-ws/tags/spring-ws-1.5.6</url>
     </scm>
     <properties>
         <spring.framework.version>3.0.1.RELEASE</spring.framework.version>
diff --git a/samples/airline/client/axis1/pom.xml b/samples/airline/client/axis1/pom.xml
index f24bc450..d99426fa 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.0-M1</version>
+        <version>2.0.0-M2-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 4ca085c7..dfafb900 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.0-M1</version>
+        <version>2.0.0-M2-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 b94db078..68eafbc7 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.0-M1</version>
+        <version>2.0.0-M2-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 72f8472f..5ece93db 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.0-M1</version>
+        <version>2.0.0-M2-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 f717ac4c..fec09a56 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.0-M1</version>
+        <version>2.0.0-M2-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 16613204..eb562c5e 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.0-M1</version>
+        <version>2.0.0-M2-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 90164a34..d729702b 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.0-M1</version>
+        <version>2.0.0-M2-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 5f41f228..5c6721b1 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.0-M1</version>
+        <version>2.0.0-M2-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 b61156e9..7c919041 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.0-M1</version>
+        <version>2.0.0-M2-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 d34e9653..0aa7eaeb 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.0-M1</version>
+        <version>2.0.0-M2-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 23c6d239..a0324922 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.0-M1</version>
+        <version>2.0.0-M2-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 fc8eef21..458c9d7e 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.0-M1</version>
+        <version>2.0.0-M2-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 22df7102..9d136c3a 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.0-M1</version>
+        <version>2.0.0-M2-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 6b8f0395..d2e523c6 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.0-M1</version>
+        <version>2.0.0-M2-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 d8c3d43b..6db9b2e2 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.0-M1</version>
+        <version>2.0.0-M2-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 030c1d52..ec9320ac 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.0-M1</version>
+        <version>2.0.0-M2-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 78c40661..d63e3ecb 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.0-M1</version>
+        <version>2.0.0-M2-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 7ffc453d..9cd080ab 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.0-M1</version>
+      <version>2.0.0-M2-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
diff --git a/samples/pom.xml b/samples/pom.xml
index 403ddc9e..93956086 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.0-M1</version>
+        <version>2.0.0-M2-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 a340d259..8a10f63b 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.0-M1</version>
+        <version>2.0.0-M2-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 bf1f2f85..2a7c25f7 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.0-M1</version>
+        <version>2.0.0-M2-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 af8758ab..5f6cc493 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.0-M1</version>
+        <version>2.0.0-M2-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 7792edfc..3c76007f 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.0-M1</version>
+        <version>2.0.0-M2-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 61e35c68..db057bad 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.0-M1</version>
+        <version>2.0.0-M2-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 e42abf9c..f8c31704 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.0-M1</version>
+        <version>2.0.0-M2-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 8f149841..18b5c07f 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.0-M1</version>
+        <version>2.0.0-M2-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 09c5d619..e5feb186 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.0-M1</version>
+        <version>2.0.0-M2-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 b727c26b..8bcce8b4 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.0-M1</version>
+        <version>2.0.0-M2-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 48d70855..c18462b4 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.0-M1</version>
+        <version>2.0.0-M2-SNAPSHOT</version>
         <relativePath>../samples/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/security/pom.xml b/security/pom.xml
index 1d87db9a..587d8bdb 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.0-M1</version>
+        <version>2.0.0-M2-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/support/pom.xml b/support/pom.xml
index a38097cc..a6be77d4 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.0-M1</version>
+        <version>2.0.0-M2-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/xml/pom.xml b/xml/pom.xml
index 34eb9574..15238f3b 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.0-M1</version>
+        <version>2.0.0-M2-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>