You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2019/01/25 13:35:29 UTC

[cxf] branch 3.1.x-fixes updated: [maven-release-plugin] prepare release cxf-3.1.18

This is an automated email from the ASF dual-hosted git repository.

dkulp pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/3.1.x-fixes by this push:
     new 7a26b73  [maven-release-plugin] prepare release cxf-3.1.18
7a26b73 is described below

commit 7a26b733dc690cdd3e6186468c23a5397eedd6c5
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Fri Jan 25 08:35:28 2019 -0500

    [maven-release-plugin] prepare release cxf-3.1.18
---
 core/pom.xml                                             |  2 +-
 distribution/javadoc/pom.xml                             |  2 +-
 distribution/manifest/pom.xml                            |  2 +-
 distribution/pom.xml                                     |  2 +-
 distribution/src/main/release/samples/aegis/pom.xml      | 10 +++++-----
 .../src/main/release/samples/aegis_standalone/pom.xml    |  4 ++--
 distribution/src/main/release/samples/callback/pom.xml   |  8 ++++----
 .../release/samples/configuration_interceptor/pom.xml    | 10 +++++-----
 distribution/src/main/release/samples/corba/bank/pom.xml |  8 ++++----
 .../release/samples/corba/bank_ws_addressing/pom.xml     |  8 ++++----
 .../src/main/release/samples/corba/hello_world/pom.xml   |  8 ++++----
 .../main/release/samples/groovy_spring_support/pom.xml   |  8 ++++----
 .../src/main/release/samples/in_jvm_transport/pom.xml    | 10 +++++-----
 .../src/main/release/samples/java_first_jaxws/pom.xml    |  6 +++---
 .../samples/java_first_jaxws_factory_bean/pom.xml        |  8 ++++----
 .../src/main/release/samples/java_first_jms/pom.xml      |  6 +++---
 .../src/main/release/samples/java_first_pojo/pom.xml     |  8 ++++----
 .../release/samples/java_first_spring_support/pom.xml    |  8 ++++----
 .../src/main/release/samples/jax_rs/basic/pom.xml        |  8 ++++----
 .../src/main/release/samples/jax_rs/basic_https/pom.xml  |  2 +-
 .../src/main/release/samples/jax_rs/basic_oidc/pom.xml   | 10 +++++-----
 .../src/main/release/samples/jax_rs/big_query/pom.xml    | 12 ++++++------
 .../release/samples/jax_rs/content_negotiation/pom.xml   | 10 +++++-----
 .../release/samples/jax_rs/description_swagger/pom.xml   | 10 +++++-----
 .../release/samples/jax_rs/description_swagger2/pom.xml  |  8 ++++----
 .../samples/jax_rs/description_swagger2_osgi/pom.xml     |  8 ++++----
 .../samples/jax_rs/description_swagger2_spring/pom.xml   | 10 +++++-----
 .../samples/jax_rs/description_swagger2_web/pom.xml      |  8 ++++----
 .../src/main/release/samples/jax_rs/minimal_osgi/pom.xml |  2 +-
 .../src/main/release/samples/jax_rs/search/pom.xml       | 14 +++++++-------
 .../src/main/release/samples/jax_rs/spring_boot/pom.xml  |  2 +-
 .../samples/jax_rs/spring_boot_scan/application/pom.xml  |  2 +-
 .../samples/jax_rs/spring_boot_scan/client/pom.xml       |  2 +-
 .../jax_rs/spring_boot_scan/eureka-registry/pom.xml      |  2 +-
 .../main/release/samples/jax_rs/spring_security/pom.xml  |  8 ++++----
 .../main/release/samples/jax_rs/tracing_brave/pom.xml    | 14 +++++++-------
 .../release/samples/jax_rs/tracing_brave_osgi/pom.xml    | 14 +++++++-------
 .../main/release/samples/jax_rs/tracing_htrace/pom.xml   | 14 +++++++-------
 .../src/main/release/samples/jax_rs/websocket/pom.xml    | 10 +++++-----
 .../main/release/samples/jax_rs/websocket_osgi/pom.xml   |  8 ++++----
 .../main/release/samples/jax_rs/websocket_web/pom.xml    |  8 ++++----
 .../main/release/samples/jax_server_aegis_client/pom.xml | 10 +++++-----
 .../src/main/release/samples/jaxws_async/pom.xml         | 10 +++++-----
 .../main/release/samples/jaxws_dispatch_provider/pom.xml |  8 ++++----
 .../src/main/release/samples/jaxws_handlers/pom.xml      |  8 ++++----
 .../src/main/release/samples/jaxws_spring_boot/pom.xml   |  2 +-
 .../release/samples/jaxws_tracing_brave_osgi/pom.xml     | 10 +++++-----
 distribution/src/main/release/samples/jms_pubsub/pom.xml |  8 ++++----
 distribution/src/main/release/samples/jms_queue/pom.xml  |  6 +++---
 .../src/main/release/samples/jms_spec_demo/pom.xml       |  6 +++---
 .../src/main/release/samples/jms_spring_config/pom.xml   |  6 +++---
 .../release/samples/js_browser_client_java_first/pom.xml | 10 +++++-----
 .../release/samples/js_browser_client_simple/pom.xml     | 10 +++++-----
 distribution/src/main/release/samples/js_client/pom.xml  | 10 +++++-----
 .../src/main/release/samples/js_provider/pom.xml         |  8 ++++----
 .../main/release/samples/logbrowser-blueprint/pom.xml    |  2 +-
 distribution/src/main/release/samples/logbrowser/pom.xml |  2 +-
 distribution/src/main/release/samples/mtom/pom.xml       |  8 ++++----
 .../src/main/release/samples/oauth/client/pom.xml        |  2 +-
 .../src/main/release/samples/oauth/server/pom.xml        |  2 +-
 distribution/src/main/release/samples/pom.xml            |  2 +-
 .../src/main/release/samples/restful_dispatch/pom.xml    | 10 +++++-----
 .../src/main/release/samples/ruby_spring_support/pom.xml |  8 ++++----
 .../src/main/release/samples/soap_header/pom.xml         |  8 ++++----
 distribution/src/main/release/samples/sts/pom.xml        |  2 +-
 distribution/src/main/release/samples/throttling/pom.xml |  2 +-
 .../src/main/release/samples/ws_addressing/pom.xml       |  8 ++++----
 .../src/main/release/samples/ws_discovery/pom.xml        | 10 +++++-----
 .../src/main/release/samples/ws_eventing/pom.xml         |  2 +-
 .../src/main/release/samples/ws_notification/pom.xml     | 14 +++++++-------
 distribution/src/main/release/samples/ws_policy/pom.xml  |  8 ++++----
 distribution/src/main/release/samples/ws_rm/pom.xml      | 10 +++++-----
 .../main/release/samples/ws_security/sign_enc/pom.xml    | 16 ++++++++--------
 .../release/samples/ws_security/sign_enc_policy/pom.xml  |  2 +-
 .../src/main/release/samples/ws_security/ut/pom.xml      | 10 +++++-----
 .../main/release/samples/ws_security/ut_policy/pom.xml   |  2 +-
 distribution/src/main/release/samples/wsdl_first/pom.xml | 10 +++++-----
 .../release/samples/wsdl_first_dynamic_client/pom.xml    |  8 ++++----
 .../src/main/release/samples/wsdl_first_https/pom.xml    |  2 +-
 .../src/main/release/samples/wsdl_first_pure_xml/pom.xml |  8 ++++----
 .../src/main/release/samples/wsdl_first_rpclit/pom.xml   |  8 ++++----
 .../src/main/release/samples/wsdl_first_soap12/pom.xml   |  8 ++++----
 .../main/release/samples/wsdl_first_xml_wrapped/pom.xml  |  8 ++++----
 .../src/main/release/samples/wsdl_first_xmlbeans/pom.xml | 10 +++++-----
 integration/cdi/pom.xml                                  |  2 +-
 integration/jca/pom.xml                                  |  2 +-
 integration/pom.xml                                      |  2 +-
 integration/spring-boot/autoconfigure/pom.xml            |  2 +-
 integration/spring-boot/pom.xml                          |  2 +-
 integration/spring-boot/starter-jaxrs/pom.xml            |  2 +-
 integration/spring-boot/starter-jaxws/pom.xml            |  2 +-
 integration/tracing/tracing-brave/pom.xml                |  2 +-
 integration/tracing/tracing-htrace/pom.xml               |  2 +-
 maven-plugins/archetypes/cxf-jaxrs-service/pom.xml       |  2 +-
 maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml     |  4 ++--
 maven-plugins/archetypes/pom.xml                         |  2 +-
 maven-plugins/codegen-plugin/pom.xml                     |  2 +-
 maven-plugins/corba/pom.xml                              |  2 +-
 maven-plugins/java2wadl-plugin/pom.xml                   |  4 ++--
 maven-plugins/java2ws-plugin/pom.xml                     |  2 +-
 maven-plugins/pom.xml                                    |  2 +-
 maven-plugins/wadl2java-plugin/pom.xml                   |  2 +-
 maven-plugins/wsdl-validator-plugin/pom.xml              |  2 +-
 osgi/bundle/compatible/pom.xml                           |  2 +-
 osgi/bundle/pom.xml                                      |  2 +-
 osgi/itests-felix/pom.xml                                |  2 +-
 osgi/itests/pom.xml                                      |  2 +-
 osgi/karaf/commands/pom.xml                              |  2 +-
 osgi/karaf/features/pom.xml                              |  2 +-
 osgi/karaf/pom.xml                                       |  2 +-
 osgi/pom.xml                                             |  2 +-
 parent/pom.xml                                           |  2 +-
 pom.xml                                                  |  4 ++--
 rt/bindings/coloc/pom.xml                                |  2 +-
 rt/bindings/corba/pom.xml                                |  2 +-
 rt/bindings/object/pom.xml                               |  2 +-
 rt/bindings/pom.xml                                      |  2 +-
 rt/bindings/soap/pom.xml                                 |  2 +-
 rt/bindings/xml/pom.xml                                  |  2 +-
 rt/databinding/aegis/pom.xml                             |  2 +-
 rt/databinding/jaxb/pom.xml                              |  2 +-
 rt/databinding/jibx/pom.xml                              |  2 +-
 rt/databinding/pom.xml                                   |  2 +-
 rt/databinding/sdo/pom.xml                               |  2 +-
 rt/databinding/xmlbeans/pom.xml                          |  2 +-
 rt/features/clustering/pom.xml                           |  2 +-
 rt/features/logging/pom.xml                              |  2 +-
 rt/features/metrics/pom.xml                              |  2 +-
 rt/features/pom.xml                                      |  2 +-
 rt/features/throttling/pom.xml                           |  2 +-
 rt/frontend/jaxrs/pom.xml                                |  2 +-
 rt/frontend/jaxws/pom.xml                                |  2 +-
 rt/frontend/js/pom.xml                                   |  2 +-
 rt/frontend/pom.xml                                      |  2 +-
 rt/frontend/simple/pom.xml                               |  2 +-
 rt/javascript/javascript-rt/pom.xml                      |  2 +-
 rt/javascript/javascript-tests/pom.xml                   |  2 +-
 rt/javascript/pom.xml                                    |  2 +-
 rt/management-web/pom.xml                                |  2 +-
 rt/management/pom.xml                                    |  2 +-
 rt/pom.xml                                               |  2 +-
 rt/rs/client/pom.xml                                     |  2 +-
 rt/rs/description-swagger/pom.xml                        |  2 +-
 rt/rs/description/pom.xml                                |  2 +-
 rt/rs/extensions/json-basic/pom.xml                      |  2 +-
 rt/rs/extensions/providers/pom.xml                       |  2 +-
 rt/rs/extensions/search/pom.xml                          |  2 +-
 rt/rs/http-sci/pom.xml                                   |  2 +-
 rt/rs/pom.xml                                            |  2 +-
 rt/rs/security/cors/pom.xml                              |  2 +-
 rt/rs/security/jose-parent/jose-jaxrs/pom.xml            |  2 +-
 rt/rs/security/jose-parent/jose/pom.xml                  |  2 +-
 rt/rs/security/jose-parent/pom.xml                       |  2 +-
 rt/rs/security/oauth-parent/oauth/pom.xml                |  2 +-
 rt/rs/security/oauth-parent/oauth2-saml/pom.xml          |  2 +-
 rt/rs/security/oauth-parent/oauth2/pom.xml               |  2 +-
 rt/rs/security/oauth-parent/pom.xml                      |  2 +-
 rt/rs/security/pom.xml                                   |  2 +-
 rt/rs/security/sso/oidc/pom.xml                          |  2 +-
 rt/rs/security/sso/saml/pom.xml                          |  2 +-
 rt/rs/security/xml/pom.xml                               |  2 +-
 rt/security-saml/pom.xml                                 |  2 +-
 rt/security/pom.xml                                      |  2 +-
 rt/transports/http-hc/pom.xml                            |  2 +-
 rt/transports/http-jetty/pom.xml                         |  2 +-
 rt/transports/http-netty/netty-client/pom.xml            |  2 +-
 rt/transports/http-netty/netty-server/pom.xml            |  2 +-
 rt/transports/http/pom.xml                               |  2 +-
 rt/transports/jms/pom.xml                                |  2 +-
 rt/transports/local/pom.xml                              |  2 +-
 rt/transports/pom.xml                                    |  2 +-
 rt/transports/udp/pom.xml                                |  2 +-
 rt/transports/websocket/pom.xml                          |  2 +-
 rt/ws/addr/pom.xml                                       |  2 +-
 rt/ws/eventing/pom.xml                                   |  2 +-
 rt/ws/mex/pom.xml                                        |  2 +-
 rt/ws/policy/pom.xml                                     |  2 +-
 rt/ws/pom.xml                                            |  2 +-
 rt/ws/rm/pom.xml                                         |  2 +-
 rt/ws/security/pom.xml                                   |  2 +-
 rt/wsdl/pom.xml                                          |  2 +-
 services/pom.xml                                         |  2 +-
 services/sts/pom.xml                                     |  2 +-
 services/sts/sts-core/pom.xml                            |  2 +-
 services/sts/sts-war/pom.xml                             |  2 +-
 services/sts/systests/advanced/pom.xml                   |  2 +-
 services/sts/systests/basic/pom.xml                      |  2 +-
 services/sts/systests/pom.xml                            |  2 +-
 services/sts/systests/sts-features/pom.xml               |  2 +-
 services/sts/systests/sts-itests/pom.xml                 |  2 +-
 services/sts/systests/sts-osgi/pom.xml                   |  2 +-
 services/ws-discovery/pom.xml                            |  2 +-
 services/ws-discovery/ws-discovery-api/pom.xml           |  2 +-
 services/ws-discovery/ws-discovery-service/pom.xml       |  2 +-
 services/wsn/pom.xml                                     |  2 +-
 services/wsn/wsn-api/pom.xml                             |  2 +-
 services/wsn/wsn-core/pom.xml                            |  2 +-
 services/wsn/wsn-osgi/pom.xml                            |  2 +-
 services/xkms/pom.xml                                    |  2 +-
 services/xkms/xkms-client/pom.xml                        |  2 +-
 services/xkms/xkms-common/pom.xml                        |  2 +-
 services/xkms/xkms-features/pom.xml                      |  2 +-
 services/xkms/xkms-itests/pom.xml                        |  2 +-
 services/xkms/xkms-osgi/pom.xml                          |  2 +-
 services/xkms/xkms-service/pom.xml                       |  2 +-
 services/xkms/xkms-war/pom.xml                           |  2 +-
 services/xkms/xkms-x509-handlers/pom.xml                 |  2 +-
 services/xkms/xkms-x509-repo-ldap/pom.xml                |  2 +-
 systests/cdi/base/pom.xml                                |  2 +-
 systests/cdi/cdi-owb/cdi-multiple-apps-owb/pom.xml       |  2 +-
 systests/cdi/cdi-owb/cdi-no-apps-owb/pom.xml             |  2 +-
 systests/cdi/cdi-owb/cdi-producers-owb/pom.xml           |  2 +-
 systests/cdi/cdi-owb/pom.xml                             |  2 +-
 systests/cdi/cdi-weld/cdi-multiple-apps-weld/pom.xml     |  2 +-
 systests/cdi/cdi-weld/cdi-no-apps-weld/pom.xml           |  2 +-
 systests/cdi/cdi-weld/cdi-producers-weld/pom.xml         |  2 +-
 systests/cdi/cdi-weld/pom.xml                            |  2 +-
 systests/cdi/pom.xml                                     |  2 +-
 systests/container-integration/grizzly/pom.xml           |  2 +-
 systests/container-integration/pom.xml                   |  2 +-
 systests/container-integration/webapp/pom.xml            |  2 +-
 systests/databinding/pom.xml                             |  2 +-
 systests/jaxrs/pom.xml                                   |  2 +-
 systests/jaxws/pom.xml                                   |  2 +-
 systests/jibx/databinding-jibx/pom.xml                   |  2 +-
 systests/jibx/jaxrs-jibx/pom.xml                         |  2 +-
 systests/jibx/pom.xml                                    |  2 +-
 systests/kerberos/pom.xml                                |  2 +-
 systests/pom.xml                                         |  2 +-
 systests/rs-http-sci/pom.xml                             |  2 +-
 systests/rs-security/pom.xml                             |  2 +-
 systests/tracing/pom.xml                                 |  2 +-
 systests/transport-jms/pom.xml                           |  2 +-
 systests/transports-ssl3/pom.xml                         |  2 +-
 systests/transports/pom.xml                              |  2 +-
 systests/uncategorized/pom.xml                           |  2 +-
 systests/ws-rm/pom.xml                                   |  2 +-
 systests/ws-security-examples/pom.xml                    |  2 +-
 systests/ws-security/pom.xml                             |  2 +-
 systests/ws-specs/pom.xml                                |  2 +-
 systests/wsdl_maven/codegen/pom.xml                      |  2 +-
 systests/wsdl_maven/java2ws/pom.xml                      |  2 +-
 systests/wsdl_maven/pom.xml                              |  2 +-
 testutils/pom.xml                                        |  2 +-
 tools/common/pom.xml                                     |  2 +-
 tools/corba/pom.xml                                      |  2 +-
 tools/javato/pom.xml                                     |  2 +-
 tools/javato/ws/pom.xml                                  |  2 +-
 tools/pom.xml                                            |  2 +-
 tools/validator/pom.xml                                  |  2 +-
 tools/wadlto/jaxrs/pom.xml                               |  2 +-
 tools/wadlto/pom.xml                                     |  2 +-
 tools/wsdlto/core/pom.xml                                |  2 +-
 tools/wsdlto/databinding/jaxb/pom.xml                    |  2 +-
 tools/wsdlto/frontend/javascript/pom.xml                 |  2 +-
 tools/wsdlto/frontend/jaxws/pom.xml                      |  2 +-
 tools/wsdlto/misc/pom.xml                                |  2 +-
 tools/wsdlto/pom.xml                                     |  2 +-
 tools/wsdlto/test/pom.xml                                |  2 +-
 259 files changed, 482 insertions(+), 482 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index d4a1c85..563d02b 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml
