diff --git a/extensions-samples/chat-cdi/pom.xml b/extensions-samples/chat-cdi/pom.xml
index 4d5d46f5..d09f1d10 100644
--- a/extensions-samples/chat-cdi/pom.xml
+++ b/extensions-samples/chat-cdi/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <groupId>org.atmosphere</groupId>
         <artifactId>atmosphere-samples-project</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
         <relativePath>../../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>atmosphere-chat-cdi</artifactId>
     <packaging>war</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>atmosphere-chat-cdi</name>
     <url>http://maven.apache.org</url>
     <dependencies>
diff --git a/extensions-samples/cometd/pom.xml b/extensions-samples/cometd/pom.xml
index e7f86a45..e60b4b93 100644
--- a/extensions-samples/cometd/pom.xml
+++ b/extensions-samples/cometd/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.atmosphere</groupId>
         <artifactId>atmosphere-samples-project</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
         <relativePath>../../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/extensions-samples/guice/chat-guice/pom.xml b/extensions-samples/guice/chat-guice/pom.xml
index 7a02d1e8..7d0b8000 100755
--- a/extensions-samples/guice/chat-guice/pom.xml
+++ b/extensions-samples/guice/chat-guice/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <groupId>org.atmosphere</groupId>
         <artifactId>atmosphere-samples-project</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
         <relativePath>../../../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>atmosphere-guice-chat</artifactId>
     <packaging>war</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>atmosphere-guice-chat</name>
     <url>http://maven.apache.org</url>
     <dependencies>
diff --git a/extensions-samples/gwt/gwt20-jersey-rpc/pom.xml b/extensions-samples/gwt/gwt20-jersey-rpc/pom.xml
index a480fbc7..ae131cae 100644
--- a/extensions-samples/gwt/gwt20-jersey-rpc/pom.xml
+++ b/extensions-samples/gwt/gwt20-jersey-rpc/pom.xml
@@ -3,12 +3,12 @@
     <parent>
         <groupId>org.atmosphere.extensions</groupId>
         <artifactId>atmosphere-samples-gwt20-project</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
         <relativePath>../</relativePath>
     </parent>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>gwt20-jersey-rpc</artifactId>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <packaging>war</packaging>
     <name>gwt20-jersey-rpc</name>
 
diff --git a/extensions-samples/gwt/gwt20-json/pom.xml b/extensions-samples/gwt/gwt20-json/pom.xml
index eb0cf319..28304161 100644
--- a/extensions-samples/gwt/gwt20-json/pom.xml
+++ b/extensions-samples/gwt/gwt20-json/pom.xml
@@ -3,12 +3,12 @@
     <parent>
         <groupId>org.atmosphere.extensions</groupId>
         <artifactId>atmosphere-samples-gwt20-project</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
         <relativePath>../</relativePath>
     </parent>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>gwt20-json</artifactId>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <packaging>war</packaging>
     <name>gwt20-json</name>
 
diff --git a/extensions-samples/gwt/gwt20-managed-rpc/pom.xml b/extensions-samples/gwt/gwt20-managed-rpc/pom.xml
index 7dd2425d..a955ef0b 100644
--- a/extensions-samples/gwt/gwt20-managed-rpc/pom.xml
+++ b/extensions-samples/gwt/gwt20-managed-rpc/pom.xml
@@ -3,12 +3,12 @@
     <parent>
         <groupId>org.atmosphere.extensions</groupId>
         <artifactId>atmosphere-samples-gwt20-project</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
         <relativePath>../</relativePath>
     </parent>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>gwt20-managed-rpc</artifactId>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <packaging>war</packaging>
     <name>gwt20-managed-rpc</name>
 
diff --git a/extensions-samples/gwt/gwt20-rpc/pom.xml b/extensions-samples/gwt/gwt20-rpc/pom.xml
index d18044da..012c0178 100644
--- a/extensions-samples/gwt/gwt20-rpc/pom.xml
+++ b/extensions-samples/gwt/gwt20-rpc/pom.xml
@@ -3,12 +3,12 @@
     <parent>
         <groupId>org.atmosphere.extensions</groupId>
         <artifactId>atmosphere-samples-gwt20-project</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
         <relativePath>../</relativePath>
     </parent>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>gwt20-rpc</artifactId>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <packaging>war</packaging>
     <name>gwt20-rpc</name>
 
