Update to Atmosphere 1.0.14.vaadin4 (#12242)

Change-Id: I76ccbf631f8ba169f11513b7d585f39b8ab570a4

diff --git a/WebContent/VAADIN/jquery.atmosphere.js b/WebContent/VAADIN/jquery.atmosphere.js
index bb597f01b5b012302156773af714a309100e7341..28a7d033bd944424d08281f00b921e4071a8effc 100644 (file)
--- a/WebContent/VAADIN/jquery.atmosphere.js
+++ b/WebContent/VAADIN/jquery.atmosphere.js
@@ -49,7 +49,8 @@ jQuery.atmosphere = function() {
     };
 
     return {
-        version : "1.0.13",
+       // Keep the version number in sync with push/build.xml and other locations listed in that file
+        version : "1.0.14.vaadin4",
         requests : [],
         callbacks : [],
 

diff --git a/push/build.xml b/push/build.xml
index 2dc05f62fd37253d897a4941d74c36b58c83954d..ead3a0226e9c8e9b9fafba98eb975a17451cad2d 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 and server/src/com/vaadin/server/Constants.java-->
-    <property name="atmosphere.version" value="1.0.14.vaadin3" />
+    <!-- Keep the version number in sync with ivy.xml, server/src/com/vaadin/server/Constants.java and jquery.atmosphere.js -->
+    <property name="atmosphere.version" value="1.0.14.vaadin4" />
     <property name="jquery.version" value="1.7.2" />
 
     <path id="classpath.compile.custom" />

diff --git a/push/ivy.xml b/push/ivy.xml
index 615e404db31213537a9544e9e711ca4a36a01f8c..5a2a24fb1f3827b0f22f5856b1aa1e9ea10db2a5 100644 (file)
--- a/push/ivy.xml
+++ b/push/ivy.xml
@@ -26,9 +26,9 @@
             rev="2.4" conf="build-provided,ide,test -> default" />
 
         <!-- Atmosphere -->
-        <!-- Keep the version number in sync with build.xml -->
+        <!-- Keep the version number in sync with build.xml and other locations listed in that file -->
         <dependency org="com.vaadin.external.atmosphere" name="atmosphere-runtime"
-            rev="1.0.14.vaadin3" conf="build,ide,test -> default">
+            rev="1.0.14.vaadin4" 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 ed65b53183da2dfb09158f0800c6c33ae92a0877..ab91ee021c1322fe80560186bc6fbaa60ab3abbe 100644 (file)
--- a/server/src/com/vaadin/server/Constants.java
+++ b/server/src/com/vaadin/server/Constants.java
@@ -65,7 +65,9 @@ public interface Constants {
             + " Widgetset version: %s\n"
             + "=================================================================";
 
-    static final String REQUIRED_ATMOSPHERE_VERSION = "1.0.14.vaadin3";
+    // Keep the version number in sync with push/build.xml and other locations
+    // listed in that file
+    static final String REQUIRED_ATMOSPHERE_VERSION = "1.0.14.vaadin4";
 
     static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n"
             + "=================================================================\n"