[maven-release-plugin] prepare for next development iteration
diff --git a/api/pom.xml b/api/pom.xml
index 5bd234e..7fd5eed 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -23,13 +23,13 @@
     <packaging>jar</packaging>
     <name>Apache CXF API</name>
     <description>Apache CXF API</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <url>http://cxf.apache.org</url>
 
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     
diff --git a/common/pom.xml b/common/pom.xml
index 182a45e..c1de572 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-common</artifactId>
     <packaging>pom</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Common</name>
     <description>Apache CXF Common</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
 
     <modules>
diff --git a/common/wstx-msv-validation/pom.xml b/common/wstx-msv-validation/pom.xml
index 6ae8324..81cf941 100644
--- a/common/wstx-msv-validation/pom.xml
+++ b/common/wstx-msv-validation/pom.xml
@@ -22,14 +22,14 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-wstx-msv-validation</artifactId>
     <packaging>jar</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Woodstox/MSV Schema Validation</name>
     <description>Apache CXF Woodstox/MSV Schema Validation</description>
     <url>http://cxf.apache.org</url>
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/common/xerces-xsd-validation/pom.xml b/common/xerces-xsd-validation/pom.xml
index dc099e6..3826f23 100644
--- a/common/xerces-xsd-validation/pom.xml
+++ b/common/xerces-xsd-validation/pom.xml
@@ -22,14 +22,14 @@
   <groupId>org.apache.cxf</groupId>
   <artifactId>cxf-xerces-xsd-validation</artifactId>
   <packaging>jar</packaging>
-  <version>2.6.17</version>
+  <version>2.6.18-SNAPSHOT</version>
   <name>Apache CXF XML Schema Validation with Xerces</name>
     <description>Apache CXF XML Schema Validation with Xerces</description>
   <url>http://cxf.apache.org</url>
   <parent>
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-parent</artifactId>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <relativePath>../../parent/pom.xml</relativePath>
   </parent>
   <dependencies>
diff --git a/distribution/manifest/pom.xml b/distribution/manifest/pom.xml
index 1913f95..3d499db 100644
--- a/distribution/manifest/pom.xml
+++ b/distribution/manifest/pom.xml
@@ -24,13 +24,13 @@
     <packaging>jar</packaging>
     <name>Apache CXF Manifest Jar</name>
     <description>Apache CXF Manifest Jar</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <url>http://cxf.apache.org</url>
 
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../parent</relativePath>
     </parent>
 
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 7fc5b44..69c303a 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -23,13 +23,13 @@
     <packaging>pom</packaging>
     <name>Apache CXF Distribution</name>
     <description>Apache CXF Distribution</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <url>http://cxf.apache.org</url>
 
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
 
diff --git a/distribution/src/main/release/samples/aegis/pom.xml b/distribution/src/main/release/samples/aegis/pom.xml
index afa59dc..fbfc211 100644
--- a/distribution/src/main/release/samples/aegis/pom.xml
+++ b/distribution/src/main/release/samples/aegis/pom.xml
@@ -22,12 +22,12 @@
     <artifactId>aegis</artifactId>
     <name>CXF sample using code first POJO's and the Aegis Binding</name>
     <description>CXF sample using code first POJO's and the Aegis Binding</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -103,24 +103,24 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-databinding-aegis</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <!-- The server example in here launches the embedded jetty. Not needed
 	     if you deploy a WAR. -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
 	<dependency>
 	  <groupId>junit</groupId>
diff --git a/distribution/src/main/release/samples/aegis_standalone/pom.xml b/distribution/src/main/release/samples/aegis_standalone/pom.xml
index c06e7c1..9cacf7b 100644
--- a/distribution/src/main/release/samples/aegis_standalone/pom.xml
+++ b/distribution/src/main/release/samples/aegis_standalone/pom.xml
@@ -22,12 +22,12 @@
     <artifactId>aegis-standalone</artifactId>
     <name>CXF sample using the Aegis Binding without any webservice</name>
     <description>CXF sample using the Aegis Binding without any webservice</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -101,7 +101,7 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-databinding-aegis</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>net.java.dev.stax-utils</groupId>
diff --git a/distribution/src/main/release/samples/callback/pom.xml b/distribution/src/main/release/samples/callback/pom.xml
index 4983974..f553985 100644
--- a/distribution/src/main/release/samples/callback/pom.xml
+++ b/distribution/src/main/release/samples/callback/pom.xml
@@ -22,12 +22,12 @@
     <artifactId>callback</artifactId>
     <name>CXF sample using a callback object</name>
     <description>CXF sample using a callback object</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -150,17 +150,17 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/distribution/src/main/release/samples/configuration_interceptor/pom.xml b/distribution/src/main/release/samples/configuration_interceptor/pom.xml
index 6e15638..047d942 100644
--- a/distribution/src/main/release/samples/configuration_interceptor/pom.xml
+++ b/distribution/src/main/release/samples/configuration_interceptor/pom.xml
@@ -22,12 +22,12 @@
     <artifactId>configuration_interceptor</artifactId>
     <name>CXF Sample of Stream GZIP Interceptor</name>
     <description>CXF Sample of Stream GZIP Interceptor</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -130,22 +130,22 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-management</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/distribution/src/main/release/samples/corba/bank/pom.xml b/distribution/src/main/release/samples/corba/bank/pom.xml
index a0787ff..b92fdb7 100644
--- a/distribution/src/main/release/samples/corba/bank/pom.xml
+++ b/distribution/src/main/release/samples/corba/bank/pom.xml
@@ -24,12 +24,12 @@
 
     <name>Bank sample using JAX-WS API's to talk via CORBA/IIOP</name>
     <description>Bank sample using JAX-WS API's to talk via CORBA/IIOP</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -132,17 +132,17 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-bindings-corba</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-tools-common</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/distribution/src/main/release/samples/corba/bank_ws_addressing/pom.xml b/distribution/src/main/release/samples/corba/bank_ws_addressing/pom.xml
index f1964c9..0343e04 100644
--- a/distribution/src/main/release/samples/corba/bank_ws_addressing/pom.xml
+++ b/distribution/src/main/release/samples/corba/bank_ws_addressing/pom.xml
@@ -24,12 +24,12 @@
 
     <name>Bank sample using JAX-WS API's to talk via CORBA/IIOP</name>
     <description>Bank sample using JAX-WS API's to talk via CORBA/IIOP</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -208,17 +208,17 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-bindings-corba</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-tools-common</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/distribution/src/main/release/samples/corba/hello_world/pom.xml b/distribution/src/main/release/samples/corba/hello_world/pom.xml
index 1081bc1..f1a39fc 100644
--- a/distribution/src/main/release/samples/corba/hello_world/pom.xml
+++ b/distribution/src/main/release/samples/corba/hello_world/pom.xml
@@ -24,12 +24,12 @@
 
     <name>hello-world sample using JAX-WS API's to talk via CORBA/IIOP</name>
     <description>hello-world sample using JAX-WS API's to talk via CORBA/IIOP</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -253,17 +253,17 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-bindings-corba</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-tools-common</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/distribution/src/main/release/samples/groovy_spring_support/pom.xml b/distribution/src/main/release/samples/groovy_spring_support/pom.xml
index 5b1463c..e7253e0 100644
--- a/distribution/src/main/release/samples/groovy_spring_support/pom.xml
+++ b/distribution/src/main/release/samples/groovy_spring_support/pom.xml
@@ -23,12 +23,12 @@
     <packaging>war</packaging>
     <name>Spring HTTP Servlet demo with groovy support</name>
     <description>Spring HTTP Servlet demo with groovy support</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -111,18 +111,18 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <!-- Jetty is needed if you're using the CXFServlet -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
diff --git a/distribution/src/main/release/samples/in_jvm_transport/pom.xml b/distribution/src/main/release/samples/in_jvm_transport/pom.xml
index 680cec3..e8d2a98 100644
--- a/distribution/src/main/release/samples/in_jvm_transport/pom.xml
+++ b/distribution/src/main/release/samples/in_jvm_transport/pom.xml
@@ -22,12 +22,12 @@
     <artifactId>in_jvm_transport</artifactId>
     <name>Colocated Demo using Document/Literal Style</name>
     <description>Colocated Demo using Document/Literal Style</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -97,23 +97,23 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <!-- Jetty is needed if you're using the CXFServlet -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-bindings-coloc</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/distribution/src/main/release/samples/java_first_jaxws/pom.xml b/distribution/src/main/release/samples/java_first_jaxws/pom.xml
index 5d82af7..cc11658 100644
--- a/distribution/src/main/release/samples/java_first_jaxws/pom.xml
+++ b/distribution/src/main/release/samples/java_first_jaxws/pom.xml
@@ -23,12 +23,12 @@
     <packaging>war</packaging>
     <name>Java First demo using JAX-WS APIs</name>
     <description>Java First demo using JAX-WS APIs</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -122,12 +122,12 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/distribution/src/main/release/samples/java_first_jaxws_factory_bean/pom.xml b/distribution/src/main/release/samples/java_first_jaxws_factory_bean/pom.xml
index 8404362..c4fdfe1 100644
--- a/distribution/src/main/release/samples/java_first_jaxws_factory_bean/pom.xml
+++ b/distribution/src/main/release/samples/java_first_jaxws_factory_bean/pom.xml
@@ -22,12 +22,12 @@
     <artifactId>java_first_jaxws_factory_bean</artifactId>
     <name>Java First demo service using the JAXWSFactoryBeans</name>
     <description>Java First demo service using the JAXWSFactoryBeans</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -95,18 +95,18 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <!-- Jetty is needed if you're using the CXFServlet -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/distribution/src/main/release/samples/java_first_jms/pom.xml b/distribution/src/main/release/samples/java_first_jms/pom.xml
index b39b618..2612af0 100644
--- a/distribution/src/main/release/samples/java_first_jms/pom.xml
+++ b/distribution/src/main/release/samples/java_first_jms/pom.xml
@@ -24,12 +24,12 @@
     <artifactId>java_first_jms</artifactId>
     <name>Java First demo using JMS</name>
     <description>Java First demo using JMS</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
 	  <groupId>org.apache.cxf.samples</groupId>
 	  <artifactId>cxf-samples</artifactId>
-	  <version>2.6.17</version>
+	  <version>2.6.18-SNAPSHOT</version>
 	</parent>
 
     <properties>
