diff options
author | Artur <artur@vaadin.com> | 2017-05-18 18:05:34 +0300 |
---|---|---|
committer | Henri Sara <henri.sara@gmail.com> | 2017-05-18 18:05:34 +0300 |
commit | 84c0bee7e90091b2b86c6c452d1bd87a27d98c7d (patch) | |
tree | afde18f2b4f302599ca3373dfe1be66d35781998 | |
parent | 05866ac5178ccb4c48059b58290e259b2b9ac53b (diff) | |
download | vaadin-framework-84c0bee7e90091b2b86c6c452d1bd87a27d98c7d.tar.gz vaadin-framework-84c0bee7e90091b2b86c6c452d1bd87a27d98c7d.zip |
Update Atmosphere to support latest Jetty versions (#9359)
Fixes #8134, #8135
-rw-r--r-- | pom.xml | 2 | ||||
-rw-r--r-- | server/src/main/java/com/vaadin/server/Constants.java | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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.5.vaadin2</atmosphere.runtime.version> + <atmosphere.runtime.version>2.4.11.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 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" |