summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2013-11-05 08:36:37 +0200
committerVaadin Code Review <review@vaadin.com>2013-11-05 08:25:44 +0000
commitf8da9267bf223b516a3ec7d1ee0c782a6b3f6fdb (patch)
tree365251dde09766f018d7d25ba4375c27aa41ca6a
parentcc796b0ebe8f31b33bba06d9096560d1aa87eb19 (diff)
downloadvaadin-framework-f8da9267bf223b516a3ec7d1ee0c782a6b3f6fdb.tar.gz
vaadin-framework-f8da9267bf223b516a3ec7d1ee0c782a6b3f6fdb.zip
Updated to Atmosphere 1.0.18.vaadin1 (#12891)
Change-Id: I5387c9f5eca1eb7941fbd4565d4b6f3cb95a5a0f
-rw-r--r--push/build.xml2
-rw-r--r--push/ivy.xml2
-rw-r--r--server/src/com/vaadin/server/Constants.java2
3 files changed, 3 insertions, 3 deletions
diff --git a/push/build.xml b/push/build.xml
index fcf75b162c..abeec2a8b0 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="1.0.14.vaadin4" />
+ <property name="atmosphere.runtime.version" value="1.0.18.vaadin1" />
<property name="jquery.version" value="1.9.0" />
<path id="classpath.compile.custom" />
diff --git a/push/ivy.xml b/push/ivy.xml
index ecbb1fcced..2be47512fe 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 "1.0.14.vaadin4">
+ <!ENTITY atmosphere.runtime.version "1.0.18.vaadin1">
<!ENTITY atmosphere.js.version "2.0.3.vaadin2">
]>
diff --git a/server/src/com/vaadin/server/Constants.java b/server/src/com/vaadin/server/Constants.java
index e910ba903b..b0841da314 100644
--- a/server/src/com/vaadin/server/Constants.java
+++ b/server/src/com/vaadin/server/Constants.java
@@ -67,7 +67,7 @@ public interface Constants {
// Keep the version number in sync with push/build.xml and other locations
// listed in that file
- static final String REQUIRED_ATMOSPHERE_RUNTIME_VERSION = "1.0.14.vaadin4";
+ static final String REQUIRED_ATMOSPHERE_RUNTIME_VERSION = "1.0.18.vaadin1";
static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n"
+ "=================================================================\n"