diff --git a/core/pom.xml b/core/pom.xml
index d5f5194..e7b0b4a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml
index 75762b5..6f63c56 100644
--- a/distribution/javadoc/pom.xml
+++ b/distribution/javadoc/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../parent</relativePath>
     </parent>
     <dependencies>
diff --git a/distribution/manifest/pom.xml b/distribution/manifest/pom.xml
index c8b9c41..ef19ea7 100644
--- a/distribution/manifest/pom.xml
+++ b/distribution/manifest/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../parent</relativePath>
     </parent>
     <properties>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 438bb07..73f5d25 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../parent</relativePath>
     </parent>
     <properties>
diff --git a/distribution/src/main/release/samples/aegis/pom.xml b/distribution/src/main/release/samples/aegis/pom.xml
index 1d99a75..09eaccb 100644
--- a/distribution/src/main/release/samples/aegis/pom.xml
+++ b/distribution/src/main/release/samples/aegis/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -99,24 +99,24 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-databinding-aegis</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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 644a867..c768f42 100644
--- a/distribution/src/main/release/samples/aegis_standalone/pom.xml
+++ b/distribution/src/main/release/samples/aegis_standalone/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -88,7 +88,7 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-databinding-aegis</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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 19f67d9..900e2c3 100644
--- a/distribution/src/main/release/samples/callback/pom.xml
+++ b/distribution/src/main/release/samples/callback/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -117,17 +117,17 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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 29a819f..bd62c0d 100644
--- a/distribution/src/main/release/samples/configuration_interceptor/pom.xml
+++ b/distribution/src/main/release/samples/configuration_interceptor/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -120,22 +120,22 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-management</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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 66915b9..ca75ec4 100644
--- a/distribution/src/main/release/samples/corba/bank/pom.xml
+++ b/distribution/src/main/release/samples/corba/bank/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -117,17 +117,17 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-bindings-corba</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-tools-common</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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 5a07538..45c71bf 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
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -224,17 +224,17 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-bindings-corba</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-tools-common</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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 476b35d..8a7d02c 100644
--- a/distribution/src/main/release/samples/corba/hello_world/pom.xml
+++ b/distribution/src/main/release/samples/corba/hello_world/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -269,17 +269,17 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-bindings-corba</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-tools-common</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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 fbd9179..2df09fa 100644
--- a/distribution/src/main/release/samples/groovy_spring_support/pom.xml
+++ b/distribution/src/main/release/samples/groovy_spring_support/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -99,18 +99,18 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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 7df953f..4293dc8 100644
--- a/distribution/src/main/release/samples/in_jvm_transport/pom.xml
+++ b/distribution/src/main/release/samples/in_jvm_transport/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -87,23 +87,23 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-bindings-coloc</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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 806b294..bf5834d 100644
--- a/distribution/src/main/release/samples/java_first_jaxws/pom.xml
+++ b/distribution/src/main/release/samples/java_first_jaxws/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -113,12 +113,12 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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 21c8b16..d3bac74 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
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -82,18 +82,18 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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 fc04602..2051716 100644
--- a/distribution/src/main/release/samples/java_first_jms/pom.xml
+++ b/distribution/src/main/release/samples/java_first_jms/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -101,12 +101,12 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-jms</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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 fe3d898..f19364a 100644
--- a/distribution/src/main/release/samples/java_first_pojo/pom.xml
+++ b/distribution/src/main/release/samples/java_first_pojo/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -82,18 +82,18 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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 6201c6b..6d1f153 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
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -96,17 +96,17 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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 963a24a..4b92d04 100644
--- a/distribution/src/main/release/samples/jax_rs/basic/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/basic/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -83,18 +83,18 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>javax.ws.rs</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 033efe1..ca515b3 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
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
diff --git a/distribution/src/main/release/samples/jax_rs/basic_oidc/pom.xml b/distribution/src/main/release/samples/jax_rs/basic_oidc/pom.xml
index f0d1119..07199b2 100644
--- a/distribution/src/main/release/samples/jax_rs/basic_oidc/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/basic_oidc/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -35,22 +35,22 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-security-jose-jaxrs</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-security-sso-oidc</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency> 
         <dependency>
             <groupId>javax.ws.rs</groupId>
diff --git a/distribution/src/main/release/samples/jax_rs/big_query/pom.xml b/distribution/src/main/release/samples/jax_rs/big_query/pom.xml
index 3b96788..56233b3 100644
--- a/distribution/src/main/release/samples/jax_rs/big_query/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/big_query/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -35,27 +35,27 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-security-jose-jaxrs</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-extension-providers</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-security-sso-oidc</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency> 
         <dependency>
             <groupId>javax.ws.rs</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 ec70dfe..cd42a9a 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
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -83,23 +83,23 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-extension-providers</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.codehaus.jettison</groupId>
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml b/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml
index 58e67ae..5ebf94b 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../..</relativePath>
     </parent>
 
@@ -124,23 +124,23 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-service-description-swagger</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml b/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml
index fdf1200..dec2863 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../..</relativePath>
     </parent>
 
@@ -69,17 +69,17 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-service-description-swagger</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
           <groupId>com.fasterxml.jackson.jaxrs</groupId>
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/pom.xml b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/pom.xml
index 933ac10..df82617 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../..</relativePath>
     </parent>
 
@@ -71,17 +71,17 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-service-description-swagger</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml
index a33bd9f..7e89d78 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../..</relativePath>
     </parent>
 
@@ -63,23 +63,23 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-service-description-swagger</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml
index 86e9594..6f45b7f 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../..</relativePath>
     </parent>
 
@@ -69,17 +69,17 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-service-description-swagger</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>javax.ws.rs</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 f9b6640..ba18e34 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
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
diff --git a/distribution/src/main/release/samples/jax_rs/search/pom.xml b/distribution/src/main/release/samples/jax_rs/search/pom.xml
index 04f0a90..e3229ad 100644
--- a/distribution/src/main/release/samples/jax_rs/search/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/search/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -84,33 +84,33 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-extension-search</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-extension-providers</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>                 
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-security-cors</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency> 
         <dependency>
             <groupId>org.apache.lucene</groupId>
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
index 56955bb..bbc6f09 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../..</relativePath>
     </parent>
     <groupId>org.apache.cxf.samples</groupId> 
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
index 01f6504..bc7b5ca 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../..</relativePath>
     </parent>
     <artifactId>spring-boot-sample-rs-scan-app</artifactId>
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/pom.xml
index cec38c9..9000fc7 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../..</relativePath>
     </parent>
     <artifactId>spring-boot-sample-rs-scan-client</artifactId>
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
index afb9c64..4c72191 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../..</relativePath>
     </parent>
     <artifactId>spring-boot-sample-rs-scan-eureka</artifactId>
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 9c2b316..59a1ac4 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
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -89,18 +89,18 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_brave/pom.xml b/distribution/src/main/release/samples/jax_rs/tracing_brave/pom.xml
index 40015af..0884673 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_brave/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_brave/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -83,33 +83,33 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-client</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>    
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-integration-tracing-brave</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-extension-providers</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>javax.json</groupId>
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/pom.xml b/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/pom.xml
index 54daa01..9cd1733 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -36,33 +36,33 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-client</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>    
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-integration-tracing-brave</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-extension-providers</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>javax.json</groupId>
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_htrace/pom.xml b/distribution/src/main/release/samples/jax_rs/tracing_htrace/pom.xml
index f34e337..b12db4a 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_htrace/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_htrace/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -83,33 +83,33 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-client</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>    
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-integration-tracing-htrace</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-extension-providers</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>javax.json</groupId>
diff --git a/distribution/src/main/release/samples/jax_rs/websocket/pom.xml b/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
index 0302c00..6a39c0e 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -129,7 +129,7 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <!-- This dependency is needed if you're using the Jetty container -->
         <dependency>