diff --git a/extensions-samples/gwt/pom.xml b/extensions-samples/gwt/pom.xml
index c675bbba..a3f069c3 100644
--- a/extensions-samples/gwt/pom.xml
+++ b/extensions-samples/gwt/pom.xml
@@ -4,13 +4,13 @@
     <parent>
         <groupId>org.atmosphere</groupId>
         <artifactId>atmosphere-samples-project</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
         <relativePath>../../</relativePath>
     </parent>
     <groupId>org.atmosphere.extensions</groupId>
     <artifactId>atmosphere-samples-gwt20-project</artifactId>
     <name>atmosphere-samples-gwt20-project</name>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <packaging>pom</packaging>
 
     <url>https://github.com/Atmosphere/atmosphere-extensions/gwt20</url>
diff --git a/extensions-samples/hazelcast/pom.xml b/extensions-samples/hazelcast/pom.xml
index e80eba4c..26b18026 100644
--- a/extensions-samples/hazelcast/pom.xml
+++ b/extensions-samples/hazelcast/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.atmosphere</groupId>
         <artifactId>atmosphere-samples-project</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
         <relativePath>../../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/extensions-samples/jgroups/pom.xml b/extensions-samples/jgroups/pom.xml
index 874e8cb7..6466be01 100644
--- a/extensions-samples/jgroups/pom.xml
+++ b/extensions-samples/jgroups/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.atmosphere</groupId>
         <artifactId>atmosphere-samples-project</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
         <relativePath>../../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/extensions-samples/kafka/jersey-pubsub/pom.xml b/extensions-samples/kafka/jersey-pubsub/pom.xml
index 6c43ecf7..107ab7ca 100644
--- a/extensions-samples/kafka/jersey-pubsub/pom.xml
+++ b/extensions-samples/kafka/jersey-pubsub/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.atmosphere</groupId>
         <artifactId>atmosphere-samples-project</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
         <relativePath>../../../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/extensions-samples/pom.xml b/extensions-samples/pom.xml
index 9d8a3036..96b37aed 100755
--- a/extensions-samples/pom.xml
+++ b/extensions-samples/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <groupId>org.atmosphere</groupId>
         <artifactId>atmosphere-samples-project</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
         <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>atmosphere-extensions-samples</artifactId>
     <packaging>pom</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>atmosphere-extensions-samples</name>
     <modules>
         <module>chat-cdi/</module>
diff --git a/extensions-samples/rabbitmq/jersey-pubsub/pom.xml b/extensions-samples/rabbitmq/jersey-pubsub/pom.xml
index 426e47f2..9a9217d4 100644
--- a/extensions-samples/rabbitmq/jersey-pubsub/pom.xml
+++ b/extensions-samples/rabbitmq/jersey-pubsub/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.atmosphere</groupId>
         <artifactId>atmosphere-samples-project</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
         <relativePath>../../../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/extensions-samples/redis/pom.xml b/extensions-samples/redis/pom.xml
index d1bf650c..ff4a7ae9 100644
--- a/extensions-samples/redis/pom.xml
+++ b/extensions-samples/redis/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.atmosphere</groupId>
         <artifactId>atmosphere-samples-project</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
         <relativePath>../../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/extensions-samples/rmi/pom.xml b/extensions-samples/rmi/pom.xml
index 6a96550f..8cfe88b8 100644
--- a/extensions-samples/rmi/pom.xml
+++ b/extensions-samples/rmi/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.atmosphere</groupId>
         <artifactId>atmosphere-samples-project</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
         <relativePath>../../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/extensions-samples/socketio/native-socketio-chat/pom.xml b/extensions-samples/socketio/native-socketio-chat/pom.xml
index b8cad67f..19f23c87 100755
--- a/extensions-samples/socketio/native-socketio-chat/pom.xml
+++ b/extensions-samples/socketio/native-socketio-chat/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <groupId>org.atmosphere</groupId>
         <artifactId>atmosphere-samples-project</artifactId>
