diff options
| author | Artur Signell <artur@vaadin.com> | 2013-11-11 16:19:52 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2013-11-11 16:19:52 +0200 |
| commit | 9835a829de6d30566442dfecb400f973b7c7ee7d (patch) | |
| tree | de621bd995c5c30b6ad87985c7f3e9215225bf1b /server | |
| parent | 2ef66c9372fa57f529f95e02c571e75fcc3a0b21 (diff) | |
| parent | f8da9267bf223b516a3ec7d1ee0c782a6b3f6fdb (diff) | |
| download | vaadin-framework-9835a829de6d30566442dfecb400f973b7c7ee7d.tar.gz vaadin-framework-9835a829de6d30566442dfecb400f973b7c7ee7d.zip | |
Merge changes from origin/7.1
a5a9131 Converted LayoutTesterApplication test to TB3
1376429 Fix compilation error in test
7b120fc Tests for validating reconnect works for streaming and websockets (#12868,#12853,#12852)
9e6a82d Force connection to closed state on reconnect (#12853)
e365eee No longer require specifying Atmosphere js version in two places
ca7e928 Update to Atmosphere js 2.0.3.vaadin2 (#12868, #12852)
1cc4dc1 Fix duplicate id issue in test and test more corner cases
c21a684 Prepare for Safari 7 testing (#5288)
7615fd1 Made test more stable and added Firefox reconnect test (#12492)
186696d fix regression related to #12504
c48c94d Reverted change in how hack works (#12727, #12736)
f328340 Fix NPE caused by setting ApplicationConnection too late (#12736)
b47915f Extracted test to separate class
e07e674 Remove possibility to use static inner classes for tests
c4aff77 Fix NPE in fix (#12504)
15dce28 Make test more reliable by updating description which does not update the DOM
6a63d12 Make Panel scroll the correct div (#12736)
cc796b0 Ensure testing Jetty does not run out of heap space
f8da926 Updated to Atmosphere 1.0.18.vaadin1 (#12891)
Change-Id: Ic30441d72c4e45551255724a0dcc3b3fa5a1729b
Diffstat (limited to 'server')
| -rw-r--r-- | server/src/com/vaadin/server/Constants.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/src/com/vaadin/server/Constants.java b/server/src/com/vaadin/server/Constants.java index e910ba903b..b0841da314 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.14.vaadin4"; + static final String REQUIRED_ATMOSPHERE_RUNTIME_VERSION = "1.0.18.vaadin1"; static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n" + "=================================================================\n" |