@@ -171,17 +171,17 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-websocket</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml b/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml
index d460213..3db0840 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -68,17 +68,17 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-websocket</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
index 38709a3..9cd75ab 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -82,17 +82,17 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-websocket</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>javax.ws.rs</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 c5eb545..de573d0 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
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -82,23 +82,23 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-databinding-aegis</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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 426f5ab..205f7f0 100644
--- a/distribution/src/main/release/samples/jaxws_async/pom.xml
+++ b/distribution/src/main/release/samples/jaxws_async/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -127,17 +127,17 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-hc</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -149,7 +149,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>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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 54954f7..af5d778 100644
--- a/distribution/src/main/release/samples/jaxws_dispatch_provider/pom.xml
+++ b/distribution/src/main/release/samples/jaxws_dispatch_provider/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -114,18 +114,18 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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 148d5d5..53db2d0 100644
--- a/distribution/src/main/release/samples/jaxws_handlers/pom.xml
+++ b/distribution/src/main/release/samples/jaxws_handlers/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -114,18 +114,18 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml b/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
index 627b1ce..80c998d 100644
--- a/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
+++ b/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>spring-boot-sample-ws-cxf</artifactId>
diff --git a/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/pom.xml b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/pom.xml
index 8e690e1..b118aac 100644
--- a/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/pom.xml
+++ b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>..</relativePath>
     </parent>
     <properties>
@@ -36,23 +36,23 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-integration-tracing-brave</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>
diff --git a/distribution/src/main/release/samples/jms_pubsub/pom.xml b/distribution/src/main/release/samples/jms_pubsub/pom.xml
index e4e54b9..ab53bf7 100644
--- a/distribution/src/main/release/samples/jms_pubsub/pom.xml
+++ b/distribution/src/main/release/samples/jms_pubsub/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -36,7 +36,7 @@
             <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-codegen-plugin</artifactId>
-                <version>3.1.16-SNAPSHOT</version>
+                <version>3.1.16</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>
@@ -137,12 +137,12 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-jms</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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 b704e1c..8c0849a 100644
--- a/distribution/src/main/release/samples/jms_queue/pom.xml
+++ b/distribution/src/main/release/samples/jms_queue/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -137,12 +137,12 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-jms</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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 ecd6220..ac61bf8 100644
--- a/distribution/src/main/release/samples/jms_spec_demo/pom.xml
+++ b/distribution/src/main/release/samples/jms_spec_demo/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -137,12 +137,12 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-jms</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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 0212687..71cdb84 100644
--- a/distribution/src/main/release/samples/jms_spring_config/pom.xml
+++ b/distribution/src/main/release/samples/jms_spring_config/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -146,12 +146,12 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-jms</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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 b7b1a4f..758a029 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
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -59,22 +59,22 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-javascript</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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 810621a..8469716 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
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -111,22 +111,22 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-javascript</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/distribution/src/main/release/samples/js_client/pom.xml b/distribution/src/main/release/samples/js_client/pom.xml
index 9447c85..d99f780 100644
--- a/distribution/src/main/release/samples/js_client/pom.xml
+++ b/distribution/src/main/release/samples/js_client/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -113,22 +113,22 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-javascript</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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 5b2851c..3b64ed8 100644
--- a/distribution/src/main/release/samples/js_provider/pom.xml
+++ b/distribution/src/main/release/samples/js_provider/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -128,18 +128,18 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-js</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/distribution/src/main/release/samples/logbrowser-blueprint/pom.xml b/distribution/src/main/release/samples/logbrowser-blueprint/pom.xml
index 92c7caa..e1490d2 100644
--- a/distribution/src/main/release/samples/logbrowser-blueprint/pom.xml
+++ b/distribution/src/main/release/samples/logbrowser-blueprint/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>..</relativePath>
     </parent>
     <build>
diff --git a/distribution/src/main/release/samples/logbrowser/pom.xml b/distribution/src/main/release/samples/logbrowser/pom.xml
index caed16b..c31d9e5 100644
--- a/distribution/src/main/release/samples/logbrowser/pom.xml
+++ b/distribution/src/main/release/samples/logbrowser/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>..</relativePath>
     </parent>
     <build>
diff --git a/distribution/src/main/release/samples/mtom/pom.xml b/distribution/src/main/release/samples/mtom/pom.xml
index f22190e..90c09ef 100644
--- a/distribution/src/main/release/samples/mtom/pom.xml
+++ b/distribution/src/main/release/samples/mtom/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -115,18 +115,18 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
diff --git a/distribution/src/main/release/samples/oauth/client/pom.xml b/distribution/src/main/release/samples/oauth/client/pom.xml
index 80e7e5f..52982b1 100644
--- a/distribution/src/main/release/samples/oauth/client/pom.xml
+++ b/distribution/src/main/release/samples/oauth/client/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <build>
diff --git a/distribution/src/main/release/samples/oauth/server/pom.xml b/distribution/src/main/release/samples/oauth/server/pom.xml
index 174c7dc..f5e068d 100644
--- a/distribution/src/main/release/samples/oauth/server/pom.xml
+++ b/distribution/src/main/release/samples/oauth/server/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <build>
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 5d42bdb..67d7ce3 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -22,7 +22,7 @@
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>cxf-samples</artifactId>
     <packaging>pom</packaging>
-    <version>3.1.16-SNAPSHOT</version>
+    <version>3.1.16</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 8ba57bc..0328782 100644
--- a/distribution/src/main/release/samples/restful_dispatch/pom.xml
+++ b/distribution/src/main/release/samples/restful_dispatch/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -82,23 +82,23 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>javax.ws.rs</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 535f8aa..082f1bd 100644
--- a/distribution/src/main/release/samples/ruby_spring_support/pom.xml
+++ b/distribution/src/main/release/samples/ruby_spring_support/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -99,18 +99,18 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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 e323dc3..95ce4f3 100644
--- a/distribution/src/main/release/samples/soap_header/pom.xml
+++ b/distribution/src/main/release/samples/soap_header/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -114,18 +114,18 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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 36ba081..269e6ca 100644
--- a/distribution/src/main/release/samples/sts/pom.xml
+++ b/distribution/src/main/release/samples/sts/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>..</relativePath>
     </parent>
     <properties>
diff --git a/distribution/src/main/release/samples/throttling/pom.xml b/distribution/src/main/release/samples/throttling/pom.xml
index d4faf27..3fe86b4 100644
--- a/distribution/src/main/release/samples/throttling/pom.xml
+++ b/distribution/src/main/release/samples/throttling/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <wsdl.location>${basedir}/src/main/config/hello_world.wsdl</wsdl.location>
diff --git a/distribution/src/main/release/samples/ws_addressing/pom.xml b/distribution/src/main/release/samples/ws_addressing/pom.xml
index 552e4b0..6129815 100644
--- a/distribution/src/main/release/samples/ws_addressing/pom.xml
+++ b/distribution/src/main/release/samples/ws_addressing/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -118,17 +118,17 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/distribution/src/main/release/samples/ws_discovery/pom.xml b/distribution/src/main/release/samples/ws_discovery/pom.xml
index 916e9bf..ad9aa6b 100644
--- a/distribution/src/main/release/samples/ws_discovery/pom.xml
+++ b/distribution/src/main/release/samples/ws_discovery/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -37,22 +37,22 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf.services.ws-discovery</groupId>
             <artifactId>cxf-services-ws-discovery-api</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf.services.ws-discovery</groupId>
             <artifactId>cxf-services-ws-discovery-service</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/distribution/src/main/release/samples/ws_eventing/pom.xml b/distribution/src/main/release/samples/ws_eventing/pom.xml
index 9679e3d..dea7e1f 100644
--- a/distribution/src/main/release/samples/ws_eventing/pom.xml
+++ b/distribution/src/main/release/samples/ws_eventing/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <dependencies>
         <dependency>
