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 8bfc0bb40ab4bc4b72e092904c409031696773c2 Author: Alexey Markevich <[email protected]> AuthorDate: Tue Oct 29 11:37:42 2019 +0300 Update Jetty (cherry picked from commit 589e321622b72ae57fab910d76b3e4fb0c160979) # Conflicts: # parent/pom.xml (cherry picked from commit 5f6c4497f03cbd8a59d0732c9ea329891ef38f49) # Conflicts: # distribution/src/main/release/samples/pom.xml # parent/pom.xml --- .../src/main/release/samples/jax_rs/description_openapi_v3_web/pom.xml | 2 +- .../src/main/release/samples/jax_rs/description_swagger2_web/pom.xml | 2 +- distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml | 1 - distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml | 1 - distribution/src/main/release/samples/pom.xml | 1 + parent/pom.xml | 2 +- 6 files changed, 4 insertions(+), 5 deletions(-) diff --git a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/pom.xml b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/pom.xml index 04440e9..1eb7edd 100644 --- a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/pom.xml @@ -39,7 +39,7 @@ under the License. <plugin> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <version>9.4.6.v20170531</version> + <version>${cxf.jetty9.version}</version> <configuration> <webApp> <contextPath>/</contextPath> diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml index 48dbdd2..42210c7 100644 --- a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml @@ -39,7 +39,7 @@ under the License. <plugin> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <version>9.4.6.v20170531</version> + <version>${cxf.jetty9.version}</version> <configuration> <webApp> <contextPath>/</contextPath> diff --git a/distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml b/distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml index a9c002a..d455193 100644 --- a/distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml @@ -13,7 +13,6 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <cxf.jetty9.version>9.4.6.v20170531</cxf.jetty9.version> </properties> <dependencies> diff --git a/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml b/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml index 4a491dd..b6b50b4 100644 --- a/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml @@ -13,7 +13,6 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <cxf.jetty9.version>9.4.6.v20170531</cxf.jetty9.version> </properties> <dependencies> diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml index c10a460..6db5a14 100644 --- a/distribution/src/main/release/samples/pom.xml +++ b/distribution/src/main/release/samples/pom.xml @@ -32,6 +32,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <spring.boot.version>1.5.17.RELEASE</spring.boot.version> <spring.cloud.eureka.version>1.3.4.RELEASE</spring.cloud.eureka.version> + <cxf.jetty9.version>9.4.22.v20191022</cxf.jetty9.version> </properties> <dependencies> <dependency> diff --git a/parent/pom.xml b/parent/pom.xml index 8a31e86..8085ab0 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.21.v20190926</cxf.jetty9.version> + <cxf.jetty9.version>9.4.22.v20191022</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>