-		<version>2.4.9-SNAPSHOT</version>
+		<version>2.4.18</version>
         <relativePath>../../../</relativePath>
     </parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.atmosphere.samples</groupId>
 	<artifactId>atmosphere-nativesocketio-chat</artifactId>
 	<packaging>war</packaging>
-	<version>2.4.9-SNAPSHOT</version>
+	<version>2.4.18</version>
 	<name>atmosphere-nativesocketio-chat</name>
 	<url>http://maven.apache.org</url>
 	<dependencies>
diff --git a/extensions-samples/socketio/socketio-chat/pom.xml b/extensions-samples/socketio/socketio-chat/pom.xml
index 08fb526f..259b69ad 100755
--- a/extensions-samples/socketio/socketio-chat/pom.xml
+++ b/extensions-samples/socketio/socketio-chat/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <groupId>org.atmosphere</groupId>
         <artifactId>atmosphere-samples-project</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
         <relativePath>../../../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>atmosphere-socketio-chat</artifactId>
     <packaging>war</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>atmosphere-socketio-chat</name>
     <url>http://maven.apache.org</url>
     <build>
diff --git a/extensions-samples/sockjs/sockjs-chat/pom.xml b/extensions-samples/sockjs/sockjs-chat/pom.xml
index c69c3468..773d8565 100644
--- a/extensions-samples/sockjs/sockjs-chat/pom.xml
+++ b/extensions-samples/sockjs/sockjs-chat/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <groupId>org.atmosphere</groupId>
         <artifactId>atmosphere-samples-project</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
         <relativePath>../../../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>atmosphere-sockjs-chat</artifactId>
     <packaging>war</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>atmosphere-sockjs-chat</name>
     <url>http://maven.apache.org</url>
     <dependencies>
diff --git a/extensions-samples/sockjs/sockjs-demo/pom.xml b/extensions-samples/sockjs/sockjs-demo/pom.xml
index 52537803..1201f85f 100644
--- a/extensions-samples/sockjs/sockjs-demo/pom.xml
+++ b/extensions-samples/sockjs/sockjs-demo/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <groupId>org.atmosphere</groupId>
         <artifactId>atmosphere-samples-project</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
         <relativePath>../../../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>atmosphere-sockjs-demo</artifactId>
     <packaging>war</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>broadcast</name>
     <url>http://maven.apache.org</url>
     <dependencies>
diff --git a/extensions-samples/spring/spring-echo/pom.xml b/extensions-samples/spring/spring-echo/pom.xml
index 8f702a2d..f54e5197 100644
--- a/extensions-samples/spring/spring-echo/pom.xml
+++ b/extensions-samples/spring/spring-echo/pom.xml
@@ -2,14 +2,14 @@
     <parent>
         <groupId>org.atmosphere</groupId>
         <artifactId>atmosphere-samples-project</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
         <relativePath>../../../</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>atmosphere-spring-echo</artifactId>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <packaging>war</packaging>
 
     <build>
diff --git a/extensions-samples/spring/spring-inject/pom.xml b/extensions-samples/spring/spring-inject/pom.xml
index 63f97d2a..9f9feb14 100644
--- a/extensions-samples/spring/spring-inject/pom.xml
+++ b/extensions-samples/spring/spring-inject/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <groupId>org.atmosphere</groupId>
         <artifactId>atmosphere-samples-project</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
         <relativePath>../../../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>atmosphere-chat-spring-inject</artifactId>
     <packaging>war</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>atmosphere-chat-spring-inject</name>
     <url>http://maven.apache.org</url>
     <dependencies>
diff --git a/extensions-samples/spring/spring-websocket/pom.xml b/extensions-samples/spring/spring-websocket/pom.xml
index 8c06243e..8c86c8a7 100644
--- a/extensions-samples/spring/spring-websocket/pom.xml
+++ b/extensions-samples/spring/spring-websocket/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.atmosphere</groupId>
         <artifactId>atmosphere-samples-project</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
         <relativePath>../../../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>atmosphere-spring-websocket</artifactId>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <packaging>war</packaging>
 
     <properties>
