diff options
| author | Artur Signell <artur@vaadin.com> | 2015-04-20 19:28:30 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2015-04-21 06:45:33 +0000 |
| commit | 2898940f15a2ff2ef194d99cbde93bcd526ffedd (patch) | |
| tree | 7d582794fdf0c5bab99c5ca95b5a3596aa51e31a | |
| parent | dee4ff5bf1e9a63bab9f58656804f89f99740559 (diff) | |
| download | vaadin-framework-2898940f15a2ff2ef194d99cbde93bcd526ffedd.tar.gz vaadin-framework-2898940f15a2ff2ef194d99cbde93bcd526ffedd.zip | |
Update Atmosphere to fix Firefox + JSR356 (#17510)
Change-Id: I9ea4b713678af4d42742d1fe51ae87ca18b8c362
| -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 4afbd42d83..a2fdaa2df3 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.vaadin6" /> + <property name="atmosphere.runtime.version" value="2.2.4.vaadin7" /> <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 58906461e0..ec4979eafb 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.vaadin6"> + <!ENTITY atmosphere.runtime.version "2.2.4.vaadin7"> <!ENTITY atmosphere.js.version "2.2.6.vaadin4"> ]> diff --git a/server/src/com/vaadin/server/Constants.java b/server/src/com/vaadin/server/Constants.java index 5f417f4b49..2cffab8cba 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.vaadin6"; + static final String REQUIRED_ATMOSPHERE_RUNTIME_VERSION = "2.2.4.vaadin7"; static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n" + "=================================================================\n" |