You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2020/05/12 09:39:29 UTC
[cxf] 01/02: Updating atmosphere to 2.5.15 and re-enabling on JDK 11
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit c0caa3431c94a03d1d1e1b5f4120f42aa0f7f253
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue May 12 09:46:57 2020 +0100
Updating atmosphere to 2.5.15 and re-enabling on JDK 11
(cherry picked from commit 12d2f091afde535edab04e56c9df026cc9aad743)
# Conflicts:
# parent/pom.xml
---
parent/pom.xml | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 9b7bdcb..e42cc41 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -86,7 +86,7 @@
<cxf.artemis.version>2.10.1</cxf.artemis.version>
<cxf.aspectj.version>1.9.1</cxf.aspectj.version>
<cxf.atmosphere.version.range>[2.4,3.0)</cxf.atmosphere.version.range>
- <cxf.atmosphere.version>2.5.2</cxf.atmosphere.version>
+ <cxf.atmosphere.version>2.5.15</cxf.atmosphere.version>
<cxf.bcprov.version>1.65</cxf.bcprov.version>
<cxf.brave.reporter.version>2.12.1</cxf.brave.reporter.version>
<cxf.brave.version>5.10.1</cxf.brave.version>
@@ -2804,13 +2804,12 @@
</build>
</profile>
<profile>
- <id>java9-plus</id>
- <properties>
- <org.apache.cxf.transport.websocket.atmosphere.disabled>true</org.apache.cxf.transport.websocket.atmosphere.disabled>
+ <id>java9-plus</id>
+ <properties>
<cxf.jdk.version>11</cxf.jdk.version>
- </properties>
- <activation>
- <jdk>[9,)</jdk>
+ </properties>
+ <activation>
+ <jdk>[9,)</jdk>
</activation>
<build>
<plugins>