diff options
| author | Artur Signell <artur@vaadin.com> | 2014-04-07 19:28:25 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2014-04-07 19:29:25 +0300 |
| commit | ef8920661cc9d958c69cfedd0a74ce580a2a84ed (patch) | |
| tree | 9b86ad327c401efd1a6210e0a620ef9f38740b1a /push | |
| parent | aa309d12d53b71488b40ca04ca32d235ad39144f (diff) | |
| download | vaadin-framework-ef8920661cc9d958c69cfedd0a74ce580a2a84ed.tar.gz vaadin-framework-ef8920661cc9d958c69cfedd0a74ce580a2a84ed.zip | |
Update Atmosphere 2.1.2.vaadin2 (#12329)
Contains websockets fixes for Tomcat 8 and Wildfly 8
Change-Id: I55b6576dfffd611f819a434d9b05edf1e5c6eda8
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 d6821fea88..c307ee621d 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.vaadin1" /> + <property name="atmosphere.runtime.version" value="2.1.2.vaadin2" /> <property name="jquery.version" value="2.0.3" /> <path id="classpath.compile.custom" /> diff --git a/push/ivy.xml b/push/ivy.xml index 7d6d9b59f4..ebdb673cb0 100644 --- a/push/ivy.xml +++ b/push/ivy.xml @@ -1,8 +1,8 @@ <?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.vaadin1"> - + <!ENTITY atmosphere.runtime.version "2.1.2.vaadin2"> + <!ENTITY atmosphere.js.version "2.1.5.vaadin1"> ]> <ivy-module version="2.0" |