@@ -119,12 +119,12 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-jms</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/distribution/src/main/release/samples/java_first_pojo/pom.xml b/distribution/src/main/release/samples/java_first_pojo/pom.xml
index ab4e390..5b70f0f 100644
--- a/distribution/src/main/release/samples/java_first_pojo/pom.xml
+++ b/distribution/src/main/release/samples/java_first_pojo/pom.xml
@@ -22,12 +22,12 @@
     <artifactId>java_first_pojo</artifactId>
     <name>Java First POJO Sample</name>
     <description>Java First POJO Sample</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -96,18 +96,18 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <!-- Jetty is needed if you're using the CXFServlet -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/distribution/src/main/release/samples/java_first_spring_support/pom.xml b/distribution/src/main/release/samples/java_first_spring_support/pom.xml
index 3b96f43..7b8cc09 100644
--- a/distribution/src/main/release/samples/java_first_spring_support/pom.xml
+++ b/distribution/src/main/release/samples/java_first_spring_support/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>java_first_spring_support</artifactId>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Spring HTTP Sample</name>
     <description>Spring HTTP Sample</description>
     <packaging>war</packaging>
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -98,17 +98,17 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/distribution/src/main/release/samples/jax_rs/basic/pom.xml b/distribution/src/main/release/samples/jax_rs/basic/pom.xml
index 3f62162..3ce7020 100644
--- a/distribution/src/main/release/samples/jax_rs/basic/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/basic/pom.xml
@@ -22,12 +22,12 @@
     <artifactId>jax_rs_basic</artifactId>
     <name>JAX-RS Basic Demo</name>
     <description>JAX-RS Basic Demo</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -97,18 +97,18 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <!-- This dependency is needed if you're using the Jetty container -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>commons-httpclient</groupId>
diff --git a/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml b/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml
index d31161d..303c4f8 100644
--- a/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml
@@ -22,12 +22,12 @@
     <artifactId>jax_rs_basic_https</artifactId>
     <name>JAX-RS Basic Demo With HTTPS communications</name>
     <description>JAX-RS Basic Demo With HTTPS communications</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
 
@@ -99,12 +99,12 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
diff --git a/distribution/src/main/release/samples/jax_rs/content_negotiation/pom.xml b/distribution/src/main/release/samples/jax_rs/content_negotiation/pom.xml
index 1f854fd..2168d3a 100644
--- a/distribution/src/main/release/samples/jax_rs/content_negotiation/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/content_negotiation/pom.xml
@@ -22,12 +22,12 @@
     <artifactId>jax_rs_content_negotiation</artifactId>
     <name>JAX-RS Content Negotiation Demo</name>
     <description>JAX-RS Content Negotiation Demo</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -97,23 +97,23 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <!-- This dependency is needed if you're using the Jetty container -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-extension-providers</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
 	   <groupId>org.codehaus.jettison</groupId>
diff --git a/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml b/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
index dc4a16e..be4b69e 100644
--- a/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
@@ -23,12 +23,12 @@
 	<artifactId>jax_rs_minimal_osgi</artifactId>
 	<name>JAX-RS Minimal OSGI Demo</name>
 	<description>JAX-RS Minimal OSGI Demo</description>
-	<version>2.6.17</version>
+	<version>2.6.18-SNAPSHOT</version>
 
 	<parent>
 	    <groupId>org.apache.cxf.samples</groupId>
 	    <artifactId>cxf-samples</artifactId>
-	    <version>2.6.17</version>
+	    <version>2.6.18-SNAPSHOT</version>
 	    <relativePath>../..</relativePath>
 	</parent>
 
@@ -154,7 +154,7 @@
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-bundle-jaxrs</artifactId>
-			<version>2.6.17</version>
+			<version>2.6.18-SNAPSHOT</version>
 			<exclusions>
 				<!-- CXF's dependency tree includes JARs that are not OSGI bundles; we'll import the correct lines later -->
 				<exclusion>
diff --git a/distribution/src/main/release/samples/jax_rs/spring_security/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_security/pom.xml
index e9c0feb..2f6ecfb 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_security/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_security/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>jax_rs_spring_security</artifactId>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>JAX-RS Spring Security Demo</name>
     <description>JAX-RS Spring Security Demo</description>
     <packaging>war</packaging>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -91,18 +91,18 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <!-- This dependency is needed if you're using the Jetty container -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>commons-httpclient</groupId>
diff --git a/distribution/src/main/release/samples/jax_server_aegis_client/pom.xml b/distribution/src/main/release/samples/jax_server_aegis_client/pom.xml
index a6ecc26..2614afd 100644
--- a/distribution/src/main/release/samples/jax_server_aegis_client/pom.xml
+++ b/distribution/src/main/release/samples/jax_server_aegis_client/pom.xml
@@ -22,11 +22,11 @@
     <artifactId>jax_service_aegis_client</artifactId>
     <name>Sample of JAX-* Service Using an Aegis Client</name>
     <description>Sample of JAX-* Service Using an Aegis Client</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -95,23 +95,23 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-databinding-aegis</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <!-- Jetty is needed if you're using the CXFServlet -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/distribution/src/main/release/samples/jaxws_async/pom.xml b/distribution/src/main/release/samples/jaxws_async/pom.xml
index 31f10b2..20ecdde 100644
--- a/distribution/src/main/release/samples/jaxws_async/pom.xml
+++ b/distribution/src/main/release/samples/jaxws_async/pom.xml
@@ -22,13 +22,13 @@
     <artifactId>jaxws_async</artifactId>
     <name>JAX-WS Asynchronous Demo using Document/Literal Style</name>
     <description>JAX-WS Asynchronous Demo using Document/Literal Style</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <packaging>war</packaging>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -137,12 +137,12 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -155,7 +155,7 @@
             <!-- Not needed if deploying to a Servlet 3 based container or non-jetty container -->
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.eclipse.jetty</groupId>
diff --git a/distribution/src/main/release/samples/jaxws_dispatch_provider/pom.xml b/distribution/src/main/release/samples/jaxws_dispatch_provider/pom.xml
index 465b8b7..e462d7d 100644
--- a/distribution/src/main/release/samples/jaxws_dispatch_provider/pom.xml
+++ b/distribution/src/main/release/samples/jaxws_dispatch_provider/pom.xml
@@ -22,12 +22,12 @@
     <artifactId>jaxws_dispatch_provider</artifactId>
     <name>JAX-WS Dispatch/Provider Demo</name>
     <description>JAX-WS Dispatch/Provider Demo</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -124,18 +124,18 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <!-- Jetty is needed if you're using the CXFServlet -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/distribution/src/main/release/samples/jaxws_handlers/pom.xml b/distribution/src/main/release/samples/jaxws_handlers/pom.xml
index 2b22ead..0ec9011 100644
--- a/distribution/src/main/release/samples/jaxws_handlers/pom.xml
+++ b/distribution/src/main/release/samples/jaxws_handlers/pom.xml
@@ -22,11 +22,11 @@
     <artifactId>jaxws_handlers</artifactId>
     <name>JAX-WS Handler Demo</name>
     <description>JAX-WS Handler Demo</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -125,18 +125,18 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <!-- Jetty is needed if you're using the CXFServlet -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/distribution/src/main/release/samples/jms_pubsub/pom.xml b/distribution/src/main/release/samples/jms_pubsub/pom.xml
index 2118350..bf8afe1 100644
--- a/distribution/src/main/release/samples/jms_pubsub/pom.xml
+++ b/distribution/src/main/release/samples/jms_pubsub/pom.xml
@@ -22,11 +22,11 @@
     <artifactId>jms_pubsub</artifactId>
     <name>JMS Transport Publish/Subscribe Demo using Document-Literal Style</name>
     <description>JMS Transport Publish/Subscribe Demo using Document-Literal Style</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
    <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -46,7 +46,7 @@
             <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-codegen-plugin</artifactId>
-                <version>2.6.17</version>
+                <version>2.6.18-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>
@@ -147,12 +147,12 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-jms</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.activemq</groupId>
diff --git a/distribution/src/main/release/samples/jms_queue/pom.xml b/distribution/src/main/release/samples/jms_queue/pom.xml
index 8d58e3f..661bf17 100644
--- a/distribution/src/main/release/samples/jms_queue/pom.xml
+++ b/distribution/src/main/release/samples/jms_queue/pom.xml
@@ -22,12 +22,12 @@
     <artifactId>jms_queue</artifactId>
     <name>JMS Transport Queue Demo using Document-Literal Style</name>
     <description>JMS Transport Queue Demo using Document-Literal Style</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -148,12 +148,12 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-jms</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.activemq</groupId>
diff --git a/distribution/src/main/release/samples/jms_spec_demo/pom.xml b/distribution/src/main/release/samples/jms_spec_demo/pom.xml
index 8a2b40d..914f216 100644
--- a/distribution/src/main/release/samples/jms_spec_demo/pom.xml
+++ b/distribution/src/main/release/samples/jms_spec_demo/pom.xml
@@ -22,12 +22,12 @@
     <artifactId>jms_spec_demo</artifactId>
     <name>SOAP/JMS Transport Specification Demo using Document-Literal Style</name>
     <description>SOAP/JMS Transport Specification Demo using Document-Literal Style</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -147,12 +147,12 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-jms</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.activemq</groupId>
diff --git a/distribution/src/main/release/samples/jms_spring_config/pom.xml b/distribution/src/main/release/samples/jms_spring_config/pom.xml
index acb736c..f5b4a7e 100644
--- a/distribution/src/main/release/samples/jms_spring_config/pom.xml
+++ b/distribution/src/main/release/samples/jms_spring_config/pom.xml
@@ -23,12 +23,12 @@
     <packaging>jar</packaging>
     <name>WSDL first demo using the jms transport and jmsConfigFeature</name>
     <description>WSDL first demo using the jms transport and jmsConfigFeature</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -186,12 +186,12 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-jms</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf.xjc-utils</groupId>
