Update to Atmosphere 2.1.2.vaadin5 (#13877)

New version of vaadin atmosphere, picked change from main codebase:
https://github.com/Atmosphere/atmosphere/commit/9eeb5768
Tested manually against Jetty 9.2.3

Change-Id: I90f4a90b1ff651cc475eb01c2156d3c58abd8c2c

diff --git a/push/build.xml b/push/build.xml
index fb80cc7cbffa46833cb17b9f7cbd37f8b2ea6086..9983886b7e85c7c028f3cac8459fd235013b2156 100644 (file)
--- a/push/build.xml
+++ b/push/build.xml
@@ -16,7 +16,7 @@
     <property name="vaadinPush.debug.js" 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.1.2.vaadin4" />
+    <property name="atmosphere.runtime.version" value="2.1.2.vaadin5" />
     <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 b6bd1b06f74d1f231c1551182f36b3e9c98279a2..0d42103bceb3bc4cc6ca2e3858babe0256a3276f 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.1.2.vaadin4">
+    <!ENTITY atmosphere.runtime.version "2.1.2.vaadin5">
 
     <!ENTITY atmosphere.js.version "2.1.5.vaadin4">
 ]>

diff --git a/server/src/com/vaadin/server/Constants.java b/server/src/com/vaadin/server/Constants.java
index aa1e02a96ee23b6bddb9bac0c71b9c0154e243ef..2b868c12a6188f2e9205ea5af4349bb25cc955ca 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.1.2.vaadin4";
+    static final String REQUIRED_ATMOSPHERE_RUNTIME_VERSION = "2.1.2.vaadin5";
 
     static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n"
             + "=================================================================\n"