Updated to atmosphere 1.0.14-vaadin1

Change-Id: I758ec93ce6eeeef023811f754e67eed122c510d9

diff --git a/push/build.xml b/push/build.xml
index 2cd86d9ce50d9f2e3ea749f2b31eacc2d8b344cf..f18caf69b4d66e303851709b37ca7afbcb261507 100644 (file)
--- a/push/build.xml
+++ b/push/build.xml
@@ -12,8 +12,8 @@
     <property name="result.dir" location="result" />
     <property name="vaadinPush.js" location="${result.dir}/js/VAADIN/vaadinPush.js" />
 
-    <!-- Keep the version number in sync with ivy.xml -->
-    <property name="atmosphere.version" value="1.0.14-2" />
+    <!-- Keep the version number in sync with ivy.xml and server/src/com/vaadin/server/Constants.java-->
+    <property name="atmosphere.version" value="1.0.14-vaadin1" />
     <property name="jquery.version" value="1.7.2" />
 
     <path id="classpath.compile.custom" />

diff --git a/push/ivy.xml b/push/ivy.xml
index d0a60dc1c3a558838e10e1e8399a83c635217e9e..444e8908e093d0c4e18bdfdca13ce75cd442078e 100644 (file)
--- a/push/ivy.xml
+++ b/push/ivy.xml
@@ -28,7 +28,7 @@
         <!-- Atmosphere -->
         <!-- Keep the version number in sync with build.xml -->
         <dependency org="com.vaadin.external.atmosphere" name="atmosphere-runtime"
-            rev="1.0.14-2" conf="build,ide,test -> default">
+            rev="1.0.14-vaadin1" conf="build,ide,test -> default">
         </dependency>
     </dependencies>
 

diff --git a/server/src/com/vaadin/server/Constants.java b/server/src/com/vaadin/server/Constants.java
index 0ea9de252a613f07667fbbd451c92eaccc189076..bcdb62064bdb67fc53077d3d7a3e2c762aba0b56 100644 (file)
--- a/server/src/com/vaadin/server/Constants.java
+++ b/server/src/com/vaadin/server/Constants.java
@@ -65,7 +65,7 @@ public interface Constants {
             + " Widgetset version: %s\n"
             + "=================================================================";
 
-    static final String REQUIRED_ATMOSPHERE_VERSION = "1.0.14-2";
+    static final String REQUIRED_ATMOSPHERE_VERSION = "1.0.14-vaadin1";
 
     static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n"
             + "=================================================================\n"