summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2015-06-03 22:46:46 +0300
committerArtur Signell <artur@vaadin.com>2015-06-08 21:47:49 +0000
commit479f1c55e0d4958c6d4fc3aa0c9aca6442b89371 (patch)
tree7f0b99dd58be51c38642a85ef237c3c9c2ac1e61
parentffb4036fe0573c35e759cb89e8b252f5477ecbea (diff)
downloadvaadin-framework-479f1c55e0d4958c6d4fc3aa0c9aca6442b89371.tar.gz
vaadin-framework-479f1c55e0d4958c6d4fc3aa0c9aca6442b89371.zip
Update to Atmosphere 2.2.7 (#18069)
Change-Id: I44994ffbe73cbbcf0eae67718a821ac0f883b60e
-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 689ed74b4b..9a45b86cfe 100644
--- a/push/build.xml
+++ b/push/build.xml
@@ -18,7 +18,7 @@
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.2.4.vaadin8" />
+ <property name="atmosphere.runtime.version" value="2.2.7.vaadin1" />
<property name="jquery.js" location="lib/jquery/jquery-1.11.0.js" />
<path id="classpath.compile.custom" />
diff --git a/push/ivy.xml b/push/ivy.xml
index 4eb78629a1..faf96818e1 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.2.4.vaadin8">
+ <!ENTITY atmosphere.runtime.version "2.2.7.vaadin1">
<!ENTITY atmosphere.js.version "2.2.6.vaadin4">
]>
diff --git a/server/src/com/vaadin/server/Constants.java b/server/src/com/vaadin/server/Constants.java
index 122cce2e74..5a0d852299 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.2.4.vaadin8";
+ static final String REQUIRED_ATMOSPHERE_RUNTIME_VERSION = "2.2.7.vaadin1";
static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n"
+ "=================================================================\n"