diff --git a/distribution/src/main/release/samples/ws_notification/pom.xml b/distribution/src/main/release/samples/ws_notification/pom.xml
index 2ca6cdb..1e83ebd 100644
--- a/distribution/src/main/release/samples/ws_notification/pom.xml
+++ b/distribution/src/main/release/samples/ws_notification/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -82,32 +82,32 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-addr</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-policy</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf.services.wsn</groupId>
             <artifactId>cxf-services-wsn-core</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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 5c26912..82c2835 100644
--- a/distribution/src/main/release/samples/ws_policy/pom.xml
+++ b/distribution/src/main/release/samples/ws_policy/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -113,17 +113,17 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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 5e10659..acae5e6 100644
--- a/distribution/src/main/release/samples/ws_rm/pom.xml
+++ b/distribution/src/main/release/samples/ws_rm/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -108,23 +108,23 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-rm</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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 151fa55..14c6ef8 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
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -165,38 +165,38 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-rm</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-security</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-addr</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-policy</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/distribution/src/main/release/samples/ws_security/sign_enc_policy/pom.xml b/distribution/src/main/release/samples/ws_security/sign_enc_policy/pom.xml
index db4567b..0e900d9 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc_policy/pom.xml
+++ b/distribution/src/main/release/samples/ws_security/sign_enc_policy/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../..</relativePath>
     </parent>
     <build>
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 fdc316d..63c691e 100644
--- a/distribution/src/main/release/samples/ws_security/ut/pom.xml
+++ b/distribution/src/main/release/samples/ws_security/ut/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -154,23 +154,23 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-security</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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 d94297e..9e7c416 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
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../..</relativePath>
     </parent>
     <build>
diff --git a/distribution/src/main/release/samples/wsdl_first/pom.xml b/distribution/src/main/release/samples/wsdl_first/pom.xml
index 1195f74..3347f83 100644
--- a/distribution/src/main/release/samples/wsdl_first/pom.xml
+++ b/distribution/src/main/release/samples/wsdl_first/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -249,22 +249,22 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-management</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-features-metrics</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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 2ff5d6b..b729c41 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
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -112,18 +112,18 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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 1eafb37..1dc806c 100644
--- a/distribution/src/main/release/samples/wsdl_first_https/pom.xml
+++ b/distribution/src/main/release/samples/wsdl_first_https/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <wsdl.location>${basedir}/src/main/config/hello_world.wsdl</wsdl.location>
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 b4c4fee..345a52f 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
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -114,18 +114,18 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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 8500d56..d5f494a 100644
--- a/distribution/src/main/release/samples/wsdl_first_rpclit/pom.xml
+++ b/distribution/src/main/release/samples/wsdl_first_rpclit/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -114,18 +114,18 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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 f5a22e0..ce587f1 100644
--- a/distribution/src/main/release/samples/wsdl_first_soap12/pom.xml
+++ b/distribution/src/main/release/samples/wsdl_first_soap12/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -114,18 +114,18 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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 146455a..b0b718a 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
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -114,18 +114,18 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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 5166262..cc56364 100644
--- a/distribution/src/main/release/samples/wsdl_first_xmlbeans/pom.xml
+++ b/distribution/src/main/release/samples/wsdl_first_xmlbeans/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -129,23 +129,23 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-databinding-xmlbeans</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</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>3.1.16-SNAPSHOT</version>
+            <version>3.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/integration/cdi/pom.xml b/integration/cdi/pom.xml
index 16dcbbc..4b36fb0 100644
--- a/integration/cdi/pom.xml
+++ b/integration/cdi/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     
diff --git a/integration/jca/pom.xml b/integration/jca/pom.xml
index 62ca82b..5c56348 100644
--- a/integration/jca/pom.xml
+++ b/integration/jca/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/integration/pom.xml b/integration/pom.xml
index 05fdc94..0c6009e 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <modules>
         <module>jca</module>
diff --git a/integration/spring-boot/autoconfigure/pom.xml b/integration/spring-boot/autoconfigure/pom.xml
index 18a85d3..632096d 100644
--- a/integration/spring-boot/autoconfigure/pom.xml
+++ b/integration/spring-boot/autoconfigure/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <build>
diff --git a/integration/spring-boot/pom.xml b/integration/spring-boot/pom.xml
index b6ae231..1943756 100644
--- a/integration/spring-boot/pom.xml
+++ b/integration/spring-boot/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-integration</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <modules>
         <module>autoconfigure</module>
diff --git a/integration/spring-boot/starter-jaxrs/pom.xml b/integration/spring-boot/starter-jaxrs/pom.xml
index c4ef805..ab77a06 100644
--- a/integration/spring-boot/starter-jaxrs/pom.xml
+++ b/integration/spring-boot/starter-jaxrs/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/integration/spring-boot/starter-jaxws/pom.xml b/integration/spring-boot/starter-jaxws/pom.xml
index db9073f..04e03c0 100644
--- a/integration/spring-boot/starter-jaxws/pom.xml
+++ b/integration/spring-boot/starter-jaxws/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/integration/tracing/tracing-brave/pom.xml b/integration/tracing/tracing-brave/pom.xml
index ee28391..03e1e1e 100644
--- a/integration/tracing/tracing-brave/pom.xml
+++ b/integration/tracing/tracing-brave/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     
diff --git a/integration/tracing/tracing-htrace/pom.xml b/integration/tracing/tracing-htrace/pom.xml
index f5f708d..50e1f93 100644
--- a/integration/tracing/tracing-htrace/pom.xml
+++ b/integration/tracing/tracing-htrace/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     
diff --git a/maven-plugins/archetypes/cxf-jaxrs-service/pom.xml b/maven-plugins/archetypes/cxf-jaxrs-service/pom.xml
index 829a144..cd5bf78 100644
--- a/maven-plugins/archetypes/cxf-jaxrs-service/pom.xml
+++ b/maven-plugins/archetypes/cxf-jaxrs-service/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <groupId>org.apache.cxf.archetype</groupId>
diff --git a/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml b/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml
index e52e563..8141c90 100644
--- a/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml
+++ b/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <groupId>org.apache.cxf.archetype</groupId>
     <artifactId>cxf-jaxws-javafirst</artifactId>
-    <version>3.1.16-SNAPSHOT</version>
+    <version>3.1.16</version>
     <packaging>maven-archetype</packaging>
     <name>Apache CXF Archetype - Simple JAX-WS Java First</name>
     <description>Creates a project for developing a Web service starting from Java code</description>
diff --git a/maven-plugins/archetypes/pom.xml b/maven-plugins/archetypes/pom.xml
index c5eafd1..8665fbe 100644
--- a/maven-plugins/archetypes/pom.xml
+++ b/maven-plugins/archetypes/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-maven-plugins</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <modules>
         <module>cxf-jaxws-javafirst</module>
diff --git a/maven-plugins/codegen-plugin/pom.xml b/maven-plugins/codegen-plugin/pom.xml
index 90fa4f2..f9a15ad 100644
--- a/maven-plugins/codegen-plugin/pom.xml
+++ b/maven-plugins/codegen-plugin/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-maven-plugins</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <dependencies>
         <dependency>
diff --git a/maven-plugins/corba/pom.xml b/maven-plugins/corba/pom.xml
index 5ec2cd9..07bde32 100644
--- a/maven-plugins/corba/pom.xml
+++ b/maven-plugins/corba/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-maven-plugins</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <dependencies>
         <dependency>
diff --git a/maven-plugins/java2wadl-plugin/pom.xml b/maven-plugins/java2wadl-plugin/pom.xml
index f9c9ca8..a757c3f 100644
--- a/maven-plugins/java2wadl-plugin/pom.xml
+++ b/maven-plugins/java2wadl-plugin/pom.xml
@@ -22,7 +22,7 @@
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-java2wadl-plugin</artifactId>
     <packaging>maven-plugin</packaging>
-    <version>3.1.16-SNAPSHOT</version>
+    <version>3.1.16</version>
     <name>Apache CXF Java2WADL Maven2 Plugin</name>
     <description>Apache CXF Java2WADL 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>3.1.16-SNAPSHOT</version>
