aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2014-03-05 12:32:40 +0200
committerHenri Sara <hesara@vaadin.com>2014-03-05 17:01:51 +0200
commit8d87108938dd1a16d093d918a44ebb620b993009 (patch)
treec38b77bf7ae7fa628ba9ac4997441ad4dd4fca7c
parentb12b23b763c236b5912e714824f801fd8b4e58c4 (diff)
downloadvaadin-framework-8d87108938dd1a16d093d918a44ebb620b993009.tar.gz
vaadin-framework-8d87108938dd1a16d093d918a44ebb620b993009.zip
Update to Atmosphere 1.0.18.vaadin3 to fix regressions (#13299).
Change-Id: I028e29c4d39a032dd2a3cf24dff111ee52e50f44
-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 d2379d6090..17bc04a8cf 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.18.vaadin2" />
+ <property name="atmosphere.runtime.version" value="1.0.18.vaadin3" />
<property name="jquery.version" value="1.9.0" />
<path id="classpath.compile.custom" />
diff --git a/push/ivy.xml b/push/ivy.xml
index f4e3d94ece..ff6e199b95 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.18.vaadin2">
+ <!ENTITY atmosphere.runtime.version "1.0.18.vaadin3">
<!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 2f6f39eeff..430a5153c0 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.18.vaadin2";
+ static final String REQUIRED_ATMOSPHERE_RUNTIME_VERSION = "1.0.18.vaadin3";
static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n"
+ "=================================================================\n"