diff options
| author | Artur Signell <artur@vaadin.com> | 2015-02-28 19:29:31 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2015-03-02 10:15:41 +0000 |
| commit | 6c3f8f5feef72851274e2e2d9d1fdebfd1295d0e (patch) | |
| tree | 8d931413c8138ba998f7a5b39aa623897c50ca13 | |
| parent | 374e6904e268ba253922b1ee30ccbe91d3713cd9 (diff) | |
| download | vaadin-framework-6c3f8f5feef72851274e2e2d9d1fdebfd1295d0e.tar.gz vaadin-framework-6c3f8f5feef72851274e2e2d9d1fdebfd1295d0e.zip | |
Update Atmosphere to 2.2.4.vaadin4 (#16825, #16826, #16862)
Change-Id: Idd43e37ac7ba37710ffea7e01efc931e73defd90
| -rw-r--r-- | push/build.xml | 2 | ||||
| -rw-r--r-- | push/ivy.xml | 2 | ||||
| -rw-r--r-- | server/src/com/vaadin/server/Constants.java | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/push/build.xml b/push/build.xml index 4e180fa03d..519dc81ed2 100644 --- a/push/build.xml +++ b/push/build.xml @@ -18,7 +18,7 @@ location="${result.dir}/js/VAADIN/vaadinPush.debug.js" /> <!-- Keep the version number in sync with ivy.xml, server/src/com/vaadin/server/Constants.java --> - <property name="atmosphere.runtime.version" value="2.2.4.vaadin3" /> + <property name="atmosphere.runtime.version" value="2.2.4.vaadin4" /> <property name="jquery.js" location="lib/jquery/jquery-1.11.0.js" /> <path id="classpath.compile.custom" /> diff --git a/push/ivy.xml b/push/ivy.xml index b8d943f176..c285bfd4aa 100644 --- a/push/ivy.xml +++ b/push/ivy.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE ivy-module [ <!-- Keep the version number in sync with build.xml --> - <!ENTITY atmosphere.runtime.version "2.2.4.vaadin3"> + <!ENTITY atmosphere.runtime.version "2.2.4.vaadin4"> <!ENTITY atmosphere.js.version "2.2.6.vaadin3"> ]> diff --git a/server/src/com/vaadin/server/Constants.java b/server/src/com/vaadin/server/Constants.java index b20b8004a5..b9a43a98de 100644 --- a/server/src/com/vaadin/server/Constants.java +++ b/server/src/com/vaadin/server/Constants.java @@ -67,7 +67,7 @@ public interface Constants { // 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.4.vaadin3"; + static final String REQUIRED_ATMOSPHERE_RUNTIME_VERSION = "2.2.4.vaadin4"; static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n" + "=================================================================\n" |