index dd5927c..bfe4145 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../parent</relativePath>
     </parent>
     <dependencies>
diff --git a/distribution/manifest/pom.xml b/distribution/manifest/pom.xml
index 231db74..e384ceb 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../parent</relativePath>
     </parent>
     <properties>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 2735b7e..a335f79 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 2a34f6d..fda4d26 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-databinding-aegis</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</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 2cffaf3..72fb5e3 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</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 cfe5381..00ddf8d 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 766fdf9..c9f9921 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-management</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 edf681c..806c34d 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -117,17 +117,17 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-bindings-corba</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-tools-common</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 40f05cf..cb33824 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -224,17 +224,17 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-bindings-corba</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-tools-common</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 3e2ed90..8a3fc65 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -269,17 +269,17 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-bindings-corba</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-tools-common</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 28b0018..7774229 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</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 fb258b1..bdc3460 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-bindings-coloc</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 2693929..349a8ab 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 80ad0c2..5440a56 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</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 8fcf948..b4e6274 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-jms</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 06b845f..00ebd62 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</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 70d75d6..d4fb758 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 3f5716b..2766f2f 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -83,18 +83,18 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 a16048b..fa7e714 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 d366b32..716db85 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -35,22 +35,22 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-security-jose-jaxrs</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-security-sso-oidc</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 1e8832d..7e26321 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -35,27 +35,27 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-security-jose-jaxrs</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-extension-providers</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-security-sso-oidc</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 9dccf17..41e09d4 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -83,23 +83,23 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-extension-providers</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 c5a9909..e183672 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../..</relativePath>
     </parent>
 