+      <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.manifest.location />
diff --git a/maven-plugins/java2ws-plugin/pom.xml b/maven-plugins/java2ws-plugin/pom.xml
index 17a6150..8fd8a75 100644
--- a/maven-plugins/java2ws-plugin/pom.xml
+++ b/maven-plugins/java2ws-plugin/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-maven-plugins</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <dependencies>
         <dependency>
diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml
index cf25d4e..3721eab 100644
--- a/maven-plugins/pom.xml
+++ b/maven-plugins/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../parent</relativePath>
     </parent>
     <prerequisites>
diff --git a/maven-plugins/wadl2java-plugin/pom.xml b/maven-plugins/wadl2java-plugin/pom.xml
index 773e5a5..e101fc6 100644
--- a/maven-plugins/wadl2java-plugin/pom.xml
+++ b/maven-plugins/wadl2java-plugin/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-maven-plugins</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <dependencies>
         <dependency>
diff --git a/maven-plugins/wsdl-validator-plugin/pom.xml b/maven-plugins/wsdl-validator-plugin/pom.xml
index 9ce3e0c..b39151f 100644
--- a/maven-plugins/wsdl-validator-plugin/pom.xml
+++ b/maven-plugins/wsdl-validator-plugin/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-maven-plugins</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <dependencies>
         <dependency>
diff --git a/osgi/bundle/compatible/pom.xml b/osgi/bundle/compatible/pom.xml
index e002a49..8803d66 100644
--- a/osgi/bundle/compatible/pom.xml
+++ b/osgi/bundle/compatible/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-bundle-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <properties>
         <cxf.osgi.symbolic.name>${project.groupId}.bundle</cxf.osgi.symbolic.name>
diff --git a/osgi/bundle/pom.xml b/osgi/bundle/pom.xml
index a48f94f..0e49775 100644
--- a/osgi/bundle/pom.xml
+++ b/osgi/bundle/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../parent</relativePath>
     </parent>
     <properties>
diff --git a/osgi/itests-felix/pom.xml b/osgi/itests-felix/pom.xml
index 778f14b..b1d44d2 100644
--- a/osgi/itests-felix/pom.xml
+++ b/osgi/itests-felix/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <groupId>org.apache.cxf.osgi.itests</groupId>
diff --git a/osgi/itests/pom.xml b/osgi/itests/pom.xml
index 7414c8b..4e179c1 100644
--- a/osgi/itests/pom.xml
+++ b/osgi/itests/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <groupId>org.apache.cxf.osgi.itests</groupId>
diff --git a/osgi/karaf/commands/pom.xml b/osgi/karaf/commands/pom.xml
index 872f828..a96ab22 100644
--- a/osgi/karaf/commands/pom.xml
+++ b/osgi/karaf/commands/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.cxf.karaf</groupId>
         <artifactId>karaf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <artifactId>cxf-karaf-commands</artifactId>
     <packaging>bundle</packaging>
diff --git a/osgi/karaf/features/pom.xml b/osgi/karaf/features/pom.xml
index 61b18b2..a0ef2c7 100644
--- a/osgi/karaf/features/pom.xml
+++ b/osgi/karaf/features/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.cxf.karaf</groupId>
         <artifactId>karaf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <artifactId>apache-cxf</artifactId>
     <packaging>pom</packaging>
diff --git a/osgi/karaf/pom.xml b/osgi/karaf/pom.xml
index 1e0b12f..4423b87 100644
--- a/osgi/karaf/pom.xml
+++ b/osgi/karaf/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../parent</relativePath>
     </parent>
     <groupId>org.apache.cxf.karaf</groupId>
diff --git a/osgi/pom.xml b/osgi/pom.xml
index 0de733d..b4b3f23 100644
--- a/osgi/pom.xml
+++ b/osgi/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <modules>
         <module>bundle</module>
diff --git a/parent/pom.xml b/parent/pom.xml
index ce9522b..f50b0c8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>cxf-parent</artifactId>
diff --git a/pom.xml b/pom.xml
index 100aaba..a571f9d 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>3.1.16-SNAPSHOT</version>
+    <version>3.1.16</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 
@@ -32,7 +32,7 @@
         <connection>scm:git:http://gitbox.apache.org/repos/asf/cxf.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/cxf.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=cxf.git;a=summary</url>
-        <tag>HEAD</tag>
+        <tag>cxf-3.1.16</tag>
     </scm>
     <issueManagement>
         <system>jira</system>
diff --git a/rt/bindings/coloc/pom.xml b/rt/bindings/coloc/pom.xml
index 8ef9d7e..e9d9c38 100644
--- a/rt/bindings/coloc/pom.xml
+++ b/rt/bindings/coloc/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/bindings/corba/pom.xml b/rt/bindings/corba/pom.xml
index df19627..40ee911 100644
--- a/rt/bindings/corba/pom.xml
+++ b/rt/bindings/corba/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/bindings/object/pom.xml b/rt/bindings/object/pom.xml
index 4b91f6f..7234dc2 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>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/bindings/pom.xml b/rt/bindings/pom.xml
index b46db64..b57fe5f 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>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <modules>
         <module>soap</module>
diff --git a/rt/bindings/soap/pom.xml b/rt/bindings/soap/pom.xml
index 6eb6cbf..391fd95 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>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/bindings/xml/pom.xml b/rt/bindings/xml/pom.xml
index 4999b9d..d8739b0 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>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/rt/databinding/aegis/pom.xml b/rt/databinding/aegis/pom.xml
index 29b683e..ec47fe4 100644
--- a/rt/databinding/aegis/pom.xml
+++ b/rt/databinding/aegis/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     
diff --git a/rt/databinding/jaxb/pom.xml b/rt/databinding/jaxb/pom.xml
index 1274c08..c52ebfb 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>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/databinding/jibx/pom.xml b/rt/databinding/jibx/pom.xml
index ecae91e..358a649 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>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/rt/databinding/pom.xml b/rt/databinding/pom.xml
index c637ede..8388649 100644
--- a/rt/databinding/pom.xml
+++ b/rt/databinding/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <modules>
         <module>jaxb</module>
diff --git a/rt/databinding/sdo/pom.xml b/rt/databinding/sdo/pom.xml
index aac76fa..a3466a9 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>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/databinding/xmlbeans/pom.xml b/rt/databinding/xmlbeans/pom.xml
index 2d96c46..3cf4f6a 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>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/features/clustering/pom.xml b/rt/features/clustering/pom.xml
index 288aee6..c03b7ac 100644
--- a/rt/features/clustering/pom.xml
+++ b/rt/features/clustering/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/features/logging/pom.xml b/rt/features/logging/pom.xml
index 5b123ed..e1e9cd4 100644
--- a/rt/features/logging/pom.xml
+++ b/rt/features/logging/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <artifactId>cxf-rt-features-logging</artifactId>
diff --git a/rt/features/metrics/pom.xml b/rt/features/metrics/pom.xml
index 067663e..f7308c5 100644
--- a/rt/features/metrics/pom.xml
+++ b/rt/features/metrics/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <artifactId>cxf-rt-features-metrics</artifactId>
diff --git a/rt/features/pom.xml b/rt/features/pom.xml
index 62026cb..860de1e 100644
--- a/rt/features/pom.xml
+++ b/rt/features/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <modules>
         <module>clustering</module>