diff --git a/extensions-samples/xmpp/pom.xml b/extensions-samples/xmpp/pom.xml
index e62a0a6f..771251f8 100644
--- a/extensions-samples/xmpp/pom.xml
+++ b/extensions-samples/xmpp/pom.xml
@@ -2,12 +2,12 @@
     <parent>
         <groupId>org.atmosphere</groupId>
         <artifactId>atmosphere-samples-project</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
         <relativePath>../../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>atmosphere-xmpp-demo</artifactId>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <packaging>war</packaging>
     <name>atmosphere-xmpp-demo</name>
 
diff --git a/nettosphere-samples/chat/pom.xml b/nettosphere-samples/chat/pom.xml
index e8591795..7e22612b 100644
--- a/nettosphere-samples/chat/pom.xml
+++ b/nettosphere-samples/chat/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.atmosphere.samples</groupId>
         <artifactId>nettosphere-samples</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.nettosphere.samples</groupId>
     <artifactId>nettosphere-chat</artifactId>
     <packaging>jar</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>Nettosphere Chat</name>
     <url>http://maven.apache.org</url>
 
diff --git a/nettosphere-samples/games/pom.xml b/nettosphere-samples/games/pom.xml
index 64312466..51c2c382 100644
--- a/nettosphere-samples/games/pom.xml
+++ b/nettosphere-samples/games/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.atmosphere.samples</groupId>
         <artifactId>nettosphere-samples</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.nettosphere.samples</groupId>
     <artifactId>nettosphere-games</artifactId>
     <packaging>jar</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>Nettosphere Snake Games</name>
     <url>http://maven.apache.org</url>
 
diff --git a/nettosphere-samples/jersey-chat/pom.xml b/nettosphere-samples/jersey-chat/pom.xml
index 3426ba24..d5705f34 100644
--- a/nettosphere-samples/jersey-chat/pom.xml
+++ b/nettosphere-samples/jersey-chat/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.atmosphere.samples</groupId>
         <artifactId>nettosphere-samples</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.nettosphere.samples</groupId>
     <artifactId>nettosphere-jersey-chat</artifactId>
     <packaging>jar</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>Nettosphere Jersey Chat</name>
     <url>http://maven.apache.org</url>
 
diff --git a/nettosphere-samples/pom.xml b/nettosphere-samples/pom.xml
index be3e91fe..e377b766 100644
--- a/nettosphere-samples/pom.xml
+++ b/nettosphere-samples/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.atmosphere</groupId>
         <artifactId>atmosphere-samples-project</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>nettosphere-samples</artifactId>
     <packaging>pom</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>atmosphere-samples</name>
     <modules>
         <module>chat</module>
diff --git a/nettosphere-samples/socketio-chat/pom.xml b/nettosphere-samples/socketio-chat/pom.xml
index 1a8231ea..c675a2fb 100644
--- a/nettosphere-samples/socketio-chat/pom.xml
+++ b/nettosphere-samples/socketio-chat/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.atmosphere.samples</groupId>
         <artifactId>nettosphere-samples</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.nettosphere.samples</groupId>
     <artifactId>nettosphere-socketio-chat</artifactId>
     <packaging>jar</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>Nettosphere SocketIO Chat</name>
     <url>http://maven.apache.org</url>
 
diff --git a/pom.xml b/pom.xml
index d43cee1f..030a01dc 100755
--- a/pom.xml
+++ b/pom.xml
@@ -11,13 +11,13 @@
     <artifactId>atmosphere-samples-project</artifactId>
     <packaging>pom</packaging>
     <name>atmosphere-samples-project</name>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <url>http://github.com/Atmosphere/atmosphere-samples</url>
     <scm>
         <connection>scm:git:git@github.com:Atmosphere/atmosphere-samples.git</connection>
         <developerConnection>scm:git:git@github.com:Atmosphere/atmosphere-samples.git</developerConnection>
         <url>http://github.com/Atmosphere/atmosphere-samples</url>
-      <tag>HEAD</tag>
+      <tag>atmosphere-samples-project-2.4.18</tag>
   </scm>
     <prerequisites>
         <maven>2.2.0</maven>
