From: Artur Signell <artur@vaadin.com>
Date: Tue, 10 Mar 2015 13:19:27 +0000 (+0200)
Subject: Update Atmosphere to 2.2.4.vaadin5 (#17074)
X-Git-Tag: 7.5.0.alpha1~33
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=21c73437439539276c6f4152fa149c201db94d95;p=vaadin-framework.git

Update Atmosphere to 2.2.4.vaadin5 (#17074)

Change-Id: I85618f66effbf647856d9c152b3e66a6454001d9
---

diff --git a/push/build.xml b/push/build.xml
index 519dc81ed2..336c3629aa 100644
--- 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.vaadin4" />
+    <property name="atmosphere.runtime.version" value="2.2.4.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 c285bfd4aa..605f5d1a05 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.2.4.vaadin4">
+    <!ENTITY atmosphere.runtime.version "2.2.4.vaadin5">
 
     <!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 b9a43a98de..b7c2a1ff3e 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.2.4.vaadin4";
+    static final String REQUIRED_ATMOSPHERE_RUNTIME_VERSION = "2.2.4.vaadin5";
 
     static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n"
             + "=================================================================\n"