summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTatu Lund <tatu@vaadin.com>2021-01-18 15:05:04 +0200
committerGitHub <noreply@github.com>2021-01-18 15:05:04 +0200
commitf790ba970d49cfe5c50a3b28d099227af8fcc4a6 (patch)
tree91876ae4ec7c70783633e1b1bdb2f46b54bf18e1
parent21ff79aea40e2a3d998449efbae780dca3eb987e (diff)
downloadvaadin-framework-f790ba970d49cfe5c50a3b28d099227af8fcc4a6.tar.gz
vaadin-framework-f790ba970d49cfe5c50a3b28d099227af8fcc4a6.zip
Update Atmosphere vaadin2 patch (#12181)
-rw-r--r--pom.xml2
-rw-r--r--server/src/main/java/com/vaadin/server/Constants.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/pom.xml b/pom.xml
index 4b694c33e7..fb75074ef2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,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.30.vaadin1</atmosphere.runtime.version>
+ <atmosphere.runtime.version>2.4.30.vaadin2</atmosphere.runtime.version>
<!-- OSGi -->
<osgi.execution.environment>JavaSE-1.8</osgi.execution.environment>
diff --git a/server/src/main/java/com/vaadin/server/Constants.java b/server/src/main/java/com/vaadin/server/Constants.java
index 16b685a24e..a35eae83f9 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.30.vaadin1";
+ static final String REQUIRED_ATMOSPHERE_RUNTIME_VERSION = "2.4.30.vaadin2";
static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n"
+ "=================================================================\n"