diff --git a/rt/features/throttling/pom.xml b/rt/features/throttling/pom.xml
index 2d65032..f3ed836 100644
--- a/rt/features/throttling/pom.xml
+++ b/rt/features/throttling/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <artifactId>cxf-rt-features-throttling</artifactId>
diff --git a/rt/frontend/jaxrs/pom.xml b/rt/frontend/jaxrs/pom.xml
index 5eca9d6..31fda10 100644
--- a/rt/frontend/jaxrs/pom.xml
+++ b/rt/frontend/jaxrs/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/frontend/jaxws/pom.xml b/rt/frontend/jaxws/pom.xml
index d4c5b98..65fb4b5 100644
--- a/rt/frontend/jaxws/pom.xml
+++ b/rt/frontend/jaxws/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/frontend/js/pom.xml b/rt/frontend/js/pom.xml
index 84db2a4..ffc974c 100644
--- a/rt/frontend/js/pom.xml
+++ b/rt/frontend/js/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/rt/frontend/pom.xml b/rt/frontend/pom.xml
index bcbac96..4acaff4 100644
--- a/rt/frontend/pom.xml
+++ b/rt/frontend/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <modules>
         <module>simple</module>
diff --git a/rt/frontend/simple/pom.xml b/rt/frontend/simple/pom.xml
index 34d81d9..819dccb 100644
--- a/rt/frontend/simple/pom.xml
+++ b/rt/frontend/simple/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/javascript/javascript-rt/pom.xml b/rt/javascript/javascript-rt/pom.xml
index cb68ec4..b5b2f23 100644
--- a/rt/javascript/javascript-rt/pom.xml
+++ b/rt/javascript/javascript-rt/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-runtime-javascript</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <dependencies>
         <dependency>
diff --git a/rt/javascript/javascript-tests/pom.xml b/rt/javascript/javascript-tests/pom.xml
index 6cc1d7a..8a9b86f 100644
--- a/rt/javascript/javascript-tests/pom.xml
+++ b/rt/javascript/javascript-tests/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-runtime-javascript</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <dependencies>
         <dependency>
diff --git a/rt/javascript/pom.xml b/rt/javascript/pom.xml
index 0d7151a..07c5c11 100644
--- a/rt/javascript/pom.xml
+++ b/rt/javascript/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <modules>
diff --git a/rt/management-web/pom.xml b/rt/management-web/pom.xml
index 432b7db..44133da 100644
--- a/rt/management-web/pom.xml
+++ b/rt/management-web/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/management/pom.xml b/rt/management/pom.xml
index a747f68..2e5dc56 100644
--- a/rt/management/pom.xml
+++ b/rt/management/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/rt/pom.xml b/rt/pom.xml
index 13a0df6..1a8122c 100644
--- a/rt/pom.xml
+++ b/rt/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <modules>
         <module>wsdl</module>
diff --git a/rt/rs/client/pom.xml b/rt/rs/client/pom.xml
index df5fd32..8745fa2 100644
--- a/rt/rs/client/pom.xml
+++ b/rt/rs/client/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/rs/description-swagger/pom.xml b/rt/rs/description-swagger/pom.xml
index fbd6237..d99706a 100644
--- a/rt/rs/description-swagger/pom.xml
+++ b/rt/rs/description-swagger/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/rs/description/pom.xml b/rt/rs/description/pom.xml
index 46c3145..fb0be68 100644
--- a/rt/rs/description/pom.xml
+++ b/rt/rs/description/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/rs/extensions/json-basic/pom.xml b/rt/rs/extensions/json-basic/pom.xml
index 829ab58..b3d0c69 100644
--- a/rt/rs/extensions/json-basic/pom.xml
+++ b/rt/rs/extensions/json-basic/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/rt/rs/extensions/providers/pom.xml b/rt/rs/extensions/providers/pom.xml
index 414494a..91bed7f 100644
--- a/rt/rs/extensions/providers/pom.xml
+++ b/rt/rs/extensions/providers/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/rs/extensions/search/pom.xml b/rt/rs/extensions/search/pom.xml
index a27a998..55e7904 100644
--- a/rt/rs/extensions/search/pom.xml
+++ b/rt/rs/extensions/search/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/rs/http-sci/pom.xml b/rt/rs/http-sci/pom.xml
index 728b2d5..5d90d86 100644
--- a/rt/rs/http-sci/pom.xml
+++ b/rt/rs/http-sci/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/rs/pom.xml b/rt/rs/pom.xml
index 8721bb6..b6e8b87 100644
--- a/rt/rs/pom.xml
+++ b/rt/rs/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <modules>
         <module>client</module>
diff --git a/rt/rs/security/cors/pom.xml b/rt/rs/security/cors/pom.xml
index 0c9b945..815d28e 100644
--- a/rt/rs/security/cors/pom.xml
+++ b/rt/rs/security/cors/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/rt/rs/security/jose-parent/jose-jaxrs/pom.xml b/rt/rs/security/jose-parent/jose-jaxrs/pom.xml
index d7c3211..ee5e6c2 100644
--- a/rt/rs/security/jose-parent/jose-jaxrs/pom.xml
+++ b/rt/rs/security/jose-parent/jose-jaxrs/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/rt/rs/security/jose-parent/jose/pom.xml b/rt/rs/security/jose-parent/jose/pom.xml
index e6ec219..c2dca93 100644
--- a/rt/rs/security/jose-parent/jose/pom.xml
+++ b/rt/rs/security/jose-parent/jose/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/rt/rs/security/jose-parent/pom.xml b/rt/rs/security/jose-parent/pom.xml
index 8a87bb2..c21eb6f 100644
--- a/rt/rs/security/jose-parent/pom.xml
+++ b/rt/rs/security/jose-parent/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-rs-security</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <modules>
         <module>jose</module>
diff --git a/rt/rs/security/oauth-parent/oauth/pom.xml b/rt/rs/security/oauth-parent/oauth/pom.xml
index 4a9e932..e2119ac 100644
--- a/rt/rs/security/oauth-parent/oauth/pom.xml
+++ b/rt/rs/security/oauth-parent/oauth/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <artifactId>cxf-rt-rs-security-oauth-parent</artifactId>
         <groupId>org.apache.cxf</groupId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/rs/security/oauth-parent/oauth2-saml/pom.xml b/rt/rs/security/oauth-parent/oauth2-saml/pom.xml
index 5656a1b..24bb199 100644
--- a/rt/rs/security/oauth-parent/oauth2-saml/pom.xml
+++ b/rt/rs/security/oauth-parent/oauth2-saml/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <artifactId>cxf-rt-rs-security-oauth-parent</artifactId>
         <groupId>org.apache.cxf</groupId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</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 f2b8aa6..e8fcead 100644
--- a/rt/rs/security/oauth-parent/oauth2/pom.xml
+++ b/rt/rs/security/oauth-parent/oauth2/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <artifactId>cxf-rt-rs-security-oauth-parent</artifactId>
     <groupId>org.apache.cxf</groupId>
-    <version>3.1.16-SNAPSHOT</version>
+    <version>3.1.16</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <properties>
diff --git a/rt/rs/security/oauth-parent/pom.xml b/rt/rs/security/oauth-parent/pom.xml
index 11b67ab..181fa78 100644
--- a/rt/rs/security/oauth-parent/pom.xml
+++ b/rt/rs/security/oauth-parent/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/rs/security/pom.xml b/rt/rs/security/pom.xml
index 7091159..7adedfe 100644
--- a/rt/rs/security/pom.xml
+++ b/rt/rs/security/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-rs</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <modules>
         <module>xml</module>