diff --git a/samples/all-api-pubsub/pom.xml b/samples/all-api-pubsub/pom.xml
index c04458b1..a789e82d 100644
--- a/samples/all-api-pubsub/pom.xml
+++ b/samples/all-api-pubsub/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.atmosphere.samples</groupId>
         <artifactId>atmosphere-samples</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>atmosphere-all-api-pubsub</artifactId>
     <packaging>war</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>atmosphere-all-api-pubsub</name>
     <url>http://maven.apache.org</url>
     <dependencies>
diff --git a/samples/async-annotation-pubsub/pom.xml b/samples/async-annotation-pubsub/pom.xml
index 3f13703d..10708834 100644
--- a/samples/async-annotation-pubsub/pom.xml
+++ b/samples/async-annotation-pubsub/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.atmosphere.samples</groupId>
         <artifactId>atmosphere-samples</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>atmosphere-annotation-pubsub</artifactId>
     <packaging>war</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>atmosphere-annotation-pubsub</name>
     <url>http://maven.apache.org</url>
     <dependencies>
diff --git a/samples/atmosphere-ee6/pom.xml b/samples/atmosphere-ee6/pom.xml
index 48d31cf0..b2ceeb5c 100644
--- a/samples/atmosphere-ee6/pom.xml
+++ b/samples/atmosphere-ee6/pom.xml
@@ -3,11 +3,11 @@
     <parent>
         <groupId>org.atmosphere.samples</groupId>
         <artifactId>atmosphere-samples</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>atmosphere-ee6</artifactId>
     <name>atmosphere-ee6</name>
diff --git a/samples/atmospherehandler-pubsub/pom.xml b/samples/atmospherehandler-pubsub/pom.xml
index 5285339d..6a67901d 100644
--- a/samples/atmospherehandler-pubsub/pom.xml
+++ b/samples/atmospherehandler-pubsub/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.atmosphere.samples</groupId>
         <artifactId>atmosphere-samples</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>atmosphere-atmospherehandler-pubsub</artifactId>
     <packaging>war</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>atmosphere-atmospherehandler-pubsub</name>
     <url>http://maven.apache.org</url>
     <dependencies>
diff --git a/samples/channel/pom.xml b/samples/channel/pom.xml
index 9f4bd30d..fb46dc3c 100755
--- a/samples/channel/pom.xml
+++ b/samples/channel/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.atmosphere.samples</groupId>
         <artifactId>atmosphere-samples</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>atmosphere-channel</artifactId>
     <packaging>war</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>atmosphere-channel</name>
     <url>http://maven.apache.org</url>
     <dependencies>
diff --git a/samples/chat-multiroom/pom.xml b/samples/chat-multiroom/pom.xml
index d3a0e153..3735bce2 100644
--- a/samples/chat-multiroom/pom.xml
+++ b/samples/chat-multiroom/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.atmosphere.samples</groupId>
         <artifactId>atmosphere-samples</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>atmosphere-chat-multiroom</artifactId>
     <packaging>war</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>atmosphere-chat-multiroom</name>
     <url>http://maven.apache.org</url>
     <dependencies>
diff --git a/samples/chat-node-client/pom.xml b/samples/chat-node-client/pom.xml
index 4b79435f..d264edbe 100644
--- a/samples/chat-node-client/pom.xml
+++ b/samples/chat-node-client/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.atmosphere.samples</groupId>
         <artifactId>atmosphere-samples</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>atmosphere-chat-node-client</artifactId>
     <packaging>jar</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>atmosphere-chat-node-client</name>
     <url>http://maven.apache.org</url>
     <build>
diff --git a/samples/chat/pom.xml b/samples/chat/pom.xml
index 7a514a4e..79a5920a 100644
--- a/samples/chat/pom.xml
+++ b/samples/chat/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.atmosphere.samples</groupId>
         <artifactId>atmosphere-samples</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>atmosphere-chat</artifactId>
     <packaging>war</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>atmosphere-chat</name>
     <url>http://maven.apache.org</url>
     <dependencies>
diff --git a/samples/commons/pom.xml b/samples/commons/pom.xml
index e12a585b..7ff07ebe 100644
--- a/samples/commons/pom.xml
+++ b/samples/commons/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.atmosphere.samples</groupId>
         <artifactId>atmosphere-samples</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere</groupId>
     <artifactId>atmosphere-samples-commons</artifactId>
     <packaging>jar</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>atmosphere-samples-commons</name>
     <url>http://maven.apache.org</url>
     <dependencies>