diff --git a/distribution/src/main/release/samples/js_browser_client_java_first/pom.xml b/distribution/src/main/release/samples/js_browser_client_java_first/pom.xml
index adbeb3c..2fb06fd 100644
--- a/distribution/src/main/release/samples/js_browser_client_java_first/pom.xml
+++ b/distribution/src/main/release/samples/js_browser_client_java_first/pom.xml
@@ -22,12 +22,12 @@
     <artifactId>js_browser_client_java</artifactId>
     <name>Generated JavaScript Sample using JAX-WS and JSR-181</name>
     <description>Generated JavaScript Sample using JAX-WS and JSR-181</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -73,22 +73,22 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-javascript</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/distribution/src/main/release/samples/js_browser_client_simple/pom.xml b/distribution/src/main/release/samples/js_browser_client_simple/pom.xml
index c9c061b..0a31120 100644
--- a/distribution/src/main/release/samples/js_browser_client_simple/pom.xml
+++ b/distribution/src/main/release/samples/js_browser_client_simple/pom.xml
@@ -22,12 +22,12 @@
     <artifactId>js_browser_client_simple</artifactId>
     <name>JavaScript Client Demo using Document/Literal Style</name>
     <description>JavaScript Client Demo using Document/Literal Style</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -122,22 +122,22 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-javascript</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/distribution/src/main/release/samples/js_client/pom.xml b/distribution/src/main/release/samples/js_client/pom.xml
index 448dba3..dcb8273 100644
--- a/distribution/src/main/release/samples/js_client/pom.xml
+++ b/distribution/src/main/release/samples/js_client/pom.xml
@@ -22,12 +22,12 @@
     <artifactId>js_client</artifactId>
     <name>Hello World Client Demo using JavaScript</name>
     <description>Hello World Client Demo using JavaScript</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -123,22 +123,22 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-javascript</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>rhino</groupId>
diff --git a/distribution/src/main/release/samples/js_provider/pom.xml b/distribution/src/main/release/samples/js_provider/pom.xml
index b34c559..30a1286 100644
--- a/distribution/src/main/release/samples/js_provider/pom.xml
+++ b/distribution/src/main/release/samples/js_provider/pom.xml
@@ -22,12 +22,12 @@
     <artifactId>js_provider</artifactId>
     <name>Hello world javascript demo</name>
     <description>Hello world javascript demo</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -143,18 +143,18 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-js</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <!-- Jetty is needed if you're using the CXFServlet -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/distribution/src/main/release/samples/logbrowser/pom.xml b/distribution/src/main/release/samples/logbrowser/pom.xml
index 97dcf31..7d5116b 100644
--- a/distribution/src/main/release/samples/logbrowser/pom.xml
+++ b/distribution/src/main/release/samples/logbrowser/pom.xml
@@ -22,12 +22,12 @@
     <artifactId>logbrowser</artifactId>
     <name>LogBrowser</name>
     <description>LogBrowser</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
diff --git a/distribution/src/main/release/samples/mtom/pom.xml b/distribution/src/main/release/samples/mtom/pom.xml
index 99f2946..0e70903 100644
--- a/distribution/src/main/release/samples/mtom/pom.xml
+++ b/distribution/src/main/release/samples/mtom/pom.xml
@@ -22,12 +22,12 @@
     <artifactId>mtom</artifactId>
     <name>MTOM Demo for SWA and XOP</name>
     <description>MTOM Demo for SWA and XOP</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -128,18 +128,18 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <!-- Jetty is needed if you're using the CXFServlet -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/distribution/src/main/release/samples/oauth/client/pom.xml b/distribution/src/main/release/samples/oauth/client/pom.xml
index db5af1d..af947d8 100644
--- a/distribution/src/main/release/samples/oauth/client/pom.xml
+++ b/distribution/src/main/release/samples/oauth/client/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/distribution/src/main/release/samples/oauth/server/pom.xml b/distribution/src/main/release/samples/oauth/server/pom.xml
index 9496d95..b0dd031 100644
--- a/distribution/src/main/release/samples/oauth/server/pom.xml
+++ b/distribution/src/main/release/samples/oauth/server/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 41ad074..878dd81 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>cxf-samples</artifactId>
     <packaging>pom</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Samples</name>
     <description>Apache CXF Samples</description>
     <url>http://cxf.apache.org</url>
diff --git a/distribution/src/main/release/samples/restful_dispatch/pom.xml b/distribution/src/main/release/samples/restful_dispatch/pom.xml
index aeb4c74..e3f5726 100644
--- a/distribution/src/main/release/samples/restful_dispatch/pom.xml
+++ b/distribution/src/main/release/samples/restful_dispatch/pom.xml
@@ -22,12 +22,12 @@
     <artifactId>restful_dispatch</artifactId>
     <name>RESTful Hello World Demo</name>
     <description>RESTful Hello World Demo</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -96,23 +96,23 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <!-- Jetty is needed if you're using the CXFServlet -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>commons-httpclient</groupId>
diff --git a/distribution/src/main/release/samples/ruby_spring_support/pom.xml b/distribution/src/main/release/samples/ruby_spring_support/pom.xml
index f8dc2bf..00d96e3 100644
--- a/distribution/src/main/release/samples/ruby_spring_support/pom.xml
+++ b/distribution/src/main/release/samples/ruby_spring_support/pom.xml
@@ -23,12 +23,12 @@
     <packaging>war</packaging>
     <name>Spring HTTP Servlet demo with ruby support</name>
     <description>Spring HTTP Servlet demo with ruby support</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -111,18 +111,18 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <!-- Jetty is needed if you're using the CXFServlet -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.jruby</groupId>
diff --git a/distribution/src/main/release/samples/soap_header/pom.xml b/distribution/src/main/release/samples/soap_header/pom.xml
index cc92882..73bf7c7 100644
--- a/distribution/src/main/release/samples/soap_header/pom.xml
+++ b/distribution/src/main/release/samples/soap_header/pom.xml
@@ -22,12 +22,12 @@
     <artifactId>soap_header</artifactId>
     <name>Sample using SOAP Headers</name>
     <description>Sample using SOAP Headers</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -123,18 +123,18 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <!-- Jetty is needed if you're using the CXFServlet -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/distribution/src/main/release/samples/sts/pom.xml b/distribution/src/main/release/samples/sts/pom.xml
index 8ed044d..2d11b31 100644
--- a/distribution/src/main/release/samples/sts/pom.xml
+++ b/distribution/src/main/release/samples/sts/pom.xml
@@ -22,12 +22,12 @@
     <artifactId>sts</artifactId>
     <name>CXF STS Demo</name>
     <description>CXF STS Demo</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
diff --git a/distribution/src/main/release/samples/ws_addressing/pom.xml b/distribution/src/main/release/samples/ws_addressing/pom.xml
index ece4248..b56cea4 100644
--- a/distribution/src/main/release/samples/ws_addressing/pom.xml
+++ b/distribution/src/main/release/samples/ws_addressing/pom.xml
@@ -22,12 +22,12 @@
     <artifactId>ws_addressing</artifactId>
     <name>WS-Addressing Demo</name>
     <description>WS-Addressing Demo</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -129,17 +129,17 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/distribution/src/main/release/samples/ws_notification/pom.xml b/distribution/src/main/release/samples/ws_notification/pom.xml
index 46a38a0..90f74c3 100644
--- a/distribution/src/main/release/samples/ws_notification/pom.xml
+++ b/distribution/src/main/release/samples/ws_notification/pom.xml
@@ -22,12 +22,12 @@
     <artifactId>ws_notification</artifactId>
     <name>WS-Notification Demo</name>
     <description>WS-Notification Demo</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -95,32 +95,32 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-addr</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-policy</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf.services.wsn</groupId>
             <artifactId>cxf-services-wsn-core</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/distribution/src/main/release/samples/ws_policy/pom.xml b/distribution/src/main/release/samples/ws_policy/pom.xml
index 9bee1c0..47e75d3 100644
--- a/distribution/src/main/release/samples/ws_policy/pom.xml
+++ b/distribution/src/main/release/samples/ws_policy/pom.xml
@@ -22,12 +22,12 @@
     <artifactId>ws_policy</artifactId>
     <name>WS-Policy Demo</name>
     <description>WS-Policy Demo</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -124,17 +124,17 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/distribution/src/main/release/samples/ws_rm/pom.xml b/distribution/src/main/release/samples/ws_rm/pom.xml
index 92ce685..66121bd 100644
--- a/distribution/src/main/release/samples/ws_rm/pom.xml
+++ b/distribution/src/main/release/samples/ws_rm/pom.xml
@@ -22,12 +22,12 @@
     <artifactId>ws_rm</artifactId>
     <name>WS-RM Demo</name>
     <description>WS-RM Demo</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -118,23 +118,23 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <!-- Jetty is needed if you're using the CXFServlet -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-rm</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml b/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml
index 5172a87..41d0707 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml
+++ b/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml
@@ -22,12 +22,12 @@
     <artifactId>wssec_sign_enc</artifactId>
     <name>CXF WS-Security Sign Encoding Demo</name>
     <description>CXF WS-Security Sign Encoding Demo</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
 
@@ -129,38 +129,38 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <!-- Jetty is needed if you're using the CXFServlet -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-rm</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-security</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-addr</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-policy</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/distribution/src/main/release/samples/ws_security/ut/pom.xml b/distribution/src/main/release/samples/ws_security/ut/pom.xml
index 8a417c6..3e6c344 100644
--- a/distribution/src/main/release/samples/ws_security/ut/pom.xml
+++ b/distribution/src/main/release/samples/ws_security/ut/pom.xml
@@ -22,12 +22,12 @@
     <artifactId>wssec_ut</artifactId>
     <name>CXF WS-Security UT Demo</name>
     <description>CXF WS-Security UT Demo</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -118,23 +118,23 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <!-- Jetty is needed if you're using the CXFServlet -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-security</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/distribution/src/main/release/samples/ws_security/ut_policy/pom.xml b/distribution/src/main/release/samples/ws_security/ut_policy/pom.xml
index 8f56235..d96b9dd 100644
--- a/distribution/src/main/release/samples/ws_security/ut_policy/pom.xml
+++ b/distribution/src/main/release/samples/ws_security/ut_policy/pom.xml
@@ -22,12 +22,12 @@
     <artifactId>wssec_ut_policy</artifactId>
     <name>WS-Security UT Policy Demo</name>
     <description>WS-Security UT Policy Demo</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
 
