Use vaadin-atmosphere without slf4j dependency (#11765)

Change-Id: I78f5dda87957452670c3d86d960b0683c67eb77d

diff --git a/push/build.xml b/push/build.xml
index ad27599d36aa77abbf808f1d9dc23fc5c347607c..d09e6766fc4df07752c17e141e8a4895906e5d7c 100644 (file)
--- a/push/build.xml
+++ b/push/build.xml
@@ -14,7 +14,7 @@
     <property name="vaadinPush.js" location="${result.dir}/js/VAADIN/vaadinPush.js" />
 
     <!-- Keep the version number in sync with ivy.xml -->
-    <property name="atmosphere.version" value="1.0.13" />
+    <property name="atmosphere.version" value="1.0.14-2" />
     <property name="jquery.version" value="1.7.2" />
 
     <path id="classpath.compile.custom" />

diff --git a/push/ivy.xml b/push/ivy.xml
index e2ba3a63f736cda524f9f0be71b07e6acc80358a..d0a60dc1c3a558838e10e1e8399a83c635217e9e 100644 (file)
--- a/push/ivy.xml
+++ b/push/ivy.xml
@@ -27,8 +27,8 @@
 
         <!-- Atmosphere -->
         <!-- Keep the version number in sync with build.xml -->
-        <dependency org="org.atmosphere" name="atmosphere-runtime"
-            rev="1.0.13" conf="build,ide,test -> default">
+        <dependency org="com.vaadin.external.atmosphere" name="atmosphere-runtime"
+            rev="1.0.14-2" conf="build,ide,test -> default">
         </dependency>
     </dependencies>
 

diff --git a/server/src/com/vaadin/server/Constants.java b/server/src/com/vaadin/server/Constants.java
index 7d3201efdfacf24c8904c05b6a67c2c4099272d5..0ea9de252a613f07667fbbd451c92eaccc189076 100644 (file)
--- a/server/src/com/vaadin/server/Constants.java
+++ b/server/src/com/vaadin/server/Constants.java
@@ -65,7 +65,7 @@ public interface Constants {
             + " Widgetset version: %s\n"
             + "=================================================================";
 
-    static final String REQUIRED_ATMOSPHERE_VERSION = "1.0.13";
+    static final String REQUIRED_ATMOSPHERE_VERSION = "1.0.14-2";
 
     static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n"
             + "=================================================================\n"