diff options
| author | Artur Signell <artur@vaadin.com> | 2014-12-18 09:12:43 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-12-18 08:20:42 +0000 |
| commit | 8742e11f7cdd6b8f91d593b459ff4a0e9875754e (patch) | |
| tree | 5ba363a5d7128578ef3225dff519a6ee7d55fc70 /push | |
| parent | 7bea56d1606dc1a06d348badbf4a436bcf2f3835 (diff) | |
| download | vaadin-framework-8742e11f7cdd6b8f91d593b459ff4a0e9875754e.tar.gz vaadin-framework-8742e11f7cdd6b8f91d593b459ff4a0e9875754e.zip | |
Update to Atmosphere 2.2 (#14534)
Does not use the new heartbeat mechanism in Atmosphere 2.2 because the heartbeat
mechanism will cause the client to reconnect every 60 seconds when idle.
It does not currently work with Vaadin because no onreopen event is fired by
Atmosphere (https://github.com/Atmosphere/atmosphere-javascript/issues/141) and thus
Vaadin will wait forever for Atmosphere to indicate that the connection is available
again after the disconnect.
Change-Id: I3a61b2c5d611f09c3092f817834e6382e1ca9894
Diffstat (limited to 'push')
| -rw-r--r-- | push/build.xml | 2 | ||||
| -rw-r--r-- | push/ivy.xml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/push/build.xml b/push/build.xml index 0a106f5023..b7d57cf4d3 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.vaadin6" /> + <property name="atmosphere.runtime.version" value="2.2.4.vaadin2" /> <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 fef53b4c9b..b899b34af7 100644 --- a/push/ivy.xml +++ b/push/ivy.xml @@ -1,9 +1,9 @@ <?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.vaadin6"> + <!ENTITY atmosphere.runtime.version "2.2.4.vaadin2"> - <!ENTITY atmosphere.js.version "2.1.5.vaadin4"> + <!ENTITY atmosphere.js.version "2.2.6.vaadin3"> ]> <ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |