summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlia Motornyi <elmot@vaadin.com>2018-03-13 18:16:21 +0300
committerGitHub <noreply@github.com>2018-03-13 18:16:21 +0300
commitd5ad32c20249f1eb91b5b7ad42ee770abf4c8803 (patch)
tree9dc8e9d498bb6e248816dd576f39a260c41660e7
parent4fc7530ded4a3775e3e9c7343e026a624ce00079 (diff)
downloadvaadin-framework-d5ad32c20249f1eb91b5b7ad42ee770abf4c8803.tar.gz
vaadin-framework-d5ad32c20249f1eb91b5b7ad42ee770abf4c8803.zip
Upgrade to Atmosphere 2.4.20.vaadin1 (#10706)
Fixes #10532
-rw-r--r--pom.xml2
-rw-r--r--server/src/main/java/com/vaadin/server/Constants.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/pom.xml b/pom.xml
index 9312c4e633..6c5566c734 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.11.vaadin2</atmosphere.runtime.version>
+ <atmosphere.runtime.version>2.4.21.vaadin1</atmosphere.runtime.version>
<!-- OSGi -->
<osgi.execution.environment>JavaSE-1.8</osgi.execution.environment>
diff --git a/server/src/main/java/com/vaadin/server/Constants.java b/server/src/main/java/com/vaadin/server/Constants.java
index 3482945fc0..7139135f74 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.11.vaadin2";
+ static final String REQUIRED_ATMOSPHERE_RUNTIME_VERSION = "2.4.21.vaadin1";
static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n"
+ "=================================================================\n"