summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTatu Lund <tatu@vaadin.com>2021-05-17 12:33:17 +0300
committerGitHub <noreply@github.com>2021-05-17 12:33:17 +0300
commita32ea51c62a48b14ad0b88c97a50d57bb5592ae4 (patch)
tree47cc829dbdb971a483c2ad2be6034b7b6faeaed1
parentdec6ffd0c739018d72d235a7cd1e0894f237cf09 (diff)
downloadvaadin-framework-a32ea51c62a48b14ad0b88c97a50d57bb5592ae4.tar.gz
vaadin-framework-a32ea51c62a48b14ad0b88c97a50d57bb5592ae4.zip
Update Atmosphere (#12293)
Fixes concurrency issue with UUIDBroadcasterCache that may lead to loss of packets and thus repeated resynchronizations when using Push.
-rw-r--r--pom.xml4
-rw-r--r--server/src/main/java/com/vaadin/server/Constants.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/pom.xml b/pom.xml
index 03ad2514d0..9be1aa3bb8 100644
--- 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 e3400181b4..d4559b1cfe 100644
--- 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"