Update Atmosphere (#12293) (#12308)

* Update Atmosphere (#12293)

Fixes concurrency issue with UUIDBroadcasterCache that may lead to loss of packets and thus repeated resynchronizations when using Push.

diff --git a/pom.xml b/pom.xml
index 01502d852d37670d8ef336353a906efdd9e6f1c7..2535c4bfcc99d56feea4f60626f447b731f862cf 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
         <javax.portlet.version>2.0</javax.portlet.version>
         <vaadin.sass.version>0.9.13</vaadin.sass.version>
         <!-- Note that this should be kept in sync with the class Constants -->
-        <atmosphere.runtime.version>2.4.30.vaadin3</atmosphere.runtime.version>
+        <atmosphere.runtime.version>2.4.30.vaadin4</atmosphere.runtime.version>
 
         <!-- OSGi -->
         <osgi.execution.environment>JavaSE-1.8</osgi.execution.environment>
@@ -188,7 +188,7 @@
                 <groupId>com.vaadin.external.atmosphere.client</groupId>
                 <artifactId>javascript</artifactId>
                 <type>war</type>
-                <version>2.3.2.vaadin1</version>
+                <version>2.3.2.vaadin2</version>
             </dependency>
             <dependency>
                 <groupId>junit</groupId>

diff --git a/server/src/main/java/com/vaadin/server/Constants.java b/server/src/main/java/com/vaadin/server/Constants.java
index e3400181b46c7eaef91ccb53a3527d92450522f6..d4559b1cfe65a93b67c951c1853dcb0a653838e4 100644 (file)
--- a/server/src/main/java/com/vaadin/server/Constants.java
+++ b/server/src/main/java/com/vaadin/server/Constants.java
@@ -66,7 +66,7 @@ public interface Constants {
             + "=================================================================";
 
     // Keep the version number in sync with pom.xml
-    static final String REQUIRED_ATMOSPHERE_RUNTIME_VERSION = "2.4.30.vaadin3";
+    static final String REQUIRED_ATMOSPHERE_RUNTIME_VERSION = "2.4.30.vaadin4";
 
     static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n"
             + "=================================================================\n"