diff --git a/rt/rs/security/sso/oidc/pom.xml b/rt/rs/security/sso/oidc/pom.xml
index eb78a4d..60ba467 100644
--- a/rt/rs/security/sso/oidc/pom.xml
+++ b/rt/rs/security/sso/oidc/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-parent</artifactId>
-    <version>3.1.16-SNAPSHOT</version>
+    <version>3.1.16</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 56353fd..58a5cdd 100644
--- a/rt/rs/security/sso/saml/pom.xml
+++ b/rt/rs/security/sso/saml/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/rs/security/xml/pom.xml b/rt/rs/security/xml/pom.xml
index 26917d0..88bb21f 100644
--- a/rt/rs/security/xml/pom.xml
+++ b/rt/rs/security/xml/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/security-saml/pom.xml b/rt/security-saml/pom.xml
index 67643e0..3633752 100644
--- a/rt/security-saml/pom.xml
+++ b/rt/security-saml/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/security/pom.xml b/rt/security/pom.xml
index 2e14bdd..ad0ef4f 100644
--- a/rt/security/pom.xml
+++ b/rt/security/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/rt/transports/http-hc/pom.xml b/rt/transports/http-hc/pom.xml
index a4e3ed3..58428f2 100644
--- a/rt/transports/http-hc/pom.xml
+++ b/rt/transports/http-hc/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/transports/http-jetty/pom.xml b/rt/transports/http-jetty/pom.xml
index 6ce529b..b48bdfc 100644
--- a/rt/transports/http-jetty/pom.xml
+++ b/rt/transports/http-jetty/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/transports/http-netty/netty-client/pom.xml b/rt/transports/http-netty/netty-client/pom.xml
index a3846c6..21277c9 100644
--- a/rt/transports/http-netty/netty-client/pom.xml
+++ b/rt/transports/http-netty/netty-client/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/transports/http-netty/netty-server/pom.xml b/rt/transports/http-netty/netty-server/pom.xml
index 8726b2b..882a2ea 100644
--- a/rt/transports/http-netty/netty-server/pom.xml
+++ b/rt/transports/http-netty/netty-server/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/transports/http/pom.xml b/rt/transports/http/pom.xml
index 8db3226..40bb7a4 100644
--- a/rt/transports/http/pom.xml
+++ b/rt/transports/http/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/transports/jms/pom.xml b/rt/transports/jms/pom.xml
index 7fdaacf..40f7e8e 100644
--- a/rt/transports/jms/pom.xml
+++ b/rt/transports/jms/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/transports/local/pom.xml b/rt/transports/local/pom.xml
index 856373f..5fdc874 100644
--- a/rt/transports/local/pom.xml
+++ b/rt/transports/local/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/rt/transports/pom.xml b/rt/transports/pom.xml
index 6f9b852..c6d64f8 100644
--- a/rt/transports/pom.xml
+++ b/rt/transports/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <modules>
         <module>local</module>
diff --git a/rt/transports/udp/pom.xml b/rt/transports/udp/pom.xml
index a68096f..51f6259 100644
--- a/rt/transports/udp/pom.xml
+++ b/rt/transports/udp/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/rt/transports/websocket/pom.xml b/rt/transports/websocket/pom.xml
index d5be3c2..0ab12ce 100644
--- a/rt/transports/websocket/pom.xml
+++ b/rt/transports/websocket/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/ws/addr/pom.xml b/rt/ws/addr/pom.xml
index 6dcf5f3..5b94e0e 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>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/ws/eventing/pom.xml b/rt/ws/eventing/pom.xml
index 6641d7c..09ca446 100644
--- a/rt/ws/eventing/pom.xml
+++ b/rt/ws/eventing/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/rt/ws/mex/pom.xml b/rt/ws/mex/pom.xml
index a059331..d76d2c9 100644
--- a/rt/ws/mex/pom.xml
+++ b/rt/ws/mex/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/rt/ws/policy/pom.xml b/rt/ws/policy/pom.xml
index ffeb0c0..4274686 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>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/ws/pom.xml b/rt/ws/pom.xml
index d5f2ac8..41f7444 100644
--- a/rt/ws/pom.xml
+++ b/rt/ws/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <modules>
         <module>policy</module>
diff --git a/rt/ws/rm/pom.xml b/rt/ws/rm/pom.xml
index 2c4447f..4b45034 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>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/ws/security/pom.xml b/rt/ws/security/pom.xml
index 31a8a66..4f9e26b 100644
--- a/rt/ws/security/pom.xml
+++ b/rt/ws/security/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/wsdl/pom.xml b/rt/wsdl/pom.xml
index ef111be..e7c148b 100644
--- a/rt/wsdl/pom.xml
+++ b/rt/wsdl/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/services/pom.xml b/services/pom.xml
index 79f3eb1..a3ba760 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -28,7 +28,7 @@
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <modules>
         <module>sts</module>
diff --git a/services/sts/pom.xml b/services/sts/pom.xml
index a6dbb12..0a3477d 100644
--- a/services/sts/pom.xml
+++ b/services/sts/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf.services</groupId>
         <artifactId>cxf-services</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modules>
diff --git a/services/sts/sts-core/pom.xml b/services/sts/sts-core/pom.xml
index 5667684..1216412 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>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/services/sts/sts-war/pom.xml b/services/sts/sts-war/pom.xml
index 2bef62a..90717aa 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>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/services/sts/systests/advanced/pom.xml b/services/sts/systests/advanced/pom.xml
index 5e19759..4a99a92 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>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/services/sts/systests/basic/pom.xml b/services/sts/systests/basic/pom.xml
index 92b32d0..b898c92 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>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/services/sts/systests/pom.xml b/services/sts/systests/pom.xml
index 099ab4c..1430ced 100644
--- a/services/sts/systests/pom.xml
+++ b/services/sts/systests/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf.services.sts</groupId>
         <artifactId>cxf-services-sts</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <modules>
         <module>basic</module>
diff --git a/services/sts/systests/sts-features/pom.xml b/services/sts/systests/sts-features/pom.xml
index fa7a336..9b32929 100644
--- a/services/sts/systests/sts-features/pom.xml
+++ b/services/sts/systests/sts-features/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../../parent/pom.xml</relativePath>
     </parent>
     <build>
diff --git a/services/sts/systests/sts-itests/pom.xml b/services/sts/systests/sts-itests/pom.xml
index 8c304ce..1eb50d5 100644
--- a/services/sts/systests/sts-itests/pom.xml
+++ b/services/sts/systests/sts-itests/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/services/sts/systests/sts-osgi/pom.xml b/services/sts/systests/sts-osgi/pom.xml
index 85b5839..adfdb52 100644
--- a/services/sts/systests/sts-osgi/pom.xml
+++ b/services/sts/systests/sts-osgi/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/services/ws-discovery/pom.xml b/services/ws-discovery/pom.xml
index 365d1f7..d9c99f4 100644
--- a/services/ws-discovery/pom.xml
+++ b/services/ws-discovery/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf.services</groupId>
         <artifactId>cxf-services</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modules>
diff --git a/services/ws-discovery/ws-discovery-api/pom.xml b/services/ws-discovery/ws-discovery-api/pom.xml
index fc210ea..f5f47de 100644
--- a/services/ws-discovery/ws-discovery-api/pom.xml
+++ b/services/ws-discovery/ws-discovery-api/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/services/ws-discovery/ws-discovery-service/pom.xml b/services/ws-discovery/ws-discovery-service/pom.xml
index d1b86e2..7b0e5b7 100644
--- a/services/ws-discovery/ws-discovery-service/pom.xml
+++ b/services/ws-discovery/ws-discovery-service/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/services/wsn/pom.xml b/services/wsn/pom.xml
index 7018db3..66d4413 100644
--- a/services/wsn/pom.xml
+++ b/services/wsn/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf.services</groupId>
         <artifactId>cxf-services</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modules>
diff --git a/services/wsn/wsn-api/pom.xml b/services/wsn/wsn-api/pom.xml
index 68acd20..a3696b1 100644
--- a/services/wsn/wsn-api/pom.xml
+++ b/services/wsn/wsn-api/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/services/wsn/wsn-core/pom.xml b/services/wsn/wsn-core/pom.xml
index 8b1d11e..554eb30 100644
--- a/services/wsn/wsn-core/pom.xml
+++ b/services/wsn/wsn-core/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/services/wsn/wsn-osgi/pom.xml b/services/wsn/wsn-osgi/pom.xml
index f5f22c6..b02a4b7 100644
--- a/services/wsn/wsn-osgi/pom.xml
+++ b/services/wsn/wsn-osgi/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/services/xkms/pom.xml b/services/xkms/pom.xml
index c8b594d..bee4dc8 100644
--- a/services/xkms/pom.xml
+++ b/services/xkms/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.cxf.services</groupId>
         <artifactId>cxf-services</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modules>
