diff options
| author | Artur Signell <artur@vaadin.com> | 2013-06-10 14:18:33 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2013-06-10 13:49:34 +0000 |
| commit | d9becf9523fdd71abb1b93072a76df163b9dd2c0 (patch) | |
| tree | d7f89de259022238c4905b6f7650e943a7dbb6c5 | |
| parent | e853280aa95e2422821f65da601f780318f2132f (diff) | |
| download | vaadin-framework-d9becf9523fdd71abb1b93072a76df163b9dd2c0.tar.gz vaadin-framework-d9becf9523fdd71abb1b93072a76df163b9dd2c0.zip | |
Use vaadin-atmosphere without slf4j dependency (#11765)
Change-Id: I78f5dda87957452670c3d86d960b0683c67eb77d
| -rw-r--r-- | push/build.xml | 2 | ||||
| -rw-r--r-- | push/ivy.xml | 4 | ||||
| -rw-r--r-- | server/src/com/vaadin/server/Constants.java | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/push/build.xml b/push/build.xml index ad27599d36..d09e6766fc 100644 --- a/push/build.xml +++ b/push/build.xml @@ -14,7 +14,7 @@ <property name="vaadinPush.js" location="${result.dir}/js/VAADIN/vaadinPush.js" /> <!-- Keep the version number in sync with ivy.xml --> - <property name="atmosphere.version" value="1.0.13" /> + <property name="atmosphere.version" value="1.0.14-2" /> <property name="jquery.version" value="1.7.2" /> <path id="classpath.compile.custom" /> diff --git a/push/ivy.xml b/push/ivy.xml index e2ba3a63f7..d0a60dc1c3 100644 --- a/push/ivy.xml +++ b/push/ivy.xml @@ -27,8 +27,8 @@ <!-- Atmosphere --> <!-- Keep the version number in sync with build.xml --> - <dependency org="org.atmosphere" name="atmosphere-runtime" - rev="1.0.13" conf="build,ide,test -> default"> + <dependency org="com.vaadin.external.atmosphere" name="atmosphere-runtime" + rev="1.0.14-2" 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 7d3201efdf..0ea9de252a 100644 --- a/server/src/com/vaadin/server/Constants.java +++ b/server/src/com/vaadin/server/Constants.java @@ -65,7 +65,7 @@ public interface Constants { + " Widgetset version: %s\n" + "================================================================="; - static final String REQUIRED_ATMOSPHERE_VERSION = "1.0.13"; + static final String REQUIRED_ATMOSPHERE_VERSION = "1.0.14-2"; static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n" + "=================================================================\n" |