Browse Source

Update Atmosphere runtime to 2.1.2.vaadin3 (#13971)

Atmosphere 2.1.2.vaadin3 includes fix for:
https://github.com/Atmosphere/atmosphere/issues/1643

Change-Id: I67c07dc3b32ebb3b0eed634bf143bac9a7e5efe2
tags/7.3.0.rc1
Sauli Tähkäpää 10 years ago
parent
commit
0ff5a8d002
3 changed files with 3 additions and 3 deletions
  1. 1
    1
      push/build.xml
  2. 1
    1
      push/ivy.xml
  3. 1
    1
      server/src/com/vaadin/server/Constants.java

+ 1
- 1
push/build.xml View File

<property name="vaadinPush.debug.js" location="${result.dir}/js/VAADIN/vaadinPush.debug.js" /> <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 --> <!-- Keep the version number in sync with ivy.xml, server/src/com/vaadin/server/Constants.java -->
<property name="atmosphere.runtime.version" value="2.1.2.vaadin2" />
<property name="atmosphere.runtime.version" value="2.1.2.vaadin3" />
<property name="jquery.js" location="lib/jquery/jquery-1.11.0.js" /> <property name="jquery.js" location="lib/jquery/jquery-1.11.0.js" />


<path id="classpath.compile.custom" /> <path id="classpath.compile.custom" />

+ 1
- 1
push/ivy.xml View File

<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE ivy-module [ <!DOCTYPE ivy-module [
<!-- Keep the version number in sync with build.xml --> <!-- Keep the version number in sync with build.xml -->
<!ENTITY atmosphere.runtime.version "2.1.2.vaadin2">
<!ENTITY atmosphere.runtime.version "2.1.2.vaadin3">


<!ENTITY atmosphere.js.version "2.1.5.vaadin4"> <!ENTITY atmosphere.js.version "2.1.5.vaadin4">
]> ]>

+ 1
- 1
server/src/com/vaadin/server/Constants.java View File



// Keep the version number in sync with push/build.xml and other locations // Keep the version number in sync with push/build.xml and other locations
// listed in that file // listed in that file
static final String REQUIRED_ATMOSPHERE_RUNTIME_VERSION = "2.1.2.vaadin2";
static final String REQUIRED_ATMOSPHERE_RUNTIME_VERSION = "2.1.2.vaadin3";


static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n" static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n"
+ "=================================================================\n" + "=================================================================\n"

Loading…
Cancel
Save