From 36aebc81ff63af333a36f7e72d11fe17d06dd97e Mon Sep 17 00:00:00 2001
From: Leif Åstrand <leif@vaadin.com>
Date: Thu, 18 Jul 2013 17:11:17 +0300
Subject: Update to Atmosphere 1.0.14.vaadin4 (#12242)

Change-Id: I76ccbf631f8ba169f11513b7d585f39b8ab570a4
---
 push/build.xml | 4 ++--
 push/ivy.xml   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'push')

diff --git a/push/build.xml b/push/build.xml
index 2dc05f62fd..ead3a0226e 100644
--- a/push/build.xml
+++ b/push/build.xml
@@ -12,8 +12,8 @@
     <property name="result.dir" location="result" />
     <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.vaadin3" />
+    <!-- Keep the version number in sync with ivy.xml, server/src/com/vaadin/server/Constants.java and jquery.atmosphere.js -->
+    <property name="atmosphere.version" value="1.0.14.vaadin4" />
     <property name="jquery.version" value="1.7.2" />
 
     <path id="classpath.compile.custom" />
diff --git a/push/ivy.xml b/push/ivy.xml
index 615e404db3..5a2a24fb1f 100644
--- a/push/ivy.xml
+++ b/push/ivy.xml
@@ -26,9 +26,9 @@
             rev="2.4" conf="build-provided,ide,test -> default" />
 
         <!-- Atmosphere -->
-        <!-- Keep the version number in sync with build.xml -->
+        <!-- Keep the version number in sync with build.xml and other locations listed in that file -->
         <dependency org="com.vaadin.external.atmosphere" name="atmosphere-runtime"
-            rev="1.0.14.vaadin3" conf="build,ide,test -> default">
+            rev="1.0.14.vaadin4" conf="build,ide,test -> default">
         </dependency>
     </dependencies>
 
-- 
cgit v1.2.3