Skip to content

Commit

Permalink
Update Atmosphere to resolve problems in servlets with multiple mappi…
Browse files Browse the repository at this point in the history
…ngs (#8785)

Fixes #8734
  • Loading branch information
Artur- committed Mar 9, 2017
1 parent 9e2e720 commit 7226e1a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Expand Up @@ -34,7 +34,7 @@
<javax.portlet.version>2.0</javax.portlet.version>
<vaadin.sass.version>0.9.13</vaadin.sass.version>
<!-- Note that this should be kept in sync with the class Constants -->
<atmosphere.runtime.version>2.4.5.vaadin1</atmosphere.runtime.version>
<atmosphere.runtime.version>2.4.5.vaadin2</atmosphere.runtime.version>

<!-- OSGi -->
<osgi.javax.servlet.version>3.0.0</osgi.javax.servlet.version>
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/com/vaadin/server/Constants.java
Expand Up @@ -66,7 +66,7 @@ public interface Constants {
+ "=================================================================";

// Keep the version number in sync with pom.xml
static final String REQUIRED_ATMOSPHERE_RUNTIME_VERSION = "2.4.5.vaadin1";
static final String REQUIRED_ATMOSPHERE_RUNTIME_VERSION = "2.4.5.vaadin2";

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

0 comments on commit 7226e1a

Please sign in to comment.