diff options
author | Artur Signell <artur@vaadin.com> | 2016-05-10 20:28:31 +0300 |
---|---|---|
committer | Vaadin Code Review <review@vaadin.com> | 2016-05-11 10:19:56 +0000 |
commit | b784032b3b3438036f5cbaf424840698221280a8 (patch) | |
tree | f7464e954a0fc0653ba89eb23bb0f59c7e44a12c | |
parent | aa2cdc96ec1df19ab8b1d8a9b616d76f18abe0c7 (diff) | |
download | vaadin-framework-b784032b3b3438036f5cbaf424840698221280a8.tar.gz vaadin-framework-b784032b3b3438036f5cbaf424840698221280a8.zip |
Update to Atmosphere 2.2.9.vaadin2 (#19742)
Change-Id: I634e44971c6e4f653ecdcbf694be78ae67ef728f
-rw-r--r-- | pom.xml | 3 | ||||
-rw-r--r-- | server/src/main/java/com/vaadin/server/Constants.java | 5 |
2 files changed, 4 insertions, 4 deletions
@@ -41,7 +41,8 @@ <junit.version>4.11</junit.version> <!-- Atmosphere versions --> - <atmosphere.runtime.version>2.2.7.vaadin1</atmosphere.runtime.version> + <!-- Note that this should be kept in sync with the class Constants --> + <atmosphere.runtime.version>2.2.9.vaadin2</atmosphere.runtime.version> <atmosphere.js.version>2.2.6.vaadin4</atmosphere.js.version> <!-- Dependency unpack directory --> diff --git a/server/src/main/java/com/vaadin/server/Constants.java b/server/src/main/java/com/vaadin/server/Constants.java index 4dd4b45cfd..5efe6accb1 100644 --- a/server/src/main/java/com/vaadin/server/Constants.java +++ b/server/src/main/java/com/vaadin/server/Constants.java @@ -66,9 +66,8 @@ public interface Constants { + " Widgetset version: %s\n" + "================================================================="; - // Keep the version number in sync with push/build.xml and other locations - // listed in that file - static final String REQUIRED_ATMOSPHERE_RUNTIME_VERSION = "2.2.7.vaadin1"; + // Keep the version number in sync with pom.xml + static final String REQUIRED_ATMOSPHERE_RUNTIME_VERSION = "2.2.9.vaadin2"; static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n" + "=================================================================\n" |