From ef8920661cc9d958c69cfedd0a74ce580a2a84ed Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Mon, 7 Apr 2014 19:28:25 +0300
Subject: [PATCH] Update Atmosphere 2.1.2.vaadin2 (#12329)

Contains websockets fixes for Tomcat 8 and Wildfly 8

Change-Id: I55b6576dfffd611f819a434d9b05edf1e5c6eda8
---
 push/build.xml                              | 2 +-
 push/ivy.xml                                | 4 ++--
 server/src/com/vaadin/server/Constants.java | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/push/build.xml b/push/build.xml
index d6821fea88..c307ee621d 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.vaadin1" />
+    <property name="atmosphere.runtime.version" value="2.1.2.vaadin2" />
     <property name="jquery.version" value="2.0.3" />
 
     <path id="classpath.compile.custom" />
diff --git a/push/ivy.xml b/push/ivy.xml
index 7d6d9b59f4..ebdb673cb0 100644
--- a/push/ivy.xml
+++ b/push/ivy.xml
@@ -1,8 +1,8 @@
 <?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.vaadin1">
-    
+    <!ENTITY atmosphere.runtime.version "2.1.2.vaadin2">
+
     <!ENTITY atmosphere.js.version "2.1.5.vaadin1">
 ]>
 <ivy-module version="2.0"
diff --git a/server/src/com/vaadin/server/Constants.java b/server/src/com/vaadin/server/Constants.java
index e90ca3add0..90f09d1642 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.vaadin1";
+    static final String REQUIRED_ATMOSPHERE_RUNTIME_VERSION = "2.1.2.vaadin2";
 
     static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n"
             + "=================================================================\n"
-- 
2.39.5