diff options
| author | Artur Signell <artur@vaadin.com> | 2014-03-03 20:38:30 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-03-04 07:51:00 +0000 |
| commit | d7b1931270d37360a0418b1cae4d980287b05f38 (patch) | |
| tree | 53678d96b88a84b17814541b37a29835455df546 | |
| parent | f6bd40d2eb63b092ec5be4c477b6e1bfee3021cc (diff) | |
| download | vaadin-framework-d7b1931270d37360a0418b1cae4d980287b05f38.tar.gz vaadin-framework-d7b1931270d37360a0418b1cae4d980287b05f38.zip | |
Fix fallback from websocket when behind proxy (#13299)
Change-Id: Id12cb97816afde4363caea20ff30376ff9cdb173
| -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 abeec2a8b0..d2379d6090 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="1.0.18.vaadin1" /> + <property name="atmosphere.runtime.version" value="1.0.18.vaadin2" /> <property name="jquery.version" value="1.9.0" /> <path id="classpath.compile.custom" /> diff --git a/push/ivy.xml b/push/ivy.xml index 2be47512fe..f4e3d94ece 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 "1.0.18.vaadin1"> + <!ENTITY atmosphere.runtime.version "1.0.18.vaadin2"> <!ENTITY atmosphere.js.version "2.0.3.vaadin2"> ]> diff --git a/server/src/com/vaadin/server/Constants.java b/server/src/com/vaadin/server/Constants.java index b0841da314..2f6f39eeff 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 = "1.0.18.vaadin1"; + static final String REQUIRED_ATMOSPHERE_RUNTIME_VERSION = "1.0.18.vaadin2"; static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n" + "=================================================================\n" |