aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur <artur@vaadin.com>2017-05-18 18:05:34 +0300
committerTeemu Suo-Anttila <tsuoanttila@users.noreply.github.com>2017-07-11 10:01:02 +0300
commite86dff4c3435dd324c7140363336ad28471c6727 (patch)
tree8c4bc1a512ddb3874b6eb98c169473e71ea8fd7e
parentd3fb3290faa99af450ad17913627a15899345de3 (diff)
downloadvaadin-framework-e86dff4c3435dd324c7140363336ad28471c6727.tar.gz
vaadin-framework-e86dff4c3435dd324c7140363336ad28471c6727.zip
Update Atmosphere to support latest Jetty versions (#9359)
Fixes #8134, #8135
-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 3270de10bc..d8afeebaed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,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.5.vaadin2</atmosphere.runtime.version>
+ <atmosphere.runtime.version>2.4.11.vaadin1</atmosphere.runtime.version>
<!-- OSGi -->
<osgi.javax.servlet.version>3.0.0</osgi.javax.servlet.version>
diff --git a/server/src/main/java/com/vaadin/server/Constants.java b/server/src/main/java/com/vaadin/server/Constants.java
index 768bb54103..93fc3ad22a 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.5.vaadin2";
+ static final String REQUIRED_ATMOSPHERE_RUNTIME_VERSION = "2.4.11.vaadin1";
static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n"
+ "=================================================================\n"