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 3753735 CXF-7889: ensure all samples from CXF kit can work with JDK11
OOTB. Fixing jax_rs/websocket_web
3753735 is described below
commit 37537350f8c56635902b6566dc94bec19a4e19c3
Author: reta <[email protected]>
AuthorDate: Tue Nov 13 17:55:28 2018 -0500
CXF-7889: ensure all samples from CXF kit can work with JDK11 OOTB. Fixing
jax_rs/websocket_web
---
.../release/samples/jax_rs/websocket_web/pom.xml | 45 +++++++++++++++++++---
1 file changed, 39 insertions(+), 6 deletions(-)
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
index d78f7e8..2bb64d0 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
@@ -31,11 +31,8 @@
</parent>
<properties>
<cxf.version>${project.version}</cxf.version>
- <!-- TODO remove these local entries after making the referenced
dependency managed in parent/pom.xml -->
- <cxf.atmosphere.version>2.4.9</cxf.atmosphere.version>
- <cxf.jetty92.version>9.2.15.v20160210</cxf.jetty92.version>
- <cxf.jetty93.version>9.3.5.v20151012</cxf.jetty93.version>
- <cxf.jetty.version>${cxf.jetty93.version}</cxf.jetty.version>
+ <cxf.jetty.version>9.4.12.v20180830</cxf.jetty.version>
+ <cxf.tomcat.version>7.0.91</cxf.tomcat.version>
</properties>
<build>
<plugins>
@@ -74,6 +71,43 @@
</goals>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-core</artifactId>
+ <version>${cxf.tomcat.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-logging-juli</artifactId>
+ <version>${cxf.tomcat.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-jasper</artifactId>
+ <version>${cxf.tomcat.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jasper</artifactId>
+ <version>${cxf.tomcat.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jasper-el</artifactId>
+ <version>${cxf.tomcat.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jsp-api</artifactId>
+ <version>${cxf.tomcat.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-websocket</artifactId>
+ <version>${cxf.tomcat.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
@@ -116,7 +150,6 @@
<dependency>
<groupId>org.atmosphere</groupId>
<artifactId>atmosphere-runtime</artifactId>
- <version>${cxf.atmosphere.version}</version>
</dependency>
</dependencies>
</project>
