diff options
| author | Artur <artur@vaadin.com> | 2017-03-09 20:24:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-09 20:24:06 +0200 |
| commit | 7226e1aacdcc8c4097a7b9ea246689c75e67c454 (patch) | |
| tree | bb5c038ae5aa37e3e705cb11020ec3ca24414696 | |
| parent | 9e2e720ca3aff7e1ca571860805a206e388dc5b5 (diff) | |
| download | vaadin-framework-7226e1aacdcc8c4097a7b9ea246689c75e67c454.tar.gz vaadin-framework-7226e1aacdcc8c4097a7b9ea246689c75e67c454.zip | |
Update Atmosphere to resolve problems in servlets with multiple mappings (#8785)
Fixes #8734
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | server/src/main/java/com/vaadin/server/Constants.java | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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> diff --git a/server/src/main/java/com/vaadin/server/Constants.java b/server/src/main/java/com/vaadin/server/Constants.java index a5ed28cd50..768bb54103 100644 --- a/server/src/main/java/com/vaadin/server/Constants.java +++ b/server/src/main/java/com/vaadin/server/Constants.java @@ -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" |