@@ -155,27 +155,27 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-security</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-policy</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/distribution/src/main/release/samples/ws_security/ut_sign/pom.xml b/distribution/src/main/release/samples/ws_security/ut_sign/pom.xml
index 42e477d..4d2aef4 100644
--- a/distribution/src/main/release/samples/ws_security/ut_sign/pom.xml
+++ b/distribution/src/main/release/samples/ws_security/ut_sign/pom.xml
@@ -22,12 +22,12 @@
     <artifactId>wssec_ut_sign</artifactId>
     <name>WS-Security UT Sign Demo</name>
     <description>WS-Security UT Sign Demo</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
 
@@ -130,38 +130,38 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <!-- Jetty is needed if you're using the CXFServlet -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-rm</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-security</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-addr</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-policy</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/distribution/src/main/release/samples/wsdl_first/pom.xml b/distribution/src/main/release/samples/wsdl_first/pom.xml
index c07cf24..b0351fd 100644
--- a/distribution/src/main/release/samples/wsdl_first/pom.xml
+++ b/distribution/src/main/release/samples/wsdl_first/pom.xml
@@ -23,12 +23,12 @@
     <packaging>war</packaging>
     <name>WSDL first demo using Document/Literal Style</name>
     <description>WSDL first demo using Document/Literal Style</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -165,12 +165,12 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf.xjc-utils</groupId>
diff --git a/distribution/src/main/release/samples/wsdl_first_dynamic_client/pom.xml b/distribution/src/main/release/samples/wsdl_first_dynamic_client/pom.xml
index 126094f..3430afb 100644
--- a/distribution/src/main/release/samples/wsdl_first_dynamic_client/pom.xml
+++ b/distribution/src/main/release/samples/wsdl_first_dynamic_client/pom.xml
@@ -22,12 +22,12 @@
     <artifactId>wsdl_first_dynamic_client</artifactId>
     <name>CXF Dynamic Client Sample</name>
     <description>CXF Dynamic Client Sample</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -122,18 +122,18 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <!-- Jetty is needed if you're using the CXFServlet -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
diff --git a/distribution/src/main/release/samples/wsdl_first_https/pom.xml b/distribution/src/main/release/samples/wsdl_first_https/pom.xml
index 92eb814..272d794 100644
--- a/distribution/src/main/release/samples/wsdl_first_https/pom.xml
+++ b/distribution/src/main/release/samples/wsdl_first_https/pom.xml
@@ -22,12 +22,12 @@
     <artifactId>wsdl_first_https</artifactId>
     <name>WSDL first demo using HTTPS</name>
     <description>WSDL first demo using HTTPS</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -209,17 +209,17 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/distribution/src/main/release/samples/wsdl_first_pure_xml/pom.xml b/distribution/src/main/release/samples/wsdl_first_pure_xml/pom.xml
index d694d6b..8e3bfe6 100644
--- a/distribution/src/main/release/samples/wsdl_first_pure_xml/pom.xml
+++ b/distribution/src/main/release/samples/wsdl_first_pure_xml/pom.xml
@@ -22,12 +22,12 @@
     <artifactId>wsdl_first_pure_xml</artifactId>
     <name>WSDL first demo using BARE Style in XML Binding (pure XML over HTTP)</name>
     <description>WSDL first demo using BARE Style in XML Binding (pure XML over HTTP)</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -122,18 +122,18 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <!-- Jetty is needed if you're using the CXFServlet -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/distribution/src/main/release/samples/wsdl_first_rpclit/pom.xml b/distribution/src/main/release/samples/wsdl_first_rpclit/pom.xml
index 78cfef1..9a1595e 100644
--- a/distribution/src/main/release/samples/wsdl_first_rpclit/pom.xml
+++ b/distribution/src/main/release/samples/wsdl_first_rpclit/pom.xml
@@ -22,12 +22,12 @@
     <artifactId>wsdl_first_rpclit</artifactId>
     <name>WSDL first demo using RPC-Literal Style</name>
     <description>WSDL first demo using RPC-Literal Style</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -124,18 +124,18 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <!-- Jetty is needed if you're using the CXFServlet -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/distribution/src/main/release/samples/wsdl_first_soap12/pom.xml b/distribution/src/main/release/samples/wsdl_first_soap12/pom.xml
index defbf19..468f13c 100644
--- a/distribution/src/main/release/samples/wsdl_first_soap12/pom.xml
+++ b/distribution/src/main/release/samples/wsdl_first_soap12/pom.xml
@@ -22,12 +22,12 @@
     <artifactId>wsdl_first_soap12</artifactId>
     <name>WSDL first demo using SOAP12 in Document/Literal Style</name>
     <description>WSDL first demo using SOAP12 in Document/Literal Style</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -148,18 +148,18 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <!-- Jetty is needed if you're using the CXFServlet -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/distribution/src/main/release/samples/wsdl_first_xml_wrapped/pom.xml b/distribution/src/main/release/samples/wsdl_first_xml_wrapped/pom.xml
index 48572a9..0ebb055 100644
--- a/distribution/src/main/release/samples/wsdl_first_xml_wrapped/pom.xml
+++ b/distribution/src/main/release/samples/wsdl_first_xml_wrapped/pom.xml
@@ -22,12 +22,12 @@
     <artifactId>wsdl_first_xml_wrapped</artifactId>
     <name>CXF sample using WRAPPED Style in XML Binding (pure XML over HTTP)</name>
     <description>CXF sample using WRAPPED Style in XML Binding (pure XML over HTTP)</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -149,18 +149,18 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <!-- Jetty is needed if you're using the CXFServlet -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/distribution/src/main/release/samples/wsdl_first_xmlbeans/pom.xml b/distribution/src/main/release/samples/wsdl_first_xmlbeans/pom.xml
index a1d79d2..88d0e35 100644
--- a/distribution/src/main/release/samples/wsdl_first_xmlbeans/pom.xml
+++ b/distribution/src/main/release/samples/wsdl_first_xmlbeans/pom.xml
@@ -22,12 +22,12 @@
     <artifactId>wsdl_first_xmlbeans</artifactId>
     <name>WSDL first demo using Document/Literal Style and XMLBeans DataBinding</name>
     <description>WSDL first demo using Document/Literal Style and XMLBeans DataBinding</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -134,23 +134,23 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-databinding-xmlbeans</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <!-- Jetty is needed if you're using the CXFServlet -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.6.17</version>
+            <version>2.6.18-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/integration/jca/pom.xml b/integration/jca/pom.xml
index 94d39d8..e32a520 100644
--- a/integration/jca/pom.xml
+++ b/integration/jca/pom.xml
@@ -22,7 +22,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-integration-jca</artifactId>
     <packaging>jar</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF JCA Connection</name>
     <description>Apache CXF JCA Connection</description>
     <url>http://cxf.apache.org</url>
@@ -30,7 +30,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/integration/pom.xml b/integration/pom.xml
index 25983cb..1929f3b 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-integration</artifactId>
     <packaging>pom</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Integration</name>
     <description>Apache CXF Integration</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
 
 
diff --git a/maven-plugins/archetypes/cxf-jaxrs-service/pom.xml b/maven-plugins/archetypes/cxf-jaxrs-service/pom.xml
index 9f9269c..47fd86d 100644
--- a/maven-plugins/archetypes/cxf-jaxrs-service/pom.xml
+++ b/maven-plugins/archetypes/cxf-jaxrs-service/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.cxf.archetype</groupId>
     <artifactId>cxf-jaxrs-service</artifactId>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <packaging>maven-archetype</packaging>
 
     <name>Apache CXF Archetype - Simple JAX-RS webapp</name>
diff --git a/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml b/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml
index 5be8ef9..4627c79 100644
--- a/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml
+++ b/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.cxf.archetype</groupId>
     <artifactId>cxf-jaxws-javafirst</artifactId>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <packaging>maven-archetype</packaging>
 
     <name>Apache CXF Archetype - Simple JAX-WS Java First</name>
diff --git a/maven-plugins/archetypes/pom.xml b/maven-plugins/archetypes/pom.xml
index c4df2ef..e19c099 100644
--- a/maven-plugins/archetypes/pom.xml
+++ b/maven-plugins/archetypes/pom.xml
@@ -22,7 +22,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-archetypes</artifactId>
     <packaging>pom</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Maven Archetypes</name>
     <description>Apache CXF Maven Archetypes</description>
     <url>http://cxf.apache.org</url>
@@ -30,7 +30,7 @@
     <parent>
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-maven-plugins</artifactId>
-      <version>2.6.17</version>
+      <version>2.6.18-SNAPSHOT</version>
     </parent>
 
     <modules>
diff --git a/maven-plugins/codegen-plugin/pom.xml b/maven-plugins/codegen-plugin/pom.xml
index 2c3a9a9..d300124 100644
--- a/maven-plugins/codegen-plugin/pom.xml
+++ b/maven-plugins/codegen-plugin/pom.xml
@@ -22,7 +22,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-codegen-plugin</artifactId>
     <packaging>maven-plugin</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Code Generation Maven2 Plugins</name>
     <description>Apache CXF Code Generation Maven2 Plugins</description>
     <url>http://cxf.apache.org</url>
@@ -30,7 +30,7 @@
     <parent>
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-maven-plugins</artifactId>
-      <version>2.6.17</version>
+      <version>2.6.18-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/maven-plugins/corba/pom.xml b/maven-plugins/corba/pom.xml
index 5e9fead..6dc964a 100644
--- a/maven-plugins/corba/pom.xml
+++ b/maven-plugins/corba/pom.xml
@@ -22,7 +22,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-corbatools-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF CORBA Tools Maven2 Plugins</name>
     <description>Apache CXF CORBA Tools Maven2 Plugins</description>
     <url>http://cxf.apache.org</url>
@@ -30,7 +30,7 @@
     <parent>
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-maven-plugins</artifactId>
-      <version>2.6.17</version>
+      <version>2.6.18-SNAPSHOT</version>
     </parent>
     <properties>
         <cxf.manifest.location />
diff --git a/maven-plugins/java2ws-plugin/pom.xml b/maven-plugins/java2ws-plugin/pom.xml
index f84c3eb..61696b6 100644
--- a/maven-plugins/java2ws-plugin/pom.xml
+++ b/maven-plugins/java2ws-plugin/pom.xml
@@ -22,7 +22,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-java2ws-plugin</artifactId>
     <packaging>maven-plugin</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Java2WS Maven2 Plugin</name>
     <description>Apache CXF Java2WS Maven2 Plugin</description>
     <url>http://cxf.apache.org</url>
