summaryrefslogtreecommitdiffstats
path: root/push
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2013-06-24 13:15:17 +0300
committerArtur Signell <artur@vaadin.com>2013-06-24 13:20:31 +0300
commit177c424f438df3bcf752281fadef9bfb0e0e1a42 (patch)
treee807b80037190ae0e6630afaa29c4882bb7d5ce1 /push
parent3affc37a8ed778d47204c81a428ea56e6c2ac49c (diff)
downloadvaadin-framework-177c424f438df3bcf752281fadef9bfb0e0e1a42.tar.gz
vaadin-framework-177c424f438df3bcf752281fadef9bfb0e0e1a42.zip
Updated Atmosphere dependency to 1.0.14.vaadin2 (#12017, #12033, #12115)
Change-Id: I068cca8ae2d3739b3a8ba7b01cd83b1b69509dd2
Diffstat (limited to 'push')
-rw-r--r--push/build.xml2
-rw-r--r--push/ivy.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/push/build.xml b/push/build.xml
index f18caf69b4..d8661e9124 100644
--- a/push/build.xml
+++ b/push/build.xml
@@ -13,7 +13,7 @@
<property name="vaadinPush.js" location="${result.dir}/js/VAADIN/vaadinPush.js" />
<!-- Keep the version number in sync with ivy.xml and server/src/com/vaadin/server/Constants.java-->
- <property name="atmosphere.version" value="1.0.14-vaadin1" />
+ <property name="atmosphere.version" value="1.0.14.vaadin2" />
<property name="jquery.version" value="1.7.2" />
<path id="classpath.compile.custom" />
diff --git a/push/ivy.xml b/push/ivy.xml
index 444e8908e0..8167bf300b 100644
--- a/push/ivy.xml
+++ b/push/ivy.xml
@@ -28,7 +28,7 @@
<!-- Atmosphere -->
<!-- Keep the version number in sync with build.xml -->
<dependency org="com.vaadin.external.atmosphere" name="atmosphere-runtime"
- rev="1.0.14-vaadin1" conf="build,ide,test -> default">
+ rev="1.0.14.vaadin2" conf="build,ide,test -> default">
</dependency>
</dependencies>