diff options
| author | Sergey Budkin <sergey@vaadin.com> | 2014-09-12 12:12:48 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-09-12 14:05:44 +0000 |
| commit | 55d019853b060f9c7c853d6634179544b325c29a (patch) | |
| tree | a4ccd7aa7ea248c1ecdc7550d8a349ce612f7133 /push | |
| parent | 3a9aa4c277cbfb956511a1c25e984bb2e2c65476 (diff) | |
| download | vaadin-framework-55d019853b060f9c7c853d6634179544b325c29a.tar.gz vaadin-framework-55d019853b060f9c7c853d6634179544b325c29a.zip | |
Update to Atmosphere 2.1.2.vaadin5 (#13877)
New version of vaadin atmosphere, picked change from main codebase:
https://github.com/Atmosphere/atmosphere/commit/9eeb5768
Tested manually against Jetty 9.2.3
Change-Id: I90f4a90b1ff651cc475eb01c2156d3c58abd8c2c
Diffstat (limited to 'push')
| -rw-r--r-- | push/build.xml | 2 | ||||
| -rw-r--r-- | push/ivy.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/push/build.xml b/push/build.xml index fb80cc7cbf..9983886b7e 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.vaadin4" /> + <property name="atmosphere.runtime.version" value="2.1.2.vaadin5" /> <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 b6bd1b06f7..0d42103bce 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.vaadin4"> + <!ENTITY atmosphere.runtime.version "2.1.2.vaadin5"> <!ENTITY atmosphere.js.version "2.1.5.vaadin4"> ]> |