@@ -31,7 +31,7 @@
     <parent>
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-maven-plugins</artifactId>
-      <version>2.6.17</version>
+      <version>2.6.18-SNAPSHOT</version>
     </parent>
     <properties>
         <cxf.manifest.location />
diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml
index 689da3a..4cfd883 100644
--- a/maven-plugins/pom.xml
+++ b/maven-plugins/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-maven-plugins</artifactId>
     <packaging>pom</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Maven Plugins</name>
     <description>Apache CXF Maven Plugins</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
 
diff --git a/maven-plugins/wadl2java-plugin/pom.xml b/maven-plugins/wadl2java-plugin/pom.xml
index 39f6ed8..b91662c 100644
--- a/maven-plugins/wadl2java-plugin/pom.xml
+++ b/maven-plugins/wadl2java-plugin/pom.xml
@@ -22,7 +22,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-wadl2java-plugin</artifactId>
     <packaging>maven-plugin</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF WADL2Java Code Generation Maven2 Plugin</name>
     <description>Apache CXF WADL2Java Code Generation Maven2 Plugin</description>
     <url>http://cxf.apache.org</url>
@@ -31,7 +31,7 @@
     <parent>
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-maven-plugins</artifactId>
-      <version>2.6.17</version>
+      <version>2.6.18-SNAPSHOT</version>
     </parent>
     <properties>
         <cxf.manifest.location />
diff --git a/maven-plugins/wsdl-validator-plugin/pom.xml b/maven-plugins/wsdl-validator-plugin/pom.xml
index 85986d5..5cecc20 100644
--- a/maven-plugins/wsdl-validator-plugin/pom.xml
+++ b/maven-plugins/wsdl-validator-plugin/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-wsdl-validator-plugin</artifactId>
     <packaging>maven-plugin</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF WSDL Validator Maven2 Plugin</name>
     <description>Apache CXF WSDL Validator Maven2 Plugin</description>
     <url>http://cxf.apache.org</url>
@@ -30,7 +30,7 @@
     <parent>
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-maven-plugins</artifactId>
-      <version>2.6.17</version>
+      <version>2.6.18-SNAPSHOT</version>
     </parent>
     <properties>
         <cxf.manifest.location />
diff --git a/osgi/bundle/all/pom.xml b/osgi/bundle/all/pom.xml
index 0e798f6..13d5f47 100644
--- a/osgi/bundle/all/pom.xml
+++ b/osgi/bundle/all/pom.xml
@@ -24,13 +24,13 @@
     <packaging>bundle</packaging>
     <name>Apache CXF Bundle Jar</name>
     <description>Apache CXF Bundle Jar</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <url>http://cxf.apache.org</url>
 
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-bundle-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
     <properties>
         <bundle.symbolic.name>${project.groupId}.bundle</bundle.symbolic.name>
diff --git a/osgi/bundle/compatible/pom.xml b/osgi/bundle/compatible/pom.xml
index 477bb0c..d08fa9d 100644
--- a/osgi/bundle/compatible/pom.xml
+++ b/osgi/bundle/compatible/pom.xml
@@ -24,13 +24,13 @@
     <packaging>bundle</packaging>
     <name>Apache CXF Compatibility Bundle Jar</name>
     <description>Apache CXF Compatibility Bundle Jar</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <url>http://cxf.apache.org</url>
 
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-bundle-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
     <properties>
          <cxf.osgi.symbolic.name>${project.groupId}.bundle</cxf.osgi.symbolic.name>
diff --git a/osgi/bundle/jaxrs/pom.xml b/osgi/bundle/jaxrs/pom.xml
index d984043..6e8d9df 100644
--- a/osgi/bundle/jaxrs/pom.xml
+++ b/osgi/bundle/jaxrs/pom.xml
@@ -24,13 +24,13 @@
     <packaging>bundle</packaging>
     <name>Apache CXF JAX-RS Bundle Jar</name>
     <description>Apache CXF JAX-RS Bundle Jar</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <url>http://cxf.apache.org</url>
 
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-bundle-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
     <properties>
          <bundle.symbolic.name>${project.groupId}.bundle-jaxrs</bundle.symbolic.name>
diff --git a/osgi/bundle/minimal/pom.xml b/osgi/bundle/minimal/pom.xml
index 928bbd9..a6677f4 100644
--- a/osgi/bundle/minimal/pom.xml
+++ b/osgi/bundle/minimal/pom.xml
@@ -24,13 +24,13 @@
     <packaging>bundle</packaging>
     <name>Apache CXF Minimal Bundle Jar</name>
     <description>Apache CXF Minimal Bundle Jar</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <url>http://cxf.apache.org</url>
 
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-bundle-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
     <properties>
         <bundle.symbolic.name>${project.groupId}.bundle-minimal</bundle.symbolic.name>
diff --git a/osgi/bundle/pom.xml b/osgi/bundle/pom.xml
index 0b28aa7..0a295c2 100644
--- a/osgi/bundle/pom.xml
+++ b/osgi/bundle/pom.xml
@@ -24,13 +24,13 @@
     <packaging>pom</packaging>
     <name>Apache CXF Bundle Parent</name>
     <description>Apache CXF Bundle Parent</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <url>http://cxf.apache.org</url>
 
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../parent</relativePath>
     </parent>
 
diff --git a/osgi/karaf/commands/pom.xml b/osgi/karaf/commands/pom.xml
index c7a8c15..c49ebf1 100644
--- a/osgi/karaf/commands/pom.xml
+++ b/osgi/karaf/commands/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.cxf.karaf</groupId>
         <artifactId>karaf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.cxf.karaf</groupId>
diff --git a/osgi/karaf/features/pom.xml b/osgi/karaf/features/pom.xml
index 9693ab9..e8657c1 100644
--- a/osgi/karaf/features/pom.xml
+++ b/osgi/karaf/features/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.cxf.karaf</groupId>
         <artifactId>karaf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.cxf.karaf</groupId>
diff --git a/osgi/karaf/pom.xml b/osgi/karaf/pom.xml
index 87b6b47..abdc7e0 100644
--- a/osgi/karaf/pom.xml
+++ b/osgi/karaf/pom.xml
@@ -23,14 +23,14 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../parent</relativePath>
     </parent>
 
     <groupId>org.apache.cxf.karaf</groupId>
     <artifactId>karaf-parent</artifactId>
     <packaging>pom</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Karaf Parent</name>
     <description>Apache CXF Karaf Parent</description>
 
diff --git a/parent/pom.xml b/parent/pom.xml
index e04bfda..996cb12 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -19,13 +19,13 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-parent</artifactId>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Parent</name>
     <description>Apache CXF Parent POM</description>
     <url>http://cxf.apache.org</url>
diff --git a/pom.xml b/pom.xml
index 1a17d44..6140bc4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf</artifactId>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF</name>
     <description>Apache CXF is an open-source services framework that aids in 
     the development of services using front-end programming APIs, like JAX-WS 
@@ -33,7 +33,7 @@
     <scm>
         <connection>scm:git:http://git-wip-us.apache.org/repos/asf/cxf.git</connection>
         <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/cxf.git</developerConnection>
-        <tag>cxf-2.6.17</tag>
+        <tag>cxf-2.6.17-SNAPSHOT</tag>
     </scm>
     <issueManagement>
         <system>jira</system>
diff --git a/rt/bindings/coloc/pom.xml b/rt/bindings/coloc/pom.xml
index 57d5b10..51aae71 100644
--- a/rt/bindings/coloc/pom.xml
+++ b/rt/bindings/coloc/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/rt/bindings/corba/pom.xml b/rt/bindings/corba/pom.xml
index c0502e3..02d9db0 100644
--- a/rt/bindings/corba/pom.xml
+++ b/rt/bindings/corba/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/rt/bindings/object/pom.xml b/rt/bindings/object/pom.xml
index cb7c421..bdccfcd 100644
--- a/rt/bindings/object/pom.xml
+++ b/rt/bindings/object/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/rt/bindings/pom.xml b/rt/bindings/pom.xml
index dedd1db..9fa4a2f 100644
--- a/rt/bindings/pom.xml
+++ b/rt/bindings/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
 
 
diff --git a/rt/bindings/soap/pom.xml b/rt/bindings/soap/pom.xml
index 9440d65..90c911b 100644
--- a/rt/bindings/soap/pom.xml
+++ b/rt/bindings/soap/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/rt/bindings/xml/pom.xml b/rt/bindings/xml/pom.xml
index 7e83147..8ce2353 100644
--- a/rt/bindings/xml/pom.xml
+++ b/rt/bindings/xml/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/rt/core/pom.xml b/rt/core/pom.xml
index c904bc5..8318ad1 100644
--- a/rt/core/pom.xml
+++ b/rt/core/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-rt-core</artifactId>
     <packaging>jar</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Runtime Core</name>
     <description>Apache CXF Runtime Core</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/rt/databinding/aegis/pom.xml b/rt/databinding/aegis/pom.xml
index 5caa18d..980fc81 100644
--- a/rt/databinding/aegis/pom.xml
+++ b/rt/databinding/aegis/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/rt/databinding/jaxb/pom.xml b/rt/databinding/jaxb/pom.xml
index ddab8d5..9756183 100644
--- a/rt/databinding/jaxb/pom.xml
+++ b/rt/databinding/jaxb/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/databinding/jibx/pom.xml b/rt/databinding/jibx/pom.xml
index 48f39ef..c6763f8 100644
--- a/rt/databinding/jibx/pom.xml
+++ b/rt/databinding/jibx/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/rt/databinding/sdo/pom.xml b/rt/databinding/sdo/pom.xml
index 0c3ad4a..5bdd8f4 100644
--- a/rt/databinding/sdo/pom.xml
+++ b/rt/databinding/sdo/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/rt/databinding/xmlbeans/pom.xml b/rt/databinding/xmlbeans/pom.xml
index f63f2ea..13fbe71 100644
--- a/rt/databinding/xmlbeans/pom.xml
+++ b/rt/databinding/xmlbeans/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/rt/features/clustering/pom.xml b/rt/features/clustering/pom.xml
index f57d18b..fcad955 100644
--- a/rt/features/clustering/pom.xml
+++ b/rt/features/clustering/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-rt-features-clustering</artifactId>
     <packaging>jar</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Runtime Clustering</name>
     <description>Failover and loadbalancing support</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/rt/frontend/jaxrs/pom.xml b/rt/frontend/jaxrs/pom.xml
