summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2014-02-17 17:41:02 +0200
committerArtur Signell <artur@vaadin.com>2014-03-20 09:39:00 +0000
commitd74f683559955f58483d7a702d70e89f3e65a021 (patch)
tree6ba6ede7499bcd0af0525ebaf5e92afd8d8ad0c0
parent24a8d5dacc949049bc369741a76a6d17913a039e (diff)
downloadvaadin-framework-d74f683559955f58483d7a702d70e89f3e65a021.tar.gz
vaadin-framework-d74f683559955f58483d7a702d70e89f3e65a021.zip
Upgrade to atmosphere-runtime 2.1.1.vaadin2 (#12601, #13196)
Change-Id: I7ccd1217026b5f4bab292225568da16e368050b5
-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 fbe72501de..4a618611dd 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="2.0.3.vaadin1" />
+ <property name="atmosphere.runtime.version" value="2.1.1.vaadin2" />
<property name="jquery.version" value="1.9.0" />
<path id="classpath.compile.custom" />
diff --git a/push/ivy.xml b/push/ivy.xml
index b28c5c69d9..4e66de30e8 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 "2.0.3.vaadin1">
+ <!ENTITY atmosphere.runtime.version "2.1.1.vaadin2">
<!ENTITY atmosphere.js.version "2.0.8.vaadin1">
]>
diff --git a/server/src/com/vaadin/server/Constants.java b/server/src/com/vaadin/server/Constants.java
index a39c39fa72..26715eff12 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 = "2.0.3.vaadin1";
+ static final String REQUIRED_ATMOSPHERE_RUNTIME_VERSION = "2.1.1.vaadin2";
static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n"
+ "=================================================================\n"