From: Artur Signell <artur@vaadin.com>
Date: Thu, 3 Apr 2014 18:22:44 +0000 (+0300)
Subject: Update Atmosphere 2.1.2 for better Tomcat 8 support (#12329)
X-Git-Tag: 7.2.0.beta1~28
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ff4cce403e2b3a89726144d2e688024f8b12fcad;p=vaadin-framework.git

Update Atmosphere 2.1.2 for better Tomcat 8 support (#12329)

Change-Id: If6362284392d17ff18e2a907439db3339344d2b1
---

diff --git a/push/build.xml b/push/build.xml
index f7f95a5df6..d6821fea88 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.1.vaadin2" />
+    <property name="atmosphere.runtime.version" value="2.1.2.vaadin1" />
     <property name="jquery.version" value="2.0.3" />
 
     <path id="classpath.compile.custom" />
diff --git a/push/ivy.xml b/push/ivy.xml
index db9e101ddf..7d6d9b59f4 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.1.vaadin2">
+    <!ENTITY atmosphere.runtime.version "2.1.2.vaadin1">
     
     <!ENTITY atmosphere.js.version "2.1.5.vaadin1">
 ]>
diff --git a/server/src/com/vaadin/server/Constants.java b/server/src/com/vaadin/server/Constants.java
index 26715eff12..e90ca3add0 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.1.vaadin2";
+    static final String REQUIRED_ATMOSPHERE_RUNTIME_VERSION = "2.1.2.vaadin1";
 
     static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n"
             + "=================================================================\n"