Browse Source
Update Atmosphere to 2.2.4.vaadin4 (#16825, #16826, #16862)
Change-Id: Idd43e37ac7ba37710ffea7e01efc931e73defd90 Conflicts: push/build.xml push/ivy.xml server/src/com/vaadin/server/Constants.javatags/7.4.1
Artur Signell
9 years ago
3 changed files with 3 additions and 3 deletions
+ 1
- 1
push/build.xml
View File
| @@ -18,7 +18,7 @@ | |||
| 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="2.2.4.vaadin2" /> | |||
| <property name="atmosphere.runtime.version" value="2.2.4.vaadin4" /> | |||
| <property name="jquery.js" location="lib/jquery/jquery-1.11.0.js" /> | |||
| <path id="classpath.compile.custom" /> | |||
+ 1
- 1
push/ivy.xml
View File
| @@ -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 "2.2.4.vaadin2"> | |||
| <!ENTITY atmosphere.runtime.version "2.2.4.vaadin4"> | |||
| <!ENTITY atmosphere.js.version "2.2.6.vaadin3"> | |||
| ]> | |||
+ 1
- 1
server/src/com/vaadin/server/Constants.java
View File
| @@ -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 = "2.2.4.vaadin2"; | |||
| static final String REQUIRED_ATMOSPHERE_RUNTIME_VERSION = "2.2.4.vaadin4"; | |||
| static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n" | |||
| + "=================================================================\n" | |||
Loading…