diff --git a/samples/cxf-chat-osgi/pom.xml b/samples/cxf-chat-osgi/pom.xml
index a0ec6822..53dc7d76 100644
--- a/samples/cxf-chat-osgi/pom.xml
+++ b/samples/cxf-chat-osgi/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.atmosphere.samples</groupId>
         <artifactId>atmosphere-samples</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>atmosphere-cxf-chat-osgi</artifactId>
     <packaging>bundle</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>atmosphere-rest-chat</name>
     <url>http://maven.apache.org</url>
     <properties>
diff --git a/samples/cxf-chat/pom.xml b/samples/cxf-chat/pom.xml
index 75b8aa5b..4ee1c1b4 100644
--- a/samples/cxf-chat/pom.xml
+++ b/samples/cxf-chat/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.atmosphere.samples</groupId>
         <artifactId>atmosphere-samples</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>atmosphere-cxf-chat</artifactId>
     <packaging>war</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>atmosphere-rest-chat</name>
     <url>http://maven.apache.org</url>
     <properties>
diff --git a/samples/embedded-jetty-websocket-chat/pom.xml b/samples/embedded-jetty-websocket-chat/pom.xml
index 2cc41a36..48ecb560 100644
--- a/samples/embedded-jetty-websocket-chat/pom.xml
+++ b/samples/embedded-jetty-websocket-chat/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.atmosphere.samples</groupId>
         <artifactId>atmosphere-samples</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>atmosphere-jetty-embedded-websocket</artifactId>
     <packaging>jar</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>atmosphere-jetty-embedded-websocket</name>
     <url>http://maven.apache.org</url>
     <dependencies>
diff --git a/samples/jersey-pubsub/pom.xml b/samples/jersey-pubsub/pom.xml
index 72982609..1f1461e2 100644
--- a/samples/jersey-pubsub/pom.xml
+++ b/samples/jersey-pubsub/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.atmosphere.samples</groupId>
         <artifactId>atmosphere-samples</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>atmosphere-jersey-pubsub</artifactId>
     <packaging>war</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>atmosphere-jersey-pubsub</name>
     <url>http://maven.apache.org</url>
     <dependencies>
diff --git a/samples/jersey2-chat/pom.xml b/samples/jersey2-chat/pom.xml
index e7c2c8c0..1c9f7f04 100644
--- a/samples/jersey2-chat/pom.xml
+++ b/samples/jersey2-chat/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.atmosphere.samples</groupId>
         <artifactId>atmosphere-samples</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>atmosphere-jersey2-chat</artifactId>
     <packaging>war</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>atmosphere-jersey2-chat</name>
     <url>http://maven.apache.org</url>
     <dependencies>
diff --git a/samples/meteor-chat/pom.xml b/samples/meteor-chat/pom.xml
index db1fbdd2..031e484f 100755
--- a/samples/meteor-chat/pom.xml
+++ b/samples/meteor-chat/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.atmosphere.samples</groupId>
         <artifactId>atmosphere-samples</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>atmosphere-meteor-chat</artifactId>
     <packaging>war</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>atmosphere-meteor-chat</name>
     <url>http://maven.apache.org</url>
     <dependencies>
diff --git a/samples/meteor-pubsub/pom.xml b/samples/meteor-pubsub/pom.xml
index e50f0444..343b0dbd 100644
--- a/samples/meteor-pubsub/pom.xml
+++ b/samples/meteor-pubsub/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.atmosphere.samples</groupId>
         <artifactId>atmosphere-samples</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>atmosphere-meteor-pubsub</artifactId>
     <packaging>war</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>atmosphere-meteor-pubsub</name>
     <url>http://maven.apache.org</url>
     <dependencies>
diff --git a/samples/pom.xml b/samples/pom.xml
index 000594b9..7894a04f 100755
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.atmosphere</groupId>
         <artifactId>atmosphere-samples-project</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>atmosphere-samples</artifactId>
     <packaging>pom</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>atmosphere-samples</name>
     <modules>
         <module>chat</module>