@@ -124,23 +124,23 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-service-description-swagger</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 7368e6a..5369a65 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../..</relativePath>
     </parent>
 
@@ -69,17 +69,17 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-service-description-swagger</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 7b85eba..4cace20 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 @@ under the License.
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../..</relativePath>
     </parent>
 
@@ -71,17 +71,17 @@ under the License.
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-service-description-swagger</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 2bcbe4e..6a51d3a 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../..</relativePath>
     </parent>
 
@@ -63,23 +63,23 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-service-description-swagger</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 9bb5b63..9baace6 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 @@ under the License.
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../..</relativePath>
     </parent>
 
@@ -69,17 +69,17 @@ under the License.
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-service-description-swagger</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 7a15e2c..382b025 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 bfbb7b3..1c53409 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -84,33 +84,33 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-extension-search</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-extension-providers</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>                 
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-security-cors</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 17a57ef..7d99e2f 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 44e14d9..2448c19 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 a1c0c1b..96bf3fb 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 c92ee09..f5f99ea 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 829953f..43028ca 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -89,18 +89,18 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 2549f9b..4a650a4 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -152,33 +152,33 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-client</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>    
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-integration-tracing-brave</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-extension-providers</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 c11f56b..d4d7706 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -36,33 +36,33 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-client</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>    
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-integration-tracing-brave</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-extension-providers</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.blueprint</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 024bee4..e5f204e 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -83,33 +83,33 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-client</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>    
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-integration-tracing-htrace</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-extension-providers</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 bca5c17..091f08c 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -129,7 +129,7 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 ba5ce9c..8d039fa 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -68,17 +68,17 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-websocket</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 20bd782..ffb2f38 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -82,17 +82,17 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-websocket</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 87a76e9..3c9de95 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-databinding-aegis</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</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 b93a6b2..e23a833 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-hc</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</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 df19e7b..8b4411a 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</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 c40e03d..18fbc37 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</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 a52adee..69a6dfc 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 0d2e337..907b24d 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>..</relativePath>
     </parent>
     <properties>
