You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2020/11/03 16:48:48 UTC
[cxf] 12/16: Update to latest jetty
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 50c407bcb7a06c8834f6692f6a8db95031189017
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Tue Nov 3 09:36:43 2020 -0500
Update to latest jetty
(cherry picked from commit f355b9b3ec8b6f77198baefa051bd817807e5a94)
# Conflicts:
# distribution/src/main/release/samples/pom.xml
# parent/pom.xml
---
distribution/src/main/release/samples/pom.xml | 8 ++++++++
parent/pom.xml | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 2f97376..4b60ea3 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -30,11 +30,19 @@
<!-- don't deploy the samples, kind of pointless -->
<maven.deploy.skip>true</maven.deploy.skip>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+<<<<<<< HEAD
<spring.boot.version>2.1.18.RELEASE</spring.boot.version>
<spring.cloud.eureka.version>2.0.2.RELEASE</spring.cloud.eureka.version>
<cxf.jetty9.version>9.4.31.v20200723</cxf.jetty9.version>
<cxf.httpcomponents.client.version>4.5.12</cxf.httpcomponents.client.version>
<cxf.swagger.ui.version>3.24.3</cxf.swagger.ui.version>
+=======
+ <spring.boot.version>2.3.5.RELEASE</spring.boot.version>
+ <spring.cloud.eureka.version>2.2.3.RELEASE</spring.cloud.eureka.version>
+ <cxf.jetty9.version>9.4.33.v20201020</cxf.jetty9.version>
+ <cxf.httpcomponents.client.version>4.5.13</cxf.httpcomponents.client.version>
+ <cxf.swagger.ui.version>3.32.1</cxf.swagger.ui.version>
+>>>>>>> f355b9b3ec... Update to latest jetty
<cxf.tika.version>1.24.1</cxf.tika.version>
<cxf.tomcat.version>8.5.59</cxf.tomcat.version>
</properties>
diff --git a/parent/pom.xml b/parent/pom.xml
index 9d03e97..5147271 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -145,9 +145,9 @@
<cxf.jdom.version>1.0</cxf.jdom.version>
<cxf.jettison.version>1.4.1</cxf.jettison.version>
<cxf.jetty.osgi.version>[9.2,10)</cxf.jetty.osgi.version>
+ <cxf.jetty9.version>9.4.33.v20201020</cxf.jetty9.version>
<cxf.jetty.version>${cxf.jetty9.version}</cxf.jetty.version>
<cxf.jexl.version>2.1.1</cxf.jexl.version>
- <cxf.jetty9.version>9.4.32.v20200930</cxf.jetty9.version>
<cxf.joda.time.version>2.9.4</cxf.joda.time.version>
<cxf.johnzon.version>1.1.13</cxf.johnzon.version>
<cxf.json.api.version>1.1.4</cxf.json.api.version>