diff options
| author | Artur Signell <artur@vaadin.com> | 2013-06-25 12:58:23 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2013-06-25 14:58:52 +0300 |
| commit | 82dc8bbbe87d081b085ba54a9aa5905578e83217 (patch) | |
| tree | 68b4c1b30e2ab18faa24e4c1d17666d615827f24 | |
| parent | 98cf4a45a87fe5b92ec89fd18e2dd37a7e87cb63 (diff) | |
| download | vaadin-framework-82dc8bbbe87d081b085ba54a9aa5905578e83217.tar.gz vaadin-framework-82dc8bbbe87d081b085ba54a9aa5905578e83217.zip | |
Use atmosphere 1.0.14.vaadin3 which fixes Android 4.1 support (#12101)
Change-Id: I75cd1eebeeb5836b9205a9a1e28795be300d135a
| -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 d8661e9124..042e513830 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.vaadin2" /> + <property name="atmosphere.version" value="1.0.14.vaadin3" /> <property name="jquery.version" value="1.7.2" /> <path id="classpath.compile.custom" /> diff --git a/push/ivy.xml b/push/ivy.xml index 8167bf300b..615e404db3 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.vaadin2" conf="build,ide,test -> default"> + rev="1.0.14.vaadin3" 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 342e693afb..ed65b53183 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.vaadin2"; + static final String REQUIRED_ATMOSPHERE_VERSION = "1.0.14.vaadin3"; static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n" + "=================================================================\n" |