diff options
| author | Sauli Tähkäpää <sauli@vaadin.com> | 2014-07-09 14:11:39 +0300 |
|---|---|---|
| committer | Sauli Tähkäpää <sauli@vaadin.com> | 2014-07-16 21:56:38 +0300 |
| commit | 0ff5a8d002f93a513e304c29b7a8d23a90e3c9fb (patch) | |
| tree | 72f2043e5a7a8141d962cc28a9a972cc3c96cddc | |
| parent | 0ebb95d7b0d539a175b39045c828dc67864d4fa2 (diff) | |
| download | vaadin-framework-0ff5a8d002f93a513e304c29b7a8d23a90e3c9fb.tar.gz vaadin-framework-0ff5a8d002f93a513e304c29b7a8d23a90e3c9fb.zip | |
Update Atmosphere runtime to 2.1.2.vaadin3 (#13971)
Atmosphere 2.1.2.vaadin3 includes fix for:
https://github.com/Atmosphere/atmosphere/issues/1643
Change-Id: I67c07dc3b32ebb3b0eed634bf143bac9a7e5efe2
| -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 dfc8d03156..dee5820efb 100644 --- a/push/build.xml +++ b/push/build.xml @@ -16,7 +16,7 @@ <property name="vaadinPush.debug.js" 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.1.2.vaadin2" /> + <property name="atmosphere.runtime.version" value="2.1.2.vaadin3" /> <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 1b98969fca..d3b4944353 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.1.2.vaadin2"> + <!ENTITY atmosphere.runtime.version "2.1.2.vaadin3"> <!ENTITY atmosphere.js.version "2.1.5.vaadin4"> ]> diff --git a/server/src/com/vaadin/server/Constants.java b/server/src/com/vaadin/server/Constants.java index 34c9b5b767..08b5b70f50 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.1.2.vaadin2"; + static final String REQUIRED_ATMOSPHERE_RUNTIME_VERSION = "2.1.2.vaadin3"; static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n" + "=================================================================\n" |