diff options
| author | Leif Åstrand <leif@vaadin.com> | 2013-07-18 17:11:17 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2013-07-19 12:55:38 +0000 |
| commit | 36aebc81ff63af333a36f7e72d11fe17d06dd97e (patch) | |
| tree | 0ace4ffdef01c32129b59cd295c3ef8d67165ce4 | |
| parent | 9c8eb70dd54c1ba56d02111b9246a7767e1a0442 (diff) | |
| download | vaadin-framework-36aebc81ff63af333a36f7e72d11fe17d06dd97e.tar.gz vaadin-framework-36aebc81ff63af333a36f7e72d11fe17d06dd97e.zip | |
Update to Atmosphere 1.0.14.vaadin4 (#12242)
Change-Id: I76ccbf631f8ba169f11513b7d585f39b8ab570a4
| -rw-r--r-- | WebContent/VAADIN/jquery.atmosphere.js | 3 | ||||
| -rw-r--r-- | push/build.xml | 4 | ||||
| -rw-r--r-- | push/ivy.xml | 4 | ||||
| -rw-r--r-- | server/src/com/vaadin/server/Constants.java | 4 |
4 files changed, 9 insertions, 6 deletions
diff --git a/WebContent/VAADIN/jquery.atmosphere.js b/WebContent/VAADIN/jquery.atmosphere.js index bb597f01b5..28a7d033bd 100644 --- a/WebContent/VAADIN/jquery.atmosphere.js +++ b/WebContent/VAADIN/jquery.atmosphere.js @@ -49,7 +49,8 @@ jQuery.atmosphere = function() { }; return { - version : "1.0.13", + // Keep the version number in sync with push/build.xml and other locations listed in that file + version : "1.0.14.vaadin4", requests : [], callbacks : [], diff --git a/push/build.xml b/push/build.xml index 2dc05f62fd..ead3a0226e 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 and server/src/com/vaadin/server/Constants.java--> - <property name="atmosphere.version" value="1.0.14.vaadin3" /> + <!-- Keep the version number in sync with ivy.xml, server/src/com/vaadin/server/Constants.java and jquery.atmosphere.js --> + <property name="atmosphere.version" value="1.0.14.vaadin4" /> <property name="jquery.version" value="1.7.2" /> <path id="classpath.compile.custom" /> diff --git a/push/ivy.xml b/push/ivy.xml index 615e404db3..5a2a24fb1f 100644 --- a/push/ivy.xml +++ b/push/ivy.xml @@ -26,9 +26,9 @@ rev="2.4" conf="build-provided,ide,test -> default" /> <!-- Atmosphere --> - <!-- Keep the version number in sync with build.xml --> + <!-- Keep the version number in sync with build.xml and other locations listed in that file --> <dependency org="com.vaadin.external.atmosphere" name="atmosphere-runtime" - rev="1.0.14.vaadin3" conf="build,ide,test -> default"> + rev="1.0.14.vaadin4" 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 ed65b53183..ab91ee021c 100644 --- a/server/src/com/vaadin/server/Constants.java +++ b/server/src/com/vaadin/server/Constants.java @@ -65,7 +65,9 @@ public interface Constants { + " Widgetset version: %s\n" + "================================================================="; - static final String REQUIRED_ATMOSPHERE_VERSION = "1.0.14.vaadin3"; + // Keep the version number in sync with push/build.xml and other locations + // listed in that file + static final String REQUIRED_ATMOSPHERE_VERSION = "1.0.14.vaadin4"; static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n" + "=================================================================\n" |