@@ -36,23 +36,23 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-integration-tracing-brave</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
diff --git a/distribution/src/main/release/samples/jms_pubsub/pom.xml b/distribution/src/main/release/samples/jms_pubsub/pom.xml
index fdd6fff..202ea3a 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+                <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-jms</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 b2f95ae..86a3e0a 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-jms</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 72f2a16..204162c 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-jms</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 2abacf2..08a299f 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-jms</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 70be80b..4445ce0 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 973afb8..0bf2b51 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 659b1f4..8862f0b 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 35bee1d..d0feba8 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</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 dffd84c..8b4d3da 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 7932354..24c8a9c 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 5818f07..1885f0b 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</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 60cf7a0..ec38697 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 b2b657d..18e0405 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 443de18..e7ef4d0 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.18-SNAPSHOT</version>
+    <version>3.1.18</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 933053d..f3a5aad 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 cddfd8f..3ef40fa 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</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 6c82a87..63d34e6 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</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 ea4fbdd..0cd9c4f 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 5fc1fa9..3aa502a 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 4e56d34..35c6c9e 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 b0bba3b..5336b0d 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf.services.ws-discovery</groupId>
             <artifactId>cxf-services-ws-discovery-api</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf.services.ws-discovery</groupId>
             <artifactId>cxf-services-ws-discovery-service</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 1798fc8..cbc7454 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 fd4f808..7ff89fc 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-addr</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-policy</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf.services.wsn</groupId>
             <artifactId>cxf-services-wsn-core</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 9fdfcc5..a132d12 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 28dbf66..c428a1d 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-rm</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 9d1402f..276784c 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -165,38 +165,38 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-rm</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-security</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-addr</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-policy</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 2fd4533..bf67710 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 31bb3fd..210165d 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -154,23 +154,23 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-security</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 2ca5972..7428530 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 a075b8e..679aa1b 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-management</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-features-metrics</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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 1698d9f..6b7e521 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</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 f946818..94ab567 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 c7e414c..af1e8f8 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</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 53dc185..4e2d9c0 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</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 3f25b16..6217b3f 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</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 38c1f58..3827513 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</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 e57381b..3b93563 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.18-SNAPSHOT</version>
