This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 8e78fae CXF-7889: ensure all samples from CXF kit can work with JDK11
OOTB. Fixing jax_rs/websocket
8e78fae is described below
commit 8e78fae173033a3118e0eb278816fc3088aecbea
Author: reta <[email protected]>
AuthorDate: Sun Nov 11 19:57:20 2018 -0500
CXF-7889: ensure all samples from CXF kit can work with JDK11 OOTB. Fixing
jax_rs/websocket
---
.../main/release/samples/jax_rs/websocket/pom.xml | 20 ++++----------------
.../java/demo/jaxrs/client/WebSocketTestClient.java | 10 +++++-----
parent/pom.xml | 2 +-
3 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
b/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
index 2ac69eb..163f777 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
@@ -31,10 +31,9 @@
<properties>
<cxf.version>${project.version}</cxf.version>
<!-- TODO remove these local entries after making the referenced
dependency managed in parent/pom.xml -->
- <cxf.ahc.version>1.8.5</cxf.ahc.version>
- <cxf.atmosphere.version>2.4.3</cxf.atmosphere.version>
- <cxf.jetty8.version>8.1.15.v20140411</cxf.jetty8.version>
- <cxf.jetty9.version>9.2.2.v20140723</cxf.jetty9.version>
+ <cxf.ahc.version>1.9.40</cxf.ahc.version>
+ <cxf.jetty8.version>8.1.22.v20160922</cxf.jetty8.version>
+ <cxf.jetty9.version>9.4.12.v20180830</cxf.jetty9.version>
<cxf.jetty.version>${cxf.jetty8.version}</cxf.jetty.version>
<cxf.netty3.version>3.9.1.Final</cxf.netty3.version>
</properties>
@@ -192,18 +191,8 @@
<groupId>com.ning</groupId>
<artifactId>async-http-client</artifactId>
<version>${cxf.ahc.version}</version>
- <exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- <version>${cxf.netty3.version}</version>
</dependency>
+
<!-- JettyHttpDestination is referring to
org.springframework.util.ClassUtils -->
<dependency>
<groupId>org.springframework</groupId>
@@ -214,7 +203,6 @@
<dependency>
<groupId>org.atmosphere</groupId>
<artifactId>atmosphere-runtime</artifactId>
- <version>${cxf.atmosphere.version}</version>
</dependency>
</dependencies>
diff --git
a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/WebSocketTestClient.java
b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/WebSocketTestClient.java
index 064c5eb..a2cb3b6 100644
---
a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/WebSocketTestClient.java
+++
b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/WebSocketTestClient.java
@@ -30,10 +30,10 @@ import java.util.concurrent.TimeUnit;
import java.util.logging.Logger;
import com.ning.http.client.AsyncHttpClient;
-import com.ning.http.client.websocket.WebSocket;
-import com.ning.http.client.websocket.WebSocketByteListener;
-import com.ning.http.client.websocket.WebSocketTextListener;
-import com.ning.http.client.websocket.WebSocketUpgradeHandler;
+import com.ning.http.client.ws.WebSocket;
+import com.ning.http.client.ws.WebSocketByteListener;
+import com.ning.http.client.ws.WebSocketTextListener;
+import com.ning.http.client.ws.WebSocketUpgradeHandler;
import org.apache.cxf.common.logging.LogUtils;
@@ -70,7 +70,7 @@ class WebSocketTestClient {
}
public void sendTextMessage(String message) {
- websocket.sendTextMessage(message);
+ websocket.sendMessage(message);
}
public void sendMessage(byte[] message) {
diff --git a/parent/pom.xml b/parent/pom.xml
index ae76c24..69cbc1d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -74,7 +74,7 @@
<cxf.artemis.version>2.4.0</cxf.artemis.version>
<cxf.ahc.version>1.9.40</cxf.ahc.version>
<cxf.apacheds.version>2.0.0.AM25</cxf.apacheds.version>
- <cxf.atmosphere.version>2.4.23</cxf.atmosphere.version>
+ <cxf.atmosphere.version>2.5.2</cxf.atmosphere.version>
<cxf.atmosphere.version.range>[2.4,3.0)</cxf.atmosphere.version.range>
<cxf.bcprov.version>1.60</cxf.bcprov.version>
<cxf.cglib.bundle.version>2.2_2</cxf.cglib.bundle.version>
