aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <teemusa@vaadin.com>2017-07-05 12:37:39 +0300
committerTeemu Suo-Anttila <tsuoanttila@users.noreply.github.com>2017-07-11 10:01:02 +0300
commitba0f3212bf5897615ee04476cd0cad1658a031e6 (patch)
tree93f417947db6b41a983d146bca3da63987d59ad6
parentf475b17951a4481557af4f59192af537e139f734 (diff)
downloadvaadin-framework-ba0f3212bf5897615ee04476cd0cad1658a031e6.tar.gz
vaadin-framework-ba0f3212bf5897615ee04476cd0cad1658a031e6.zip
Revert "Update Atmosphere to support latest Jetty versions (#9359)"
This reverts commit 6fdea957798b24156fcb301269b867112b96bfb9.
-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 d8afeebaed..3270de10bc 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.11.vaadin1</atmosphere.runtime.version>
+ <atmosphere.runtime.version>2.4.5.vaadin2</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 93fc3ad22a..768bb54103 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.vaadin1";
+ static final String REQUIRED_ATMOSPHERE_RUNTIME_VERSION = "2.4.5.vaadin2";
static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n"
+ "=================================================================\n"