Update Atmosphere to 2.2.4.vaadin4 (#16825, #16826, #16862)

Change-Id: Idd43e37ac7ba37710ffea7e01efc931e73defd90

diff --git a/push/build.xml b/push/build.xml
index 4e180fa03d039cb0a8b26ed769799545a3c078af..519dc81ed2d84f05c3f55056ccc8a71d7557ca8b 100644 (file)
--- a/push/build.xml
+++ b/push/build.xml
@@ -18,7 +18,7 @@
         location="${result.dir}/js/VAADIN/vaadinPush.debug.js" />
 
     <!-- Keep the version number in sync with ivy.xml, server/src/com/vaadin/server/Constants.java -->
-    <property name="atmosphere.runtime.version" value="2.2.4.vaadin3" />
+    <property name="atmosphere.runtime.version" value="2.2.4.vaadin4" />
     <property name="jquery.js" location="lib/jquery/jquery-1.11.0.js" />
 
     <path id="classpath.compile.custom" />

diff --git a/push/ivy.xml b/push/ivy.xml
index b8d943f176a21c17169e374c2e978827caf7dd11..c285bfd4aabd45f2423a5b66658519bb21020c4a 100644 (file)
--- a/push/ivy.xml
+++ b/push/ivy.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE ivy-module [
 <!-- Keep the version number in sync with build.xml -->
-    <!ENTITY atmosphere.runtime.version "2.2.4.vaadin3">
+    <!ENTITY atmosphere.runtime.version "2.2.4.vaadin4">
 
     <!ENTITY atmosphere.js.version "2.2.6.vaadin3">
 ]>

diff --git a/server/src/com/vaadin/server/Constants.java b/server/src/com/vaadin/server/Constants.java
index b20b8004a5a577c6075c29da68b96a57df832867..b9a43a98de41e731455f61730b54045809ffc42b 100644 (file)
--- a/server/src/com/vaadin/server/Constants.java
+++ b/server/src/com/vaadin/server/Constants.java
@@ -67,7 +67,7 @@ public interface Constants {
 
     // Keep the version number in sync with push/build.xml and other locations
     // listed in that file
-    static final String REQUIRED_ATMOSPHERE_RUNTIME_VERSION = "2.2.4.vaadin3";
+    static final String REQUIRED_ATMOSPHERE_RUNTIME_VERSION = "2.2.4.vaadin4";
 
     static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n"
             + "=================================================================\n"