aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Dahlström <johannesd@vaadin.com>2014-08-28 15:42:03 +0300
committerSauli Tähkäpää <sauli@vaadin.com>2014-09-12 16:22:42 +0300
commit4fdea59fdf2bde8e5683fdc9c3aedd871ab8d4ad (patch)
treeae6bf8da8f6256bf2829dfcb964eaaa6e6bd5403
parent6877a4d8802f9fae2b54e390e5171a1df705253d (diff)
downloadvaadin-framework-4fdea59fdf2bde8e5683fdc9c3aedd871ab8d4ad.tar.gz
vaadin-framework-4fdea59fdf2bde8e5683fdc9c3aedd871ab8d4ad.zip
Bump Atmosphere-runtime version number to 2.1.2.vaadin4 (#14038)
Change-Id: Ifcfe1f90b795072c12d3118db33f3df6c96c568b
-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 dee5820efb..fb80cc7cbf 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.1.2.vaadin3" />
+ <property name="atmosphere.runtime.version" value="2.1.2.vaadin4" />
<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 d3b4944353..b6bd1b06f7 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.1.2.vaadin3">
+ <!ENTITY atmosphere.runtime.version "2.1.2.vaadin4">
<!ENTITY atmosphere.js.version "2.1.5.vaadin4">
]>
diff --git a/server/src/com/vaadin/server/Constants.java b/server/src/com/vaadin/server/Constants.java
index 08b5b70f50..aa1e02a96e 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.1.2.vaadin3";
+ static final String REQUIRED_ATMOSPHERE_RUNTIME_VERSION = "2.1.2.vaadin4";
static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n"
+ "=================================================================\n"