index 8b849b8..b473279 100644
--- a/rt/frontend/jaxrs/pom.xml
+++ b/rt/frontend/jaxrs/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-rt-frontend-jaxrs</artifactId>
     <packaging>jar</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Runtime JAX-RS Frontend</name>
     <description>Apache CXF Runtime JAX-RS Frontend</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/rt/frontend/jaxws/pom.xml b/rt/frontend/jaxws/pom.xml
index 64c8853..54f49bc 100644
--- a/rt/frontend/jaxws/pom.xml
+++ b/rt/frontend/jaxws/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-rt-frontend-jaxws</artifactId>
     <packaging>jar</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Runtime JAX-WS Frontend</name>
     <description>Apache CXF Runtime JAX-WS Frontend</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/rt/frontend/js/pom.xml b/rt/frontend/js/pom.xml
index a53a6fb..a36a813 100644
--- a/rt/frontend/js/pom.xml
+++ b/rt/frontend/js/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-rt-frontend-js</artifactId>
     <packaging>jar</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Runtime JavaScript Frontend</name>
     <description>Apache CXF Runtime JavaScript Frontend</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/rt/frontend/simple/pom.xml b/rt/frontend/simple/pom.xml
index 766de67..d1d5bae 100644
--- a/rt/frontend/simple/pom.xml
+++ b/rt/frontend/simple/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-rt-frontend-simple</artifactId>
     <packaging>jar</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Runtime Simple Frontend</name>
     <description>Apache CXF Runtime Simple Frontend</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/rt/javascript/javascript-rt/pom.xml b/rt/javascript/javascript-rt/pom.xml
index 6d7bd7d..f0fb14f 100644
--- a/rt/javascript/javascript-rt/pom.xml
+++ b/rt/javascript/javascript-rt/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-runtime-javascript</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/rt/javascript/javascript-tests/pom.xml b/rt/javascript/javascript-tests/pom.xml
index de33b47..9659102 100644
--- a/rt/javascript/javascript-tests/pom.xml
+++ b/rt/javascript/javascript-tests/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-runtime-javascript</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/rt/javascript/pom.xml b/rt/javascript/pom.xml
index 0571215..6fe1127 100755
--- a/rt/javascript/pom.xml
+++ b/rt/javascript/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <modules>
diff --git a/rt/management-web/pom.xml b/rt/management-web/pom.xml
index 6a87b03..6687a22 100644
--- a/rt/management-web/pom.xml
+++ b/rt/management-web/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-rt-management-web</artifactId>
     <packaging>jar</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Runtime Web Management</name>
     <description>Apache CXF Runtime Web Management</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/rt/management/pom.xml b/rt/management/pom.xml
index c1e2a91..ac332e9 100644
--- a/rt/management/pom.xml
+++ b/rt/management/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-rt-management</artifactId>
     <packaging>jar</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Runtime Management</name>
     <description>Apache CXF Runtime Management</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/rt/pom.xml b/rt/pom.xml
index df2e49a..fcf69d2 100644
--- a/rt/pom.xml
+++ b/rt/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-rt</artifactId>
     <packaging>pom</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Runtime</name>
     <description>Apache CXF Runtime</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
 
     <modules>
diff --git a/rt/rs/extensions/providers/pom.xml b/rt/rs/extensions/providers/pom.xml
index 72d12ee..ce22f60 100644
--- a/rt/rs/extensions/providers/pom.xml
+++ b/rt/rs/extensions/providers/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-rt-rs-extension-providers</artifactId>
     <packaging>jar</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF JAX-RS Extensions: Providers</name>
     <description>Apache CXF JAX-RS Extensions: Providers</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/rt/rs/extensions/search/pom.xml b/rt/rs/extensions/search/pom.xml
index acaf410..4fc393b 100644
--- a/rt/rs/extensions/search/pom.xml
+++ b/rt/rs/extensions/search/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-rt-rs-extension-search</artifactId>
     <packaging>jar</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF JAX-RS Extensions: Search</name>
     <description>Apache CXF JAX-RS Extensions: Search</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/rt/rs/security/cors/pom.xml b/rt/rs/security/cors/pom.xml
index 9c7a058..8455276 100644
--- a/rt/rs/security/cors/pom.xml
+++ b/rt/rs/security/cors/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-rt-rs-security-cors</artifactId>
     <packaging>jar</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF RS Cross-Origin Resource Sharing</name>
     <description>Apache CXF RS XML Security</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/rt/rs/security/oauth-parent/oauth/pom.xml b/rt/rs/security/oauth-parent/oauth/pom.xml
index 1c7dd98..2764ad8 100644
--- a/rt/rs/security/oauth-parent/oauth/pom.xml
+++ b/rt/rs/security/oauth-parent/oauth/pom.xml
@@ -21,7 +21,7 @@
 
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-rt-rs-security-oauth</artifactId>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <packaging>jar</packaging>
     <name>Apache CXF Runtime OAuth 1.0a</name>
@@ -31,7 +31,7 @@
     <parent>
         <artifactId>cxf-rt-rs-security-oauth-parent</artifactId>
         <groupId>org.apache.cxf</groupId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/rs/security/oauth-parent/oauth2/pom.xml b/rt/rs/security/oauth-parent/oauth2/pom.xml
index f14c654..9e2377c 100644
--- a/rt/rs/security/oauth-parent/oauth2/pom.xml
+++ b/rt/rs/security/oauth-parent/oauth2/pom.xml
@@ -21,7 +21,7 @@
 
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-rt-rs-security-oauth2</artifactId>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <packaging>jar</packaging>
     <name>Apache CXF Runtime OAuth 2.0</name>
@@ -31,7 +31,7 @@
     <parent>
         <artifactId>cxf-rt-rs-security-oauth-parent</artifactId>
         <groupId>org.apache.cxf</groupId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/rt/rs/security/oauth-parent/pom.xml b/rt/rs/security/oauth-parent/pom.xml
index 4cf0188..0927df7 100644
--- a/rt/rs/security/oauth-parent/pom.xml
+++ b/rt/rs/security/oauth-parent/pom.xml
@@ -21,7 +21,7 @@
 
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-rt-rs-security-oauth-parent</artifactId>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Apache CXF Runtime RS Security OAuth Parent</name>
     <description>Apache CXF Runtime RS Security OAuth Parent</description>
@@ -30,7 +30,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/rs/security/sso/saml/pom.xml b/rt/rs/security/sso/saml/pom.xml
index 2e615fe..fee1df0 100644
--- a/rt/rs/security/sso/saml/pom.xml
+++ b/rt/rs/security/sso/saml/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-rt-rs-security-sso-saml</artifactId>
     <packaging>jar</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF RS SSO SAML</name>
     <description>Apache CXF RS SSO SAML</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../../../parent/pom.xml</relativePath>
     </parent>
     
diff --git a/rt/rs/security/xml/pom.xml b/rt/rs/security/xml/pom.xml
index 14d54cb..f8914f9 100644
--- a/rt/rs/security/xml/pom.xml
+++ b/rt/rs/security/xml/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-rt-rs-security-xml</artifactId>
     <packaging>jar</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF RS XML Security</name>
     <description>Apache CXF RS XML Security</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/rt/transports/http-jetty/pom.xml b/rt/transports/http-jetty/pom.xml
index ff08f8f..4fb5117 100644
--- a/rt/transports/http-jetty/pom.xml
+++ b/rt/transports/http-jetty/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-rt-transports-http-jetty</artifactId>
     <packaging>jar</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Runtime HTTP Jetty Transport</name>
     <description>Apache CXF Runtime HTTP Jetty Transport</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/transports/http/pom.xml b/rt/transports/http/pom.xml
index cbc1e5e..b10daee 100644
--- a/rt/transports/http/pom.xml
+++ b/rt/transports/http/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-rt-transports-http</artifactId>
     <packaging>jar</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Runtime HTTP Transport</name>
     <description>Apache CXF Runtime HTTP Transport</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/transports/jms/pom.xml b/rt/transports/jms/pom.xml
index f4f3d08..ddd0f54 100644
--- a/rt/transports/jms/pom.xml
+++ b/rt/transports/jms/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-rt-transports-jms</artifactId>
     <packaging>jar</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Runtime JMS Transport</name>
     <description>Apache CXF Runtime JMS Transport</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/rt/transports/local/pom.xml b/rt/transports/local/pom.xml
index 31ec231..21c18a5 100644
--- a/rt/transports/local/pom.xml
+++ b/rt/transports/local/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-rt-transports-local</artifactId>
     <packaging>jar</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Runtime Local Transport</name>
     <description>Apache CXF Runtime Local Transport</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/rt/ws/addr/pom.xml b/rt/ws/addr/pom.xml
index 6a61264..a42ea08 100644
--- a/rt/ws/addr/pom.xml
+++ b/rt/ws/addr/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/rt/ws/mex/pom.xml b/rt/ws/mex/pom.xml
index 7826e1c..b871672 100644
--- a/rt/ws/mex/pom.xml
+++ b/rt/ws/mex/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/rt/ws/policy/pom.xml b/rt/ws/policy/pom.xml
index f4e6a0e..d27cf8f 100644
--- a/rt/ws/policy/pom.xml
+++ b/rt/ws/policy/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
   
diff --git a/rt/ws/rm/pom.xml b/rt/ws/rm/pom.xml
index eb377f5..f0f0873 100644
--- a/rt/ws/rm/pom.xml
+++ b/rt/ws/rm/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/rt/ws/security/pom.xml b/rt/ws/security/pom.xml
index 4e1742c..c6215a4 100644
--- a/rt/ws/security/pom.xml
+++ b/rt/ws/security/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/services/pom.xml b/services/pom.xml
index 4596eef..ff2ec49 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf.services</groupId>
     <artifactId>cxf-services</artifactId>
     <packaging>pom</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Services</name>
     <url>http://cxf.apache.org</url>
 
@@ -29,7 +29,7 @@
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
 
     <modules>