+        <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-databinding-xmlbeans</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.18-SNAPSHOT</version>
+            <version>3.1.18</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.18-SNAPSHOT</version>
+            <version>3.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/integration/cdi/pom.xml b/integration/cdi/pom.xml
index 827039e..8bfd50a 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     
diff --git a/integration/jca/pom.xml b/integration/jca/pom.xml
index acc9340..3bc7fec 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/integration/pom.xml b/integration/pom.xml
index bd0218d..3ea4a30 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
     </parent>
     <modules>
         <module>jca</module>
diff --git a/integration/spring-boot/autoconfigure/pom.xml b/integration/spring-boot/autoconfigure/pom.xml
index bbb5fbc..9da6152 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <build>
diff --git a/integration/spring-boot/pom.xml b/integration/spring-boot/pom.xml
index f65ba61..397c82f 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 5786201..28fd209 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 540b4f0..7885583 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 b938dae..2c14a14 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     
diff --git a/integration/tracing/tracing-htrace/pom.xml b/integration/tracing/tracing-htrace/pom.xml
index 9d252ff..69e898f 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 238a725..6346607 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 e183add..450d45c 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <groupId>org.apache.cxf.archetype</groupId>
     <artifactId>cxf-jaxws-javafirst</artifactId>
-    <version>3.1.18-SNAPSHOT</version>
+    <version>3.1.18</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 a028643..35bc320 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 1b89c8c..bfae385 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
     </parent>
     <dependencies>
         <dependency>
