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 2019/10/18 12:20:53 UTC
[cxf] 01/03: Update Jetty
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 0b4a3b604966a5bfcc5ac29b0a02f9344605e668
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Tue Sep 24 17:26:36 2019 +0300
Update Jetty
(cherry picked from commit 3b119ca6630f1384b93cd718d0cd95ccabc81e91)
# Conflicts:
# parent/pom.xml
(cherry picked from commit c65191eb601316c5f9693df193c4c27808f46ac5)
# Conflicts:
# parent/pom.xml
---
parent/pom.xml | 2 +-
systests/rs-sse/rs-sse-tomcat/pom.xml | 6 ------
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 080b539..e9989a4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -126,7 +126,7 @@
<cxf.joda.time.version>2.9.4</cxf.joda.time.version>
<cxf.jdom.version>1.0</cxf.jdom.version>
<cxf.jettison.version>1.4.0</cxf.jettison.version>
- <cxf.jetty9.version>9.4.18.v20190429</cxf.jetty9.version>
+ <cxf.jetty9.version>9.4.20.v20190813</cxf.jetty9.version>
<cxf.jetty.version>${cxf.jetty9.version}</cxf.jetty.version>
<cxf.jetty.osgi.version>[9.2,10)</cxf.jetty.osgi.version>
<cxf.undertow.version>1.4.27.Final</cxf.undertow.version>
diff --git a/systests/rs-sse/rs-sse-tomcat/pom.xml b/systests/rs-sse/rs-sse-tomcat/pom.xml
index 205a64f..fa39a96 100644
--- a/systests/rs-sse/rs-sse-tomcat/pom.xml
+++ b/systests/rs-sse/rs-sse-tomcat/pom.xml
@@ -57,11 +57,5 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-server</artifactId>
- <version>${cxf.jetty.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>