diff options
| author | Artur Signell <artur@vaadin.com> | 2013-06-14 11:42:37 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2013-06-14 10:23:24 +0000 |
| commit | 8c4800a6a1cd735046085ba56acb3d50283eb42c (patch) | |
| tree | 166aa598d6b8b7adb0822313a5fad4d087b7640b | |
| parent | ad9c3506e752534f72814da2782fc87db55b49c0 (diff) | |
| download | vaadin-framework-8c4800a6a1cd735046085ba56acb3d50283eb42c.tar.gz vaadin-framework-8c4800a6a1cd735046085ba56acb3d50283eb42c.zip | |
Updated to atmosphere 1.0.14-vaadin1
Change-Id: I758ec93ce6eeeef023811f754e67eed122c510d9
| -rw-r--r-- | push/build.xml | 4 | ||||
| -rw-r--r-- | push/ivy.xml | 2 | ||||
| -rw-r--r-- | server/src/com/vaadin/server/Constants.java | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/push/build.xml b/push/build.xml index 2cd86d9ce5..f18caf69b4 100644 --- a/push/build.xml +++ b/push/build.xml @@ -12,8 +12,8 @@ <property name="result.dir" location="result" /> <property name="vaadinPush.js" location="${result.dir}/js/VAADIN/vaadinPush.js" /> - <!-- Keep the version number in sync with ivy.xml --> - <property name="atmosphere.version" value="1.0.14-2" /> + <!-- 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="jquery.version" value="1.7.2" /> <path id="classpath.compile.custom" /> diff --git a/push/ivy.xml b/push/ivy.xml index d0a60dc1c3..444e8908e0 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-2" conf="build,ide,test -> default"> + rev="1.0.14-vaadin1" 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 0ea9de252a..bcdb62064b 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-2"; + static final String REQUIRED_ATMOSPHERE_VERSION = "1.0.14-vaadin1"; static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n" + "=================================================================\n" |