diff --git a/maven-plugins/corba/pom.xml b/maven-plugins/corba/pom.xml
index 2440866..69042e5 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
     </parent>
     <dependencies>
         <dependency>
diff --git a/maven-plugins/java2wadl-plugin/pom.xml b/maven-plugins/java2wadl-plugin/pom.xml
index 404cca3..bd19db0 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.18-SNAPSHOT</version>
+    <version>3.1.18</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.18-SNAPSHOT</version>
+      <version>3.1.18</version>
     </parent>
     <properties>
         <cxf.manifest.location />
diff --git a/maven-plugins/java2ws-plugin/pom.xml b/maven-plugins/java2ws-plugin/pom.xml
index dafea5c..5c22a43 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
     </parent>
     <dependencies>
         <dependency>
diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml
index 49b923b..e681068 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../parent</relativePath>
     </parent>
     <prerequisites>
diff --git a/maven-plugins/wadl2java-plugin/pom.xml b/maven-plugins/wadl2java-plugin/pom.xml
index 2b91b11..e892780 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
     </parent>
     <dependencies>
         <dependency>
diff --git a/maven-plugins/wsdl-validator-plugin/pom.xml b/maven-plugins/wsdl-validator-plugin/pom.xml
index ce36e8b..8f27ec7 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
     </parent>
     <dependencies>
         <dependency>
diff --git a/osgi/bundle/compatible/pom.xml b/osgi/bundle/compatible/pom.xml
index f8bb100..ca95cce 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 26150e5..2bcfb52 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../parent</relativePath>
     </parent>
     <properties>
diff --git a/osgi/itests-felix/pom.xml b/osgi/itests-felix/pom.xml
index d3413e8..3513daf 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 926cd6a..78377f8 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 8458347..8b2cb1c 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 3bf5c30..5da8560 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
     </parent>
     <artifactId>apache-cxf</artifactId>
     <packaging>pom</packaging>
diff --git a/osgi/karaf/pom.xml b/osgi/karaf/pom.xml
index 7da5260..384ec07 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../parent</relativePath>
     </parent>
     <groupId>org.apache.cxf.karaf</groupId>
diff --git a/osgi/pom.xml b/osgi/pom.xml
index 440902e..f8b361a 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
     </parent>
     <modules>
         <module>bundle</module>
diff --git a/parent/pom.xml b/parent/pom.xml
index bc21634..2721c2c 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>cxf-parent</artifactId>
diff --git a/pom.xml b/pom.xml
index 619c169..436a061 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.18-SNAPSHOT</version>
+    <version>3.1.18</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.18</tag>
     </scm>
     <issueManagement>
         <system>jira</system>
diff --git a/rt/bindings/coloc/pom.xml b/rt/bindings/coloc/pom.xml
index 63ec204..3aae2ab 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/bindings/corba/pom.xml b/rt/bindings/corba/pom.xml
index d290495..53a85f2 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/bindings/object/pom.xml b/rt/bindings/object/pom.xml
index 999b8e9..5f7f25d 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/bindings/pom.xml b/rt/bindings/pom.xml
index 62fc4d2..fca1290 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
     </parent>
     <modules>
         <module>soap</module>
diff --git a/rt/bindings/soap/pom.xml b/rt/bindings/soap/pom.xml
index 2027da1..8c6b076 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/bindings/xml/pom.xml b/rt/bindings/xml/pom.xml
index b11f454..a827b06 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/rt/databinding/aegis/pom.xml b/rt/databinding/aegis/pom.xml
index 9b84d8a..5ab9568 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     
diff --git a/rt/databinding/jaxb/pom.xml b/rt/databinding/jaxb/pom.xml
index e0ceeef..2058609 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/databinding/jibx/pom.xml b/rt/databinding/jibx/pom.xml
index 39925cf..8cb7f81 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/rt/databinding/pom.xml b/rt/databinding/pom.xml
index 3300bde..014e707 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
     </parent>
     <modules>
         <module>jaxb</module>
diff --git a/rt/databinding/sdo/pom.xml b/rt/databinding/sdo/pom.xml
index 62b06b7..24adf00 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/databinding/xmlbeans/pom.xml b/rt/databinding/xmlbeans/pom.xml
index 38556c7..2d02501 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/features/clustering/pom.xml b/rt/features/clustering/pom.xml
index db8052a..13a08fc 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/features/logging/pom.xml b/rt/features/logging/pom.xml
index 10bbb8e..141485d 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 6fa8fbb..455f475 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 0322451..89e74b7 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
     </parent>
     <modules>
         <module>clustering</module>
