From: Sergey Budkin <sergey@vaadin.com>
Date: Fri, 12 Sep 2014 09:12:48 +0000 (+0300)
Subject: Update to Atmosphere 2.1.2.vaadin5 (#13877)
X-Git-Tag: 7.4.0.beta1~240
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=55d019853b060f9c7c853d6634179544b325c29a;p=vaadin-framework.git

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 fb80cc7cbf..9983886b7e 100644
--- 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 b6bd1b06f7..0d42103bce 100644
--- 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 aa1e02a96e..2b868c12a6 100644
--- 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"