diff --git a/samples/pubsub/pom.xml b/samples/pubsub/pom.xml
index b3fff99c..f09b1e7a 100755
--- a/samples/pubsub/pom.xml
+++ b/samples/pubsub/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.atmosphere.samples</groupId>
         <artifactId>atmosphere-samples</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>atmosphere-pubsub</artifactId>
     <packaging>war</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>atmosphere-pubsub</name>
     <url>http://maven.apache.org</url>
     <dependencies>
diff --git a/samples/rest-chat/pom.xml b/samples/rest-chat/pom.xml
index c6cc83ad..54f66a60 100644
--- a/samples/rest-chat/pom.xml
+++ b/samples/rest-chat/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.atmosphere.samples</groupId>
         <artifactId>atmosphere-samples</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>atmosphere-rest-chat</artifactId>
     <packaging>war</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>atmosphere-rest-chat</name>
     <url>http://maven.apache.org</url>
     <dependencies>
diff --git a/samples/spring-boot-sample-atmosphere/pom.xml b/samples/spring-boot-sample-atmosphere/pom.xml
index 3dd93bb0..879a9e8a 100644
--- a/samples/spring-boot-sample-atmosphere/pom.xml
+++ b/samples/spring-boot-sample-atmosphere/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.atmosphere.samples</groupId>
         <artifactId>atmosphere-samples</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
     </parent>
     <artifactId>spring-boot-sample-atmosphere</artifactId>
     <name>Spring Boot Atmosphere Sample</name>
diff --git a/samples/sse-chat/pom.xml b/samples/sse-chat/pom.xml
index 83767458..29f50e77 100644
--- a/samples/sse-chat/pom.xml
+++ b/samples/sse-chat/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.atmosphere.samples</groupId>
         <artifactId>atmosphere-samples</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>atmosphere-chat-sse</artifactId>
     <packaging>war</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>atmosphere-chat-sse</name>
     <url>http://maven.apache.org</url>
     <dependencies>
diff --git a/samples/sse-rest-chat/pom.xml b/samples/sse-rest-chat/pom.xml
index f0dfb717..ab9bf931 100644
--- a/samples/sse-rest-chat/pom.xml
+++ b/samples/sse-rest-chat/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.atmosphere.samples</groupId>
         <artifactId>atmosphere-samples</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>atmosphere-sse-rest-chat</artifactId>
     <packaging>war</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>atmosphere-sse-rest-chat</name>
     <url>http://maven.apache.org</url>
     <dependencies>
diff --git a/samples/twitter-live-feed/pom.xml b/samples/twitter-live-feed/pom.xml
index 0cbe177e..b0c361a6 100755
--- a/samples/twitter-live-feed/pom.xml
+++ b/samples/twitter-live-feed/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.atmosphere.samples</groupId>
         <artifactId>atmosphere-samples</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>atmosphere-twitter-live-feed</artifactId>
     <packaging>war</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>atmosphere-twitter-live-feed</name>
     <dependencies>
         <dependency>
diff --git a/samples/webrtc-atmospherehandler/pom.xml b/samples/webrtc-atmospherehandler/pom.xml
index 80905398..e8961974 100644
--- a/samples/webrtc-atmospherehandler/pom.xml
+++ b/samples/webrtc-atmospherehandler/pom.xml
@@ -2,12 +2,12 @@
     <parent>
         <groupId>org.atmosphere.samples</groupId>
         <artifactId>atmosphere-samples</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>atmosphere-videochat</artifactId>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <packaging>war</packaging>
     <name>atmosphere-videochat</name>
     <description>VideoChat with Atmosphere handler and webrtc</description>
diff --git a/samples/webrtc-jersey/pom.xml b/samples/webrtc-jersey/pom.xml
index 9bc5d428..05cf4b7a 100644
--- a/samples/webrtc-jersey/pom.xml
+++ b/samples/webrtc-jersey/pom.xml
@@ -2,12 +2,12 @@
     <parent>
         <groupId>org.atmosphere.samples</groupId>
         <artifactId>atmosphere-samples</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>atmosphere-jersey-webrtc</artifactId>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <packaging>war</packaging>
     <name>atmosphere-jersey-webrtc</name>
     <description>VideoChat with Atmosphere Jersey and webrtc</description>