diff --git a/services/sts/pom.xml b/services/sts/pom.xml
index 231d461..4f0870b 100644
--- a/services/sts/pom.xml
+++ b/services/sts/pom.xml
@@ -21,14 +21,14 @@
     <groupId>org.apache.cxf.services.sts</groupId>
     <artifactId>cxf-services-sts</artifactId>
     <packaging>pom</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF STS service</name>
     <url>http://cxf.apache.org</url>
 
     <parent>
         <groupId>org.apache.cxf.services</groupId>
         <artifactId>cxf-services</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/services/sts/sts-core/pom.xml b/services/sts/sts-core/pom.xml
index 44aabfa..81d9930 100644
--- a/services/sts/sts-core/pom.xml
+++ b/services/sts/sts-core/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/services/sts/sts-war/pom.xml b/services/sts/sts-war/pom.xml
index 32ef69f..ef60c33 100644
--- a/services/sts/sts-war/pom.xml
+++ b/services/sts/sts-war/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/services/sts/systests/advanced/pom.xml b/services/sts/systests/advanced/pom.xml
index 9cb8c73..2c80bde 100644
--- a/services/sts/systests/advanced/pom.xml
+++ b/services/sts/systests/advanced/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../../parent/pom.xml</relativePath>
     </parent>
    
diff --git a/services/sts/systests/basic/pom.xml b/services/sts/systests/basic/pom.xml
index c5ff10c..fcf53e1 100644
--- a/services/sts/systests/basic/pom.xml
+++ b/services/sts/systests/basic/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../../parent/pom.xml</relativePath>
     </parent>
    
diff --git a/services/sts/systests/pom.xml b/services/sts/systests/pom.xml
index 388cb18..3cd1d7d 100644
--- a/services/sts/systests/pom.xml
+++ b/services/sts/systests/pom.xml
@@ -21,14 +21,14 @@
     <groupId>org.apache.cxf.services.sts</groupId>
     <artifactId>cxf-services-sts-systests</artifactId>
     <packaging>pom</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF STS systests</name>
     <url>http://cxf.apache.org</url>
 
     <parent>
         <groupId>org.apache.cxf.services.sts</groupId>
         <artifactId>cxf-services-sts</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
 
     <modules>
diff --git a/services/wsn/pom.xml b/services/wsn/pom.xml
index f596836..8166393 100644
--- a/services/wsn/pom.xml
+++ b/services/wsn/pom.xml
@@ -21,14 +21,14 @@
     <groupId>org.apache.cxf.services.wsn</groupId>
     <artifactId>cxf-services-wsn</artifactId>
     <packaging>pom</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF WSN service</name>
     <url>http://cxf.apache.org</url>
 
     <parent>
         <groupId>org.apache.cxf.services</groupId>
         <artifactId>cxf-services</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/services/wsn/wsn-api/pom.xml b/services/wsn/wsn-api/pom.xml
index fa2f0a2..1672095 100644
--- a/services/wsn/wsn-api/pom.xml
+++ b/services/wsn/wsn-api/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf.services.wsn</groupId>
     <artifactId>cxf-services-wsn-api</artifactId>
     <packaging>bundle</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF WSN API</name>
     <description>Apache CXF WSN API</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/services/wsn/wsn-core/pom.xml b/services/wsn/wsn-core/pom.xml
index 7e1fe7f..c10e082 100644
--- a/services/wsn/wsn-core/pom.xml
+++ b/services/wsn/wsn-core/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf.services.wsn</groupId>
     <artifactId>cxf-services-wsn-core</artifactId>
     <packaging>bundle</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF WSN Core</name>
     <description>Apache CXF WSN Core Service</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/services/wsn/wsn-osgi/pom.xml b/services/wsn/wsn-osgi/pom.xml
index 93c5f0c..f980c66 100644
--- a/services/wsn/wsn-osgi/pom.xml
+++ b/services/wsn/wsn-osgi/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf.services.wsn</groupId>
     <artifactId>cxf-services-wsn-osgi</artifactId>
     <packaging>bundle</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF WSN OSGi</name>
     <description>Apache CXF WSN Full OSGi</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/systests/container-integration/grizzly/pom.xml b/systests/container-integration/grizzly/pom.xml
index 288c40d..f7d93f3 100644
--- a/systests/container-integration/grizzly/pom.xml
+++ b/systests/container-integration/grizzly/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.apache.cxf.systests</groupId>
         <artifactId>cxf-systests-container-integration</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>org.apache.cxf.systests</groupId>
     <artifactId>cxf-systests-ci-grizzly</artifactId>
     <name>Apache CXF Container Integration Test Grizzly</name>
     <description>Apache CXF Container Integration Test Grizzly</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
 
     <repositories>
         <repository>
diff --git a/systests/container-integration/pom.xml b/systests/container-integration/pom.xml
index 9731908..e3e079d 100644
--- a/systests/container-integration/pom.xml
+++ b/systests/container-integration/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>cxf-parent</artifactId>
         <groupId>org.apache.cxf</groupId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -29,7 +29,7 @@
     <artifactId>cxf-systests-container-integration</artifactId>
     <name>Apache CXF Container Integration System Tests</name>
     <description>Apache CXF Container Integration System Tests</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <packaging>pom</packaging>
     <url>http://cxf.apache.org</url>
     <modules>
diff --git a/systests/container-integration/webapp/pom.xml b/systests/container-integration/webapp/pom.xml
index 9201b79..5e48607 100644
--- a/systests/container-integration/webapp/pom.xml
+++ b/systests/container-integration/webapp/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.apache.cxf.systests</groupId>
         <artifactId>cxf-systests-container-integration</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>org.apache.cxf.systests</groupId>
     <artifactId>cxf-systests-ci-webapp</artifactId>
     <name>Apache CXF Container Integration Test Webapp</name>
     <description>Apache CXF Container Integration Test Webapp</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <packaging>war</packaging>
     <dependencies>
         <dependency>
diff --git a/systests/databinding/pom.xml b/systests/databinding/pom.xml
index 477e6a3..4c8f197 100644
--- a/systests/databinding/pom.xml
+++ b/systests/databinding/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>cxf-parent</artifactId>
         <groupId>org.apache.cxf</groupId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -29,7 +29,7 @@
     <artifactId>cxf-systests-databinding</artifactId>
     <name>Apache CXF Databinding System Tests</name>
     <description>Apache CXF Databinding System Tests</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <url>http://cxf.apache.org</url>
 
 
diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml
index 8b40465..8b34e79 100644
--- a/systests/jaxrs/pom.xml
+++ b/systests/jaxrs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>cxf-parent</artifactId>
         <groupId>org.apache.cxf</groupId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -29,7 +29,7 @@
     <artifactId>cxf-systests-jaxrs</artifactId>
     <name>Apache CXF JAX-RS System Tests</name>
     <description>Apache CXF JAX-RS System Tests</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <url>http://cxf.apache.org</url>
     
     <dependencies>
diff --git a/systests/jaxws/pom.xml b/systests/jaxws/pom.xml
index 3b5c86a..1b2877d 100644
--- a/systests/jaxws/pom.xml
+++ b/systests/jaxws/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>cxf-parent</artifactId>
         <groupId>org.apache.cxf</groupId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -29,7 +29,7 @@
     <artifactId>cxf-systests-jaxws</artifactId>
     <name>Apache CXF JAX-WS System Tests</name>
     <description>Apache CXF JAX-WS System Tests</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <url>http://cxf.apache.org</url>
 
     <build>
diff --git a/systests/pom.xml b/systests/pom.xml
index 87b53fb..133857f 100644
--- a/systests/pom.xml
+++ b/systests/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf.systests</groupId>
     <artifactId>cxf-systests</artifactId>
     <packaging>pom</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF System Tests</name>
     <description>Apache CXF System Tests</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
 
     <modules>
diff --git a/systests/rs-security/pom.xml b/systests/rs-security/pom.xml
index d9d2bdd..699ecca 100644
--- a/systests/rs-security/pom.xml
+++ b/systests/rs-security/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>cxf-parent</artifactId>
         <groupId>org.apache.cxf</groupId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -29,7 +29,7 @@
     <artifactId>cxf-systests-rs-security</artifactId>
     <name>Apache CXF JAX-RS System Advanced Security Tests</name>
     <description>Apache CXF JAX-RS System Advanced Security Tests</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <url>http://cxf.apache.org</url>
     
 
diff --git a/systests/transport-jms/pom.xml b/systests/transport-jms/pom.xml
index 5ed9628..17d93c1 100644
--- a/systests/transport-jms/pom.xml
+++ b/systests/transport-jms/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>cxf-parent</artifactId>
         <groupId>org.apache.cxf</groupId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -29,7 +29,7 @@
     <artifactId>cxf-systests-transport-jms</artifactId>
     <name>Apache CXF Transport System Tests JMS</name>
     <description>Apache CXF Transport System Tests JMS</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <url>http://cxf.apache.org</url>
 
     <build>
diff --git a/systests/transports/pom.xml b/systests/transports/pom.xml
index 381671f..9ee9b14 100644
--- a/systests/transports/pom.xml
+++ b/systests/transports/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>cxf-parent</artifactId>
         <groupId>org.apache.cxf</groupId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -29,7 +29,7 @@
     <artifactId>cxf-systests-transports</artifactId>
     <name>Apache CXF Transport System Tests</name>
     <description>Apache CXF Transport System Tests</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <url>http://cxf.apache.org</url>
     <build>
         <plugins>
diff --git a/systests/uncategorized/pom.xml b/systests/uncategorized/pom.xml
index 87d2392..c2ed1c8 100644
--- a/systests/uncategorized/pom.xml
+++ b/systests/uncategorized/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>cxf-parent</artifactId>
         <groupId>org.apache.cxf</groupId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -29,7 +29,7 @@
     <artifactId>cxf-systests-uncategorized</artifactId>
     <name>Apache CXF Uncategorized System Tests</name>
     <description>Apache CXF Uncategorized System Tests</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <url>http://cxf.apache.org</url>
     <build>
         <plugins>