diff --git a/services/xkms/xkms-client/pom.xml b/services/xkms/xkms-client/pom.xml
index f3d5c55..e13f885 100644
--- a/services/xkms/xkms-client/pom.xml
+++ b/services/xkms/xkms-client/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <build>
diff --git a/services/xkms/xkms-common/pom.xml b/services/xkms/xkms-common/pom.xml
index 9f12407..3340631 100644
--- a/services/xkms/xkms-common/pom.xml
+++ b/services/xkms/xkms-common/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/services/xkms/xkms-features/pom.xml b/services/xkms/xkms-features/pom.xml
index 399bca0..558fa19 100644
--- a/services/xkms/xkms-features/pom.xml
+++ b/services/xkms/xkms-features/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <build>
diff --git a/services/xkms/xkms-itests/pom.xml b/services/xkms/xkms-itests/pom.xml
index 2383ec4..7a1ec7f 100644
--- a/services/xkms/xkms-itests/pom.xml
+++ b/services/xkms/xkms-itests/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/services/xkms/xkms-osgi/pom.xml b/services/xkms/xkms-osgi/pom.xml
index b218d80..b1a43dd 100644
--- a/services/xkms/xkms-osgi/pom.xml
+++ b/services/xkms/xkms-osgi/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/services/xkms/xkms-service/pom.xml b/services/xkms/xkms-service/pom.xml
index 6d9235e..03b9992 100644
--- a/services/xkms/xkms-service/pom.xml
+++ b/services/xkms/xkms-service/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/services/xkms/xkms-war/pom.xml b/services/xkms/xkms-war/pom.xml
index f658446..4a51849 100644
--- a/services/xkms/xkms-war/pom.xml
+++ b/services/xkms/xkms-war/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/services/xkms/xkms-x509-handlers/pom.xml b/services/xkms/xkms-x509-handlers/pom.xml
index b4f249b..4c62966 100644
--- a/services/xkms/xkms-x509-handlers/pom.xml
+++ b/services/xkms/xkms-x509-handlers/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/services/xkms/xkms-x509-repo-ldap/pom.xml b/services/xkms/xkms-x509-repo-ldap/pom.xml
index 3ce21be..11eb197 100644
--- a/services/xkms/xkms-x509-repo-ldap/pom.xml
+++ b/services/xkms/xkms-x509-repo-ldap/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <groupId>org.apache.cxf.services.xkms</groupId>
diff --git a/systests/cdi/base/pom.xml b/systests/cdi/base/pom.xml
index 0ce1547..6718f0b 100644
--- a/systests/cdi/base/pom.xml
+++ b/systests/cdi/base/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>cxf-systests-cdi</artifactId>
         <groupId>org.apache.cxf.systests</groupId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/systests/cdi/cdi-owb/cdi-multiple-apps-owb/pom.xml b/systests/cdi/cdi-owb/cdi-multiple-apps-owb/pom.xml
index 50ece51..1e67b74 100644
--- a/systests/cdi/cdi-owb/cdi-multiple-apps-owb/pom.xml
+++ b/systests/cdi/cdi-owb/cdi-multiple-apps-owb/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.cxf.systests</groupId>
         <artifactId>cxf-systests-cdi-owb</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/systests/cdi/cdi-owb/cdi-no-apps-owb/pom.xml b/systests/cdi/cdi-owb/cdi-no-apps-owb/pom.xml
index 76dee90..95d403e 100644
--- a/systests/cdi/cdi-owb/cdi-no-apps-owb/pom.xml
+++ b/systests/cdi/cdi-owb/cdi-no-apps-owb/pom.xml
@@ -22,7 +22,7 @@
         <parent>
         <groupId>org.apache.cxf.systests</groupId>
         <artifactId>cxf-systests-cdi-owb</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/systests/cdi/cdi-owb/cdi-producers-owb/pom.xml b/systests/cdi/cdi-owb/cdi-producers-owb/pom.xml
index 20cc344..74ba1aa 100644
--- a/systests/cdi/cdi-owb/cdi-producers-owb/pom.xml
+++ b/systests/cdi/cdi-owb/cdi-producers-owb/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.cxf.systests</groupId>
         <artifactId>cxf-systests-cdi-owb</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/systests/cdi/cdi-owb/pom.xml b/systests/cdi/cdi-owb/pom.xml
index d099d97..c40be4d 100644
--- a/systests/cdi/cdi-owb/pom.xml
+++ b/systests/cdi/cdi-owb/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.cxf.systests</groupId>
         <artifactId>cxf-systests-cdi</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/systests/cdi/cdi-weld/cdi-multiple-apps-weld/pom.xml b/systests/cdi/cdi-weld/cdi-multiple-apps-weld/pom.xml
index 5096bca..a597334 100644
--- a/systests/cdi/cdi-weld/cdi-multiple-apps-weld/pom.xml
+++ b/systests/cdi/cdi-weld/cdi-multiple-apps-weld/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.cxf.systests</groupId>
         <artifactId>cxf-systests-cdi-weld</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/systests/cdi/cdi-weld/cdi-no-apps-weld/pom.xml b/systests/cdi/cdi-weld/cdi-no-apps-weld/pom.xml
index fe614da..a091d61 100644
--- a/systests/cdi/cdi-weld/cdi-no-apps-weld/pom.xml
+++ b/systests/cdi/cdi-weld/cdi-no-apps-weld/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.cxf.systests</groupId>
         <artifactId>cxf-systests-cdi-weld</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/systests/cdi/cdi-weld/cdi-producers-weld/pom.xml b/systests/cdi/cdi-weld/cdi-producers-weld/pom.xml
index ea326d5..636a83b 100644
--- a/systests/cdi/cdi-weld/cdi-producers-weld/pom.xml
+++ b/systests/cdi/cdi-weld/cdi-producers-weld/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.cxf.systests</groupId>
         <artifactId>cxf-systests-cdi-weld</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/systests/cdi/cdi-weld/pom.xml b/systests/cdi/cdi-weld/pom.xml
index a760ddb..9e01e47 100644
--- a/systests/cdi/cdi-weld/pom.xml
+++ b/systests/cdi/cdi-weld/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.cxf.systests</groupId>
         <artifactId>cxf-systests-cdi</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/systests/cdi/pom.xml b/systests/cdi/pom.xml
index 93b080f..4bfd721 100644
--- a/systests/cdi/pom.xml
+++ b/systests/cdi/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>cxf-parent</artifactId>
         <groupId>org.apache.cxf</groupId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/systests/container-integration/grizzly/pom.xml b/systests/container-integration/grizzly/pom.xml
index 494ab1a..1ba5507 100644
--- a/systests/container-integration/grizzly/pom.xml
+++ b/systests/container-integration/grizzly/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.cxf.systests</groupId>
         <artifactId>cxf-systests-container-integration</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>cxf-systests-ci-grizzly</artifactId>
diff --git a/systests/container-integration/pom.xml b/systests/container-integration/pom.xml
index ff6fd61..0a79d47 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>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/systests/container-integration/webapp/pom.xml b/systests/container-integration/webapp/pom.xml
index 8ad11ea..8f7c93d 100644
--- a/systests/container-integration/webapp/pom.xml
+++ b/systests/container-integration/webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.cxf.systests</groupId>
         <artifactId>cxf-systests-container-integration</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>cxf-systests-ci-webapp</artifactId>
diff --git a/systests/databinding/pom.xml b/systests/databinding/pom.xml
index f3cbccb..76ddbcc 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>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml
index 3f6f764..b0c7e31 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>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/systests/jaxws/pom.xml b/systests/jaxws/pom.xml
index 85dd885..4aa82cd 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>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/systests/jibx/databinding-jibx/pom.xml b/systests/jibx/databinding-jibx/pom.xml
index fa368c2..6c2c547 100644
--- a/systests/jibx/databinding-jibx/pom.xml
+++ b/systests/jibx/databinding-jibx/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>cxf-systests-jibx</artifactId>
         <groupId>org.apache.cxf.systests</groupId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/systests/jibx/jaxrs-jibx/pom.xml b/systests/jibx/jaxrs-jibx/pom.xml