diff --git a/samples/websocket-chat/pom.xml b/samples/websocket-chat/pom.xml
index 4b5c8cbb..a61df946 100644
--- a/samples/websocket-chat/pom.xml
+++ b/samples/websocket-chat/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.atmosphere.samples</groupId>
         <artifactId>atmosphere-samples</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>atmosphere-websocket-chat</artifactId>
     <packaging>war</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>atmosphere-websocket-chat</name>
     <url>http://maven.apache.org</url>
     <dependencies>
diff --git a/samples/websocket-stream/pom.xml b/samples/websocket-stream/pom.xml
index 3149c730..d1fb313f 100644
--- a/samples/websocket-stream/pom.xml
+++ b/samples/websocket-stream/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.atmosphere.samples</groupId>
         <artifactId>atmosphere-samples</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>atmosphere-websocket-stream</artifactId>
     <packaging>war</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>atmosphere-websocket-stream</name>
     <url>http://maven.apache.org</url>
     <dependencies>
diff --git a/samples/websockethandler-pubsub/pom.xml b/samples/websockethandler-pubsub/pom.xml
index 5b0d7e25..4e4b7e66 100644
--- a/samples/websockethandler-pubsub/pom.xml
+++ b/samples/websockethandler-pubsub/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.atmosphere.samples</groupId>
         <artifactId>atmosphere-samples</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>atmosphere-websockethandler-pubsub</artifactId>
     <packaging>war</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>atmosphere-websockethandler-pubsub</name>
     <dependencies>
         <dependency>
diff --git a/stomp/pom.xml b/stomp/pom.xml
index 7ced809f..8aca6887 100644
--- a/stomp/pom.xml
+++ b/stomp/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <groupId>org.atmosphere</groupId>
         <artifactId>atmosphere-samples-project</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
         <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>atmosphere-stomp-samples</artifactId>
     <packaging>pom</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>atmosphere-stomp-samples</name>
     <modules>
         <module>pubsub</module>
diff --git a/stomp/pubsub/pom.xml b/stomp/pubsub/pom.xml
index f65d3790..b59ccc29 100644
--- a/stomp/pubsub/pom.xml
+++ b/stomp/pubsub/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.atmosphere.samples</groupId>
         <artifactId>atmosphere-stomp-samples</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>atmosphere-stomp-pubsub</artifactId>
     <packaging>war</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>atmosphere-stomp-pubsub</name>
     <url>https://github.com/Atmosphere/atmosphere-samples</url>
     <dependencies>
diff --git a/wasync-samples/chat/pom.xml b/wasync-samples/chat/pom.xml
index e86b7e3a..b326beca 100644
--- a/wasync-samples/chat/pom.xml
+++ b/wasync-samples/chat/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.atmosphere.samples</groupId>
         <artifactId>wasync-samples</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.wasync.samples</groupId>
     <artifactId>wasync-chat</artifactId>
     <packaging>jar</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>wAsync Chat</name>
     <url>http://maven.apache.org</url>
 
diff --git a/wasync-samples/node.js/pom.xml b/wasync-samples/node.js/pom.xml
index 2726c870..885e8180 100644
--- a/wasync-samples/node.js/pom.xml
+++ b/wasync-samples/node.js/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.atmosphere.samples</groupId>
         <artifactId>wasync-samples</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.wasync.samples</groupId>
     <artifactId>node.js-chat</artifactId>
     <packaging>jar</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>wAsync Node.js Chat</name>
     <url>http://maven.apache.org</url>
 
diff --git a/wasync-samples/pom.xml b/wasync-samples/pom.xml
index a21f3f7c..78c5b743 100644
--- a/wasync-samples/pom.xml
+++ b/wasync-samples/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.atmosphere</groupId>
         <artifactId>atmosphere-samples-project</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.4.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.atmosphere.samples</groupId>
     <artifactId>wasync-samples</artifactId>
     <packaging>pom</packaging>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.4.18</version>
     <name>atmosphere-samples</name>
     <modules>
         <module>chat</module>