diff --git a/systests/ws-rm/pom.xml b/systests/ws-rm/pom.xml
index 944ae59..4b2af9e 100644
--- a/systests/ws-rm/pom.xml
+++ b/systests/ws-rm/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>cxf-parent</artifactId>
         <groupId>org.apache.cxf</groupId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -29,7 +29,7 @@
     <artifactId>cxf-systests-ws-rm</artifactId>
     <name>Apache CXF WS-RM Specifications System Tests</name>
     <description>Apache CXF WS-RM Specifications System Tests</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <url>http://cxf.apache.org</url>
 
     <dependencies>
diff --git a/systests/ws-security-examples/pom.xml b/systests/ws-security-examples/pom.xml
index 1f04d64..436bfb1 100644
--- a/systests/ws-security-examples/pom.xml
+++ b/systests/ws-security-examples/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>cxf-parent</artifactId>
         <groupId>org.apache.cxf</groupId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -28,7 +28,7 @@
     <artifactId>cxf-systests-ws-security-examples</artifactId>
     <name>Apache CXF WS-Security Interop System Tests</name>
     <description>Apache CXF WS-Security Interop System Tests</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <url>http://cxf.apache.org</url>
     
     <build>
diff --git a/systests/ws-security/pom.xml b/systests/ws-security/pom.xml
index 46b0c6d..18252e6 100644
--- a/systests/ws-security/pom.xml
+++ b/systests/ws-security/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>cxf-parent</artifactId>
         <groupId>org.apache.cxf</groupId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -28,7 +28,7 @@
     <artifactId>cxf-systests-ws-security</artifactId>
     <name>Apache CXF WS-Security System Tests</name>
     <description>Apache CXF WS-Security System Tests</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <url>http://cxf.apache.org</url>
     
     <build>
diff --git a/systests/ws-specs/pom.xml b/systests/ws-specs/pom.xml
index 86f887a..5973ad3 100644
--- a/systests/ws-specs/pom.xml
+++ b/systests/ws-specs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>cxf-parent</artifactId>
         <groupId>org.apache.cxf</groupId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -29,7 +29,7 @@
     <artifactId>cxf-systests-ws-specs</artifactId>
     <name>Apache CXF WS-* Specifications System Tests</name>
     <description>Apache CXF WS-* Specifications System Tests</description>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <url>http://cxf.apache.org</url>
     <build>
         <plugins>
diff --git a/systests/wsdl_maven/codegen/pom.xml b/systests/wsdl_maven/codegen/pom.xml
index 44f8f28..9d8ca6a 100644
--- a/systests/wsdl_maven/codegen/pom.xml
+++ b/systests/wsdl_maven/codegen/pom.xml
@@ -20,13 +20,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.systests.wsdl_maven</groupId>
     <artifactId>cxf-systests-codegen</artifactId>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Test for generating code from wsdl in repo</name>
     <description>Test for generating code from wsdl in repo</description>
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <build>
diff --git a/systests/wsdl_maven/java2ws/pom.xml b/systests/wsdl_maven/java2ws/pom.xml
index e7deaf4..cd7e397 100644
--- a/systests/wsdl_maven/java2ws/pom.xml
+++ b/systests/wsdl_maven/java2ws/pom.xml
@@ -20,13 +20,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.systests.wsdl_maven</groupId>
     <artifactId>cxf-systests-java2ws</artifactId>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Test for writing wsdl to repo</name>
     <description>Test for writing wsdl to repo</description>
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <build>
diff --git a/systests/wsdl_maven/pom.xml b/systests/wsdl_maven/pom.xml
index 4e6a812..acbde95 100644
--- a/systests/wsdl_maven/pom.xml
+++ b/systests/wsdl_maven/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf.systests</groupId>
     <artifactId>cxf-wsdl-maven</artifactId>
     <packaging>pom</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF System Tests for Maven Plugins</name>
     <description>Apache CXF System Tests for Maven Plugins</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf.systests</groupId>
         <artifactId>cxf-systests</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
 
     <modules>
diff --git a/testutils/pom.xml b/testutils/pom.xml
index 2f06f5d..82a1a53 100644
--- a/testutils/pom.xml
+++ b/testutils/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-testutils</artifactId>
     <packaging>jar</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Test Utilities</name>
     <description>Apache CXF Test Utilities</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/tools/common/pom.xml b/tools/common/pom.xml
index 904cbfc..09b3325 100644
--- a/tools/common/pom.xml
+++ b/tools/common/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-tools-common</artifactId>
     <packaging>jar</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Command Line Tools Common</name>
     <description>Apache CXF Command Line Tools Common</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/tools/corba/pom.xml b/tools/corba/pom.xml
index a420b79..1eb974a 100644
--- a/tools/corba/pom.xml
+++ b/tools/corba/pom.xml
@@ -22,7 +22,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-tools-corba</artifactId>
     <packaging>jar</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Command Line Tools CORBA</name>
     <description>Apache CXF Command Line Tools CORBA</description>
     <url>http://cxf.apache.org</url>
@@ -30,7 +30,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/tools/javato/pom.xml b/tools/javato/pom.xml
index 5619c14..f339716 100644
--- a/tools/javato/pom.xml
+++ b/tools/javato/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-tools-javato</artifactId>
     <packaging>pom</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Command Line Tools JavaTo</name>
     <description>Apache CXF Command Line Tools JavaTo</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-tools</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
 
     <modules>
diff --git a/tools/javato/ws/pom.xml b/tools/javato/ws/pom.xml
index 9f1cab4..a71c559 100644
--- a/tools/javato/ws/pom.xml
+++ b/tools/javato/ws/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-tools-java2ws</artifactId>
     <packaging>jar</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Command Line Tools JavaTo WS</name>
     <description>Apache CXF Command Line Tools JavaTo WS</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/tools/pom.xml b/tools/pom.xml
index f36efdb..3adc619 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-tools</artifactId>
     <packaging>pom</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Command Line Tools</name>
     <description>Apache CXF Command Line Tools</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
 
     <modules>
diff --git a/tools/validator/pom.xml b/tools/validator/pom.xml
index b477948..2cd7d83 100644
--- a/tools/validator/pom.xml
+++ b/tools/validator/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-tools-validator</artifactId>
     <packaging>jar</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Command Line Tools Validator</name>
     <description>Apache CXF Command Line Tools Validator</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/tools/wadlto/jaxrs/pom.xml b/tools/wadlto/jaxrs/pom.xml
index e81af0e..1790435 100644
--- a/tools/wadlto/jaxrs/pom.xml
+++ b/tools/wadlto/jaxrs/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-tools-wadlto-jaxrs</artifactId>
     <packaging>jar</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Command Line Tools WADLTo JAXRS Frontend</name>
     <description>Apache CXF Command Line Tools WADLTo JAXRS Frontend</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/tools/wadlto/pom.xml b/tools/wadlto/pom.xml
index e740425..1b5c691 100644
--- a/tools/wadlto/pom.xml
+++ b/tools/wadlto/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-tools-wadlto</artifactId>
     <packaging>pom</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Command Line Tools WADLTo</name>
     <description>Apache CXF Command Line Tools WADLTo</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-tools</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
 
     <modules>
diff --git a/tools/wsdlto/core/pom.xml b/tools/wsdlto/core/pom.xml
index 022a932..1c68748 100644
--- a/tools/wsdlto/core/pom.xml
+++ b/tools/wsdlto/core/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-tools-wsdlto-core</artifactId>
     <packaging>jar</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Command Line Tools WSDLTo Core</name>
     <description>Apache CXF Command Line Tools WSDLTo Core</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/tools/wsdlto/databinding/jaxb/pom.xml b/tools/wsdlto/databinding/jaxb/pom.xml
index 0f4bde8..a280879 100644
--- a/tools/wsdlto/databinding/jaxb/pom.xml
+++ b/tools/wsdlto/databinding/jaxb/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-tools-wsdlto-databinding-jaxb</artifactId>
     <packaging>jar</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Command Line Tools WSDLTo JAXB Databinding</name>
     <description>Apache CXF Command Line Tools WSDLTo JAXB Databinding</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/tools/wsdlto/frontend/javascript/pom.xml b/tools/wsdlto/frontend/javascript/pom.xml
index f11a805..714af46 100644
--- a/tools/wsdlto/frontend/javascript/pom.xml
+++ b/tools/wsdlto/frontend/javascript/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-tools-wsdlto-frontend-javascript</artifactId>
     <packaging>jar</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Command Line Tools WSDL to JavaScript Front End</name>
     <description>Apache CXF Command Line Tools WSDL to JavaScript Front End</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/tools/wsdlto/frontend/jaxws/pom.xml b/tools/wsdlto/frontend/jaxws/pom.xml
index 60ba4a3..3d27a55 100644
--- a/tools/wsdlto/frontend/jaxws/pom.xml
+++ b/tools/wsdlto/frontend/jaxws/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-tools-wsdlto-frontend-jaxws</artifactId>
     <packaging>jar</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Command Line Tools WSDLTo JAXWS Frontend</name>
     <description>Apache CXF Command Line Tools WSDLTo JAXWS Frontend</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/tools/wsdlto/misc/pom.xml b/tools/wsdlto/misc/pom.xml
index b7a1132..5aa14d7 100644
--- a/tools/wsdlto/misc/pom.xml
+++ b/tools/wsdlto/misc/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-tools-misctools</artifactId>
     <packaging>jar</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Command Line Tools WSDLTo Misctools</name>
     <description>Apache CXF Command Line Tools WSDLTo Misctools</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/tools/wsdlto/pom.xml b/tools/wsdlto/pom.xml
index ac0ace9..566a64b 100644
--- a/tools/wsdlto/pom.xml
+++ b/tools/wsdlto/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-tools-wsdlto</artifactId>
     <packaging>pom</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Command Line Tools WSDLTo</name>
     <description>Apache CXF Command Line Tools WSDLTo</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-tools</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
     </parent>
 
     <modules>
diff --git a/tools/wsdlto/test/pom.xml b/tools/wsdlto/test/pom.xml
index 69906f5..40865c8 100644
--- a/tools/wsdlto/test/pom.xml
+++ b/tools/wsdlto/test/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-tools-wsdlto-test</artifactId>
     <packaging>jar</packaging>
-    <version>2.6.17</version>
+    <version>2.6.18-SNAPSHOT</version>
     <name>Apache CXF Command Line Tools WSDLTo Test</name>
     <description>Apache CXF Command Line Tools WSDLTo Test</description>
     <url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>2.6.17</version>
+        <version>2.6.18-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>