diff --git a/rt/features/throttling/pom.xml b/rt/features/throttling/pom.xml
index 98aaeb7..911f908 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 3e04140..95ecf07 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/frontend/jaxws/pom.xml b/rt/frontend/jaxws/pom.xml
index e49e6f8..5e6d43c 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/frontend/js/pom.xml b/rt/frontend/js/pom.xml
index 4ad7503..30a30f3 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/rt/frontend/pom.xml b/rt/frontend/pom.xml
index b4b224d..e303e73 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
     </parent>
     <modules>
         <module>simple</module>
diff --git a/rt/frontend/simple/pom.xml b/rt/frontend/simple/pom.xml
index 2e6a3f6..02d8aa6 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 a329c34..925ab7f 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
     </parent>
     <dependencies>
         <dependency>
diff --git a/rt/javascript/javascript-tests/pom.xml b/rt/javascript/javascript-tests/pom.xml
index ec5afe2..3a293e9 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
     </parent>
     <dependencies>
         <dependency>
diff --git a/rt/javascript/pom.xml b/rt/javascript/pom.xml
index ffb699b..3035061 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <modules>
diff --git a/rt/management-web/pom.xml b/rt/management-web/pom.xml
index 16f3445..55413af 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/management/pom.xml b/rt/management/pom.xml
index 57821fe..ca467a1 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/rt/pom.xml b/rt/pom.xml
index 0e4f049..9aab9c7 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
     </parent>
     <modules>
         <module>wsdl</module>
diff --git a/rt/rs/client/pom.xml b/rt/rs/client/pom.xml
index 4aa71e7..472d551 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 fe876f5..2feb935 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/rs/description/pom.xml b/rt/rs/description/pom.xml
index ac6fa28..7cb153a 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 c09f3a3..1fcbf0b 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 91967af..55b74db 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 704b3f0..62abd9d 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 7c8ea93..a6cef91 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/rs/pom.xml b/rt/rs/pom.xml
index 4776cf2..939de48 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
     </parent>
     <modules>
         <module>client</module>
diff --git a/rt/rs/security/cors/pom.xml b/rt/rs/security/cors/pom.xml
index 58add9f..2d244df 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 53360fe..4378dce 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 3dd048b..c972ca9 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 5225d14..2128797 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 e964d83..18ca886 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 f2d0a4e..cb0a17e 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 19113f3..00f1dcb 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.18-SNAPSHOT</version>
+    <version>3.1.18</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 ff2d589..2469071 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/rs/security/pom.xml b/rt/rs/security/pom.xml
index 250bb8f..9a6ef35 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 66034a3..255ffdc 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.18-SNAPSHOT</version>
+    <version>3.1.18</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 833437e..70c49e9 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 6671437..a2fc74c 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/security-saml/pom.xml b/rt/security-saml/pom.xml
index 5d8b819..fb2f8f0 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/security/pom.xml b/rt/security/pom.xml
index 0efc4f5..4a42a41 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 4b7ed15..a15d9a1 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 0d8306a..f622031 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 b4ab4c8..0428b7d 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 5131fb3..44d6c28 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/transports/http/pom.xml b/rt/transports/http/pom.xml
index 9a621b1..04208e9 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/transports/jms/pom.xml b/rt/transports/jms/pom.xml
index d38d93a..5ee1268 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/transports/local/pom.xml b/rt/transports/local/pom.xml
index b521695..60f5f3c 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/rt/transports/pom.xml b/rt/transports/pom.xml
index d7ed46a..207f6a1 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
     </parent>
     <modules>
         <module>local</module>
diff --git a/rt/transports/udp/pom.xml b/rt/transports/udp/pom.xml
index ef0a08b..30bec18 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/rt/transports/websocket/pom.xml b/rt/transports/websocket/pom.xml
index 9faed98..f1118cf 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/ws/addr/pom.xml b/rt/ws/addr/pom.xml
index 83aafe2..99c50f4 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/ws/eventing/pom.xml b/rt/ws/eventing/pom.xml
index 795ed9f..b80646b 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/rt/ws/mex/pom.xml b/rt/ws/mex/pom.xml
index a8c3bb3..6a849a0 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/rt/ws/policy/pom.xml b/rt/ws/policy/pom.xml
index c381815..b095958 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/ws/pom.xml b/rt/ws/pom.xml
index 619f48d..d777919 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
     </parent>
     <modules>
         <module>policy</module>
diff --git a/rt/ws/rm/pom.xml b/rt/ws/rm/pom.xml
index 024330c..5ad047c 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/ws/security/pom.xml b/rt/ws/security/pom.xml
index 03dc8f4..1cd6171 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/rt/wsdl/pom.xml b/rt/wsdl/pom.xml
index dce3e4c..722549a 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/services/pom.xml b/services/pom.xml
index 185a5cb..ace2ca7 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
     </parent>
     <modules>
         <module>sts</module>
