diff --git a/archetype/pom.xml b/archetype/pom.xml
index a13ecdb9..f9fceed4 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-M3</version>
+        <version>2.0.0-M4-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/core/pom.xml b/core/pom.xml
index 3e90c77b..01234854 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-M3</version>
+        <version>2.0.0-M4-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/parent/pom.xml b/parent/pom.xml
index db2a00d4..85753bbc 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-M3</version>
+    <version>2.0.0-M4-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-M3</connection>
-        <developerConnection>scm:svn:https://src.springframework.org/svn/spring-ws/tags/spring-ws-2.0.0-M3</developerConnection>
-        <url>https://fisheye.springframework.org/browse/spring-ws/tags/spring-ws-2.0.0-M3</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>
         <osgi.version>2.0.0.M3</osgi.version>
diff --git a/pom.xml b/pom.xml
index dc060f61..a5128a66 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-M3</version>
+    <version>2.0.0-M4-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
@@ -94,9 +94,9 @@
         </site>
     </distributionManagement>
     <scm>
-        <connection>scm:svn:https://src.springframework.org/svn/spring-ws/tags/spring-ws-2.0.0-M3</connection>
-        <developerConnection>scm:svn:https://src.springframework.org/svn/spring-ws/tags/spring-ws-2.0.0-M3</developerConnection>
-        <url>https://fisheye.springframework.org/browse/spring-ws/tags/spring-ws-2.0.0-M3</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.3.RELEASE</spring.framework.version>
diff --git a/samples/airline/client/axis1/pom.xml b/samples/airline/client/axis1/pom.xml
index b18c3163..0d116d24 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-M3</version>
+        <version>2.0.0-M4-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 edbbb14d..82dc060d 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-M3</version>
+        <version>2.0.0-M4-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 19b68ae1..ec467251 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-M3</version>
+        <version>2.0.0-M4-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 1280a7c9..4da694b5 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-M3</version>
+        <version>2.0.0-M4-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 68cca100..169fc3ef 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-M3</version>
+        <version>2.0.0-M4-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 7e1ec646..b9448cc1 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-M3</version>
+        <version>2.0.0-M4-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 f9c00ba2..4af3f66a 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-M3</version>
+        <version>2.0.0-M4-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 675e6958..ac8e0e63 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-M3</version>
+        <version>2.0.0-M4-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 5d0ed716..6847d13a 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-M3</version>
+        <version>2.0.0-M4-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 13f479e4..7f8cd2c3 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-M3</version>
+        <version>2.0.0-M4-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 07bff11f..23cc2442 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-M3</version>
+        <version>2.0.0-M4-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 528099ff..3d4417b9 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-M3</version>
+        <version>2.0.0-M4-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 c176341c..d8660586 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-M3</version>
+        <version>2.0.0-M4-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 b139b494..35cc0d82 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-M3</version>
+        <version>2.0.0-M4-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 87f7efcd..96447378 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-M3</version>
+        <version>2.0.0-M4-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 2e4751d3..763de7c0 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-M3</version>
+        <version>2.0.0-M4-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 70604baf..39cf11f1 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-M3</version>
+        <version>2.0.0-M4-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 d3bbde40..67fd4620 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-M3</version>
+      <version>2.0.0-M4-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
diff --git a/samples/pom.xml b/samples/pom.xml
index b18a44fc..394e9215 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-M3</version>
+        <version>2.0.0-M4-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 5cc60621..3d7b0eb9 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-M3</version>
+        <version>2.0.0-M4-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 9346cc83..1038104a 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-M3</version>
+        <version>2.0.0-M4-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 15da30ce..656c56bc 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-M3</version>
+        <version>2.0.0-M4-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 f6274edd..31fe8d95 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-M3</version>
+        <version>2.0.0-M4-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 c7108186..76fdeb9d 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-M3</version>
+        <version>2.0.0-M4-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 8d5008d4..e61026ba 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-M3</version>
+        <version>2.0.0-M4-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 eaa5a370..7582083d 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-M3</version>
+        <version>2.0.0-M4-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 ca809472..084e262d 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-M3</version>
+        <version>2.0.0-M4-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 3df041cb..8244c0bb 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-M3</version>
+        <version>2.0.0-M4-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 0b8beacc..f2608b77 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-M3</version>
+        <version>2.0.0-M4-SNAPSHOT</version>
         <relativePath>../samples/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/security/pom.xml b/security/pom.xml
index c3f5b6f9..9205bf8f 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-M3</version>
+        <version>2.0.0-M4-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/support/pom.xml b/support/pom.xml
index 182798bb..b39ef169 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-M3</version>
+        <version>2.0.0-M4-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/test/pom.xml b/test/pom.xml
index 20854c1c..a0708bbc 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.0-M3</version>
+        <version>2.0.0-M4-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/xml/pom.xml b/xml/pom.xml
index 5c154b71..b304313c 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-M3</version>
+        <version>2.0.0-M4-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>