Use atmosphere 1.0.14.vaadin3 which fixes Android 4.1 support (#12101)

Change-Id: I75cd1eebeeb5836b9205a9a1e28795be300d135a

diff --git a/push/build.xml b/push/build.xml
index d8661e9124f5105e69f08692b8c1346a00834a6b..042e51383028c1a1c24d030d41d36894854feab8 100644 (file)
--- a/push/build.xml
+++ b/push/build.xml
@@ -13,7 +13,7 @@
     <property name="vaadinPush.js" location="${result.dir}/js/VAADIN/vaadinPush.js" />
 
     <!-- Keep the version number in sync with ivy.xml and server/src/com/vaadin/server/Constants.java-->
-    <property name="atmosphere.version" value="1.0.14.vaadin2" />
+    <property name="atmosphere.version" value="1.0.14.vaadin3" />
     <property name="jquery.version" value="1.7.2" />
 
     <path id="classpath.compile.custom" />

diff --git a/push/ivy.xml b/push/ivy.xml
index 8167bf300bf3b1858ed59e746d816d771584f2c7..615e404db31213537a9544e9e711ca4a36a01f8c 100644 (file)
--- a/push/ivy.xml
+++ b/push/ivy.xml
@@ -28,7 +28,7 @@
         <!-- Atmosphere -->
         <!-- Keep the version number in sync with build.xml -->
         <dependency org="com.vaadin.external.atmosphere" name="atmosphere-runtime"
-            rev="1.0.14.vaadin2" conf="build,ide,test -> default">
+            rev="1.0.14.vaadin3" conf="build,ide,test -> default">
         </dependency>
     </dependencies>
 

diff --git a/server/src/com/vaadin/server/Constants.java b/server/src/com/vaadin/server/Constants.java
index 342e693afbdcf6d5b053b08d318581f678761ee6..ed65b53183da2dfb09158f0800c6c33ae92a0877 100644 (file)
--- a/server/src/com/vaadin/server/Constants.java
+++ b/server/src/com/vaadin/server/Constants.java
@@ -65,7 +65,7 @@ public interface Constants {
             + " Widgetset version: %s\n"
             + "=================================================================";
 
-    static final String REQUIRED_ATMOSPHERE_VERSION = "1.0.14.vaadin2";
+    static final String REQUIRED_ATMOSPHERE_VERSION = "1.0.14.vaadin3";
 
     static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n"
             + "=================================================================\n"