diff options
| author | Artur Signell <artur@vaadin.com> | 2013-06-24 13:15:17 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2013-06-24 22:11:39 +0300 |
| commit | 98cf4a45a87fe5b92ec89fd18e2dd37a7e87cb63 (patch) | |
| tree | 4e2edcf1cd601c7325308cb6705e46fdd1264fd9 | |
| parent | 15c9eb5b393ec08aa9b3be849dfb394916cd5535 (diff) | |
| download | vaadin-framework-98cf4a45a87fe5b92ec89fd18e2dd37a7e87cb63.tar.gz vaadin-framework-98cf4a45a87fe5b92ec89fd18e2dd37a7e87cb63.zip | |
Updated Atmosphere dependency to 1.0.14.vaadin2 (#12017, #12033, #12115)
Change-Id: I068cca8ae2d3739b3a8ba7b01cd83b1b69509dd2
| -rw-r--r-- | push/build.xml | 2 | ||||
| -rw-r--r-- | push/ivy.xml | 2 | ||||
| -rw-r--r-- | server/src/com/vaadin/server/Constants.java | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/push/build.xml b/push/build.xml index f18caf69b4..d8661e9124 100644 --- a/push/build.xml +++ b/push/build.xml @@ -13,7 +13,7 @@ <property name="vaadinPush.js" location="${result.dir}/js/VAADIN/vaadinPush.js" /> <!-- Keep the version number in sync with ivy.xml and server/src/com/vaadin/server/Constants.java--> - <property name="atmosphere.version" value="1.0.14-vaadin1" /> + <property name="atmosphere.version" value="1.0.14.vaadin2" /> <property name="jquery.version" value="1.7.2" /> <path id="classpath.compile.custom" /> diff --git a/push/ivy.xml b/push/ivy.xml index 444e8908e0..8167bf300b 100644 --- a/push/ivy.xml +++ b/push/ivy.xml @@ -28,7 +28,7 @@ <!-- Atmosphere --> <!-- Keep the version number in sync with build.xml --> <dependency org="com.vaadin.external.atmosphere" name="atmosphere-runtime" - rev="1.0.14-vaadin1" conf="build,ide,test -> default"> + rev="1.0.14.vaadin2" conf="build,ide,test -> default"> </dependency> </dependencies> diff --git a/server/src/com/vaadin/server/Constants.java b/server/src/com/vaadin/server/Constants.java index bcdb62064b..342e693afb 100644 --- a/server/src/com/vaadin/server/Constants.java +++ b/server/src/com/vaadin/server/Constants.java @@ -65,7 +65,7 @@ public interface Constants { + " Widgetset version: %s\n" + "================================================================="; - static final String REQUIRED_ATMOSPHERE_VERSION = "1.0.14-vaadin1"; + static final String REQUIRED_ATMOSPHERE_VERSION = "1.0.14.vaadin2"; static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n" + "=================================================================\n" |