diff --git a/services/sts/pom.xml b/services/sts/pom.xml
index 408c91e..745d945 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modules>
diff --git a/services/sts/sts-core/pom.xml b/services/sts/sts-core/pom.xml
index aa38d56..fe91249 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 be1ffeb..6c8c4aa 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 fe57ee2..f4a78d5 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 d458fbe..ace5893 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/services/sts/systests/pom.xml b/services/sts/systests/pom.xml
index 94660e2..6e7d715 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 8debf47..bc95c78 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 09d2891..1a40eef 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 2d7856b..5f2e713 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/services/ws-discovery/pom.xml b/services/ws-discovery/pom.xml
index 3354253..8a26e8a 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 8e6908c..adc5d88 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 6893b13..e1a365a 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/services/wsn/pom.xml b/services/wsn/pom.xml
index d1b3a7e..2511ea2 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modules>
diff --git a/services/wsn/wsn-api/pom.xml b/services/wsn/wsn-api/pom.xml
index 126b5a1..3f69830 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 aead148..239f6f1 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 1de45ad..971bd4d 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/services/xkms/pom.xml b/services/xkms/pom.xml
index d708361..9edadaf 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modules>
diff --git a/services/xkms/xkms-client/pom.xml b/services/xkms/xkms-client/pom.xml
index 1dd2e6b..88f3fed 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 2c660cd..c8ce016 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 b865c13..ccb5358 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 4ff1209..7f8b36b 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 5528821..6756526 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 eb95f01..ed08f84 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 0009a2c..91842af 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 a4bdcb6..a6af10e 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 0260965..38c11d9 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 61e4b0a..5445551 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 44edf25..d37e3c5 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 a6bd918..8f18451 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 8e1472b..2b7154b 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 25df4ac..5bb6c2d 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 5325496..28ec50d 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 808028b..5fbfbff 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 0e68bf6..0ddd767 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 d4a01eb..45ae6ad 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/systests/cdi/pom.xml b/systests/cdi/pom.xml
index 16bc8f2..20ec2c4 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 c7ee7a0..d543842 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 dd7a85d..345bbdf 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 703bad9..9f24d53 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 cbce11a..d74eb07 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 29a92de..f13721f 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 23a48b7..4ac5577 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 4bebad1..86a93cb 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 feff3fa..6dddcac 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/systests/jibx/pom.xml b/systests/jibx/pom.xml
index 238b197..55c6fb0 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 a3f2d12..5ed1bc2 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/systests/pom.xml b/systests/pom.xml
index 1e414fd..d6c7c71 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
     </parent>
     <modules>
         <module>container-integration</module>
diff --git a/systests/rs-http-sci/pom.xml b/systests/rs-http-sci/pom.xml
index cef8cc0..713957d 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 86f5a6e..644bde0 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 e8182b3..c91a448 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 998b4c1..497c383 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 97f0e9e..510e133 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 b318eaf..8c490b6 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 a2162d7..6dc134b 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 f64d37a..42ce451 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 adb2ee1..21f503b 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 bbad555..7afb253 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 3e0e6be..6f9c4a1 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 25f3b3f..4627f18 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 9b4885d..b34c676 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <build>
diff --git a/systests/wsdl_maven/pom.xml b/systests/wsdl_maven/pom.xml
index 524ae4e..4759a88 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
     </parent>
     <modules>
         <module>codegen</module>
diff --git a/testutils/pom.xml b/testutils/pom.xml
index 0caccd9..b3d8754 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/tools/common/pom.xml b/tools/common/pom.xml
index 55a1e5c..e0c42b9 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/tools/corba/pom.xml b/tools/corba/pom.xml
index e0fb90c..d7ddaf6 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/tools/javato/pom.xml b/tools/javato/pom.xml
index 129b002..c1e9621 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
     </parent>
     <modules>
         <module>ws</module>
diff --git a/tools/javato/ws/pom.xml b/tools/javato/ws/pom.xml
index d574b85..2db4d4c 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/tools/pom.xml b/tools/pom.xml
index a82b72a..b0c5312 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
     </parent>
     <modules>
         <module>common</module>
diff --git a/tools/validator/pom.xml b/tools/validator/pom.xml
index e089e6d..60f3f21 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <properties>
diff --git a/tools/wadlto/jaxrs/pom.xml b/tools/wadlto/jaxrs/pom.xml
index f51bce0..3e0f906 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/tools/wadlto/pom.xml b/tools/wadlto/pom.xml
index 81ba414..9f14ba6 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
     </parent>
     <modules>
         <module>jaxrs</module>
diff --git a/tools/wsdlto/core/pom.xml b/tools/wsdlto/core/pom.xml
index 8046c59..c675bf5 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 57ab1c3..0c52c17 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 33d60c3..b50a551 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.18-SNAPSHOT</version>
+        <version>3.1.18</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 3899612..6116b1b 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/tools/wsdlto/misc/pom.xml b/tools/wsdlto/misc/pom.xml
index dc2008e..d63afd6 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/tools/wsdlto/pom.xml b/tools/wsdlto/pom.xml
index c6368d4..009c891 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
     </parent>
     <modules>
         <module>core</module>
diff --git a/tools/wsdlto/test/pom.xml b/tools/wsdlto/test/pom.xml
index a68c934..aa84682 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.18-SNAPSHOT</version>
+        <version>3.1.18</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
     <dependencies>