index ed69c58..9491ba1 100644
--- a/systests/jibx/jaxrs-jibx/pom.xml
+++ b/systests/jibx/jaxrs-jibx/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>cxf-systests-jibx</artifactId>
         <groupId>org.apache.cxf.systests</groupId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/systests/jibx/pom.xml b/systests/jibx/pom.xml
index 0f74da5..0d94eb8 100644
--- a/systests/jibx/pom.xml
+++ b/systests/jibx/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>cxf-parent</artifactId>
         <groupId>org.apache.cxf</groupId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/systests/kerberos/pom.xml b/systests/kerberos/pom.xml
index c475348..b1e942c 100644
--- a/systests/kerberos/pom.xml
+++ b/systests/kerberos/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>cxf-parent</artifactId>
         <groupId>org.apache.cxf</groupId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/systests/pom.xml b/systests/pom.xml
index 6cd4124..df1ae73 100644
--- a/systests/pom.xml
+++ b/systests/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <modules>
         <module>container-integration</module>
diff --git a/systests/rs-http-sci/pom.xml b/systests/rs-http-sci/pom.xml
index 3781651..340580c 100644
--- a/systests/rs-http-sci/pom.xml
+++ b/systests/rs-http-sci/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>cxf-parent</artifactId>
         <groupId>org.apache.cxf</groupId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/systests/rs-security/pom.xml b/systests/rs-security/pom.xml
index 1e3446c..54e8591 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>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/systests/tracing/pom.xml b/systests/tracing/pom.xml
index 08389c8..3f98893 100644
--- a/systests/tracing/pom.xml
+++ b/systests/tracing/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>cxf-parent</artifactId>
         <groupId>org.apache.cxf</groupId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/systests/transport-jms/pom.xml b/systests/transport-jms/pom.xml
index e7bd8ed..6caaeb2 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>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/systests/transports-ssl3/pom.xml b/systests/transports-ssl3/pom.xml
index 63b8533..4a4fea9 100644
--- a/systests/transports-ssl3/pom.xml
+++ b/systests/transports-ssl3/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>cxf-parent</artifactId>
         <groupId>org.apache.cxf</groupId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/systests/transports/pom.xml b/systests/transports/pom.xml
index f4ca29a..5312279 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>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/systests/uncategorized/pom.xml b/systests/uncategorized/pom.xml
index b765a22..a2dee75 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>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/systests/ws-rm/pom.xml b/systests/ws-rm/pom.xml
index 48f58e3..fa1dc6b 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>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/systests/ws-security-examples/pom.xml b/systests/ws-security-examples/pom.xml
index 2a50d6c..8efddf6 100644
--- a/systests/ws-security-examples/pom.xml
+++ b/systests/ws-security-examples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>cxf-parent</artifactId>
         <groupId>org.apache.cxf</groupId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/systests/ws-security/pom.xml b/systests/ws-security/pom.xml
index ec4c9c3..7e78eb0 100644
--- a/systests/ws-security/pom.xml
+++ b/systests/ws-security/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>cxf-parent</artifactId>
         <groupId>org.apache.cxf</groupId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/systests/ws-specs/pom.xml b/systests/ws-specs/pom.xml
index 010e608..8ad79d5 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>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/systests/wsdl_maven/codegen/pom.xml b/systests/wsdl_maven/codegen/pom.xml
index 4b36453..a53c78f 100644
--- a/systests/wsdl_maven/codegen/pom.xml
+++ b/systests/wsdl_maven/codegen/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</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 24029bb..8e71dac 100644
--- a/systests/wsdl_maven/java2ws/pom.xml
+++ b/systests/wsdl_maven/java2ws/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <build>
diff --git a/systests/wsdl_maven/pom.xml b/systests/wsdl_maven/pom.xml
index b68f5c4..0ce096c 100644
--- a/systests/wsdl_maven/pom.xml
+++ b/systests/wsdl_maven/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf.systests</groupId>
         <artifactId>cxf-systests</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <modules>
         <module>codegen</module>
diff --git a/testutils/pom.xml b/testutils/pom.xml
index 794dd9a..9073863 100644
--- a/testutils/pom.xml
+++ b/testutils/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/tools/common/pom.xml b/tools/common/pom.xml
index cbe0bfd..0e5a890 100644
--- a/tools/common/pom.xml
+++ b/tools/common/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/tools/corba/pom.xml b/tools/corba/pom.xml
index 3c64b86..fc2490a 100644
--- a/tools/corba/pom.xml
+++ b/tools/corba/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/tools/javato/pom.xml b/tools/javato/pom.xml
index 2bac64b..b5f86a5 100644
--- a/tools/javato/pom.xml
+++ b/tools/javato/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-tools</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <modules>
         <module>ws</module>
diff --git a/tools/javato/ws/pom.xml b/tools/javato/ws/pom.xml
index a155ee6..445cdf1 100644
--- a/tools/javato/ws/pom.xml
+++ b/tools/javato/ws/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/tools/pom.xml b/tools/pom.xml
index e8a8a80..b4d96d8 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <modules>
         <module>common</module>
diff --git a/tools/validator/pom.xml b/tools/validator/pom.xml
index a753adb..9ffea80 100644
--- a/tools/validator/pom.xml
+++ b/tools/validator/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/tools/wadlto/jaxrs/pom.xml b/tools/wadlto/jaxrs/pom.xml
index 2286ae3..4cb531e 100644
--- a/tools/wadlto/jaxrs/pom.xml
+++ b/tools/wadlto/jaxrs/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/tools/wadlto/pom.xml b/tools/wadlto/pom.xml
index ea05e1d..106466f 100644
--- a/tools/wadlto/pom.xml
+++ b/tools/wadlto/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-tools</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <modules>
         <module>jaxrs</module>
diff --git a/tools/wsdlto/core/pom.xml b/tools/wsdlto/core/pom.xml
index 5ae2217..2804871 100644
--- a/tools/wsdlto/core/pom.xml
+++ b/tools/wsdlto/core/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/tools/wsdlto/databinding/jaxb/pom.xml b/tools/wsdlto/databinding/jaxb/pom.xml
index 591999a..b6f7874 100644
--- a/tools/wsdlto/databinding/jaxb/pom.xml
+++ b/tools/wsdlto/databinding/jaxb/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/tools/wsdlto/frontend/javascript/pom.xml b/tools/wsdlto/frontend/javascript/pom.xml
index d513c68..67f7673 100644
--- a/tools/wsdlto/frontend/javascript/pom.xml
+++ b/tools/wsdlto/frontend/javascript/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/tools/wsdlto/frontend/jaxws/pom.xml b/tools/wsdlto/frontend/jaxws/pom.xml
index 6a7c1a2..716c1e1 100644
--- a/tools/wsdlto/frontend/jaxws/pom.xml
+++ b/tools/wsdlto/frontend/jaxws/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/tools/wsdlto/misc/pom.xml b/tools/wsdlto/misc/pom.xml
index 97c6a82..c224c7a 100644
--- a/tools/wsdlto/misc/pom.xml
+++ b/tools/wsdlto/misc/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/tools/wsdlto/pom.xml b/tools/wsdlto/pom.xml
index 3d5bc75..02c6789 100644
--- a/tools/wsdlto/pom.xml
+++ b/tools/wsdlto/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-tools</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
     </parent>
     <modules>
         <module>core</module>
diff --git a/tools/wsdlto/test/pom.xml b/tools/wsdlto/test/pom.xml
index 0866e29..7d5dc08 100644
--- a/tools/wsdlto/test/pom.xml
+++ b/tools/wsdlto/test/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>3.1.16-SNAPSHOT</version>
+        <version>3.1.16</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>