You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2022/02/08 14:56:13 UTC
[cxf] branch 3.4.x-fixes updated (ecf9107 -> 1f768b0)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from ecf9107 Recording .gitmergeinfo Changes
new 39e1d08 Update Jetty to 9.4.45.v20220203 (#901)
new 85ab0e0 Update Swagger to 1.6.5 (#902)
new 1f768b0 Recording .gitmergeinfo Changes
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 3 +++
distribution/src/main/release/samples/pom.xml | 2 +-
osgi/karaf/features/src/main/resources/features.xml | 1 +
parent/pom.xml | 7 ++++---
4 files changed, 9 insertions(+), 4 deletions(-)
[cxf] 02/03: Update Swagger to 1.6.5 (#902)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 85ab0e0a6b6cc18e3ab084a39c03e7d733d364d5
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Feb 7 20:52:27 2022 -0500
Update Swagger to 1.6.5 (#902)
(cherry picked from commit cae91a55b2968901be1c4c800318b85d1d781892)
(cherry picked from commit bc03476635143bc867908996e6cf572b9340d786)
# Conflicts:
# parent/pom.xml
---
osgi/karaf/features/src/main/resources/features.xml | 1 +
parent/pom.xml | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml
index 5df31e8..1313d46 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -324,6 +324,7 @@
<bundle start-level="35" dependency="true">mvn:org.apache.commons/commons-lang3/${cxf.commons-lang3.version}</bundle>
<bundle start-level="30" dependency="true">mvn:org.javassist/javassist/${cxf.javassist.version}</bundle>
<bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/${cxf.reflections.bundle.version}</bundle>
+ <bundle start-level="25" dependency="true">mvn:com.google.guava/failureaccess/${cxf.swagger2.guava.failureaccess.version}</bundle>
<bundle start-level="25" dependency="true">mvn:com.google.guava/guava/${cxf.swagger2.guava.version}</bundle>
<bundle start-level="35" dependency="true">mvn:io.swagger/swagger-annotations/${cxf.swagger2.version}</bundle>
<bundle start-level="35" dependency="true">mvn:io.swagger/swagger-models/${cxf.swagger2.version}</bundle>
diff --git a/parent/pom.xml b/parent/pom.xml
index fcc3c88..4da3adf 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -212,8 +212,9 @@
<cxf.stax-ex.version>1.8.3</cxf.stax-ex.version>
<cxf.swagger.ui.version>4.1.2</cxf.swagger.ui.version>
<cxf.swagger.v3.version>2.1.6</cxf.swagger.v3.version>
- <cxf.swagger2.version>1.6.3</cxf.swagger2.version>
- <cxf.swagger2.guava.version>27.0-jre</cxf.swagger2.guava.version>
+ <cxf.swagger2.version>1.6.5</cxf.swagger2.version>
+ <cxf.swagger2.guava.version>31.0.1-jre</cxf.swagger2.guava.version>
+ <cxf.swagger2.guava.failureaccess.version>1.0.1</cxf.swagger2.guava.failureaccess.version>
<cxf.tika.version>1.28</cxf.tika.version>
<cxf.tomcat.version>9.0.58</cxf.tomcat.version>
<cxf.tomitribe.http.signature.version>1.7</cxf.tomitribe.http.signature.version>
[cxf] 03/03: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 1f768b0f19195591a85e7d76db71bce4f4ba2918
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Feb 8 09:46:16 2022 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 99f65d7..9d15c66 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -169,6 +169,7 @@ M 4383e210c0562a98c2d1f3c13d09e14889154e95
M 4554f4b10b1d4232d5582c1038ca33da82e8d48d
M 4576030871f0f52e7295ce7d41888d8b976c7c11
M 4680528c0f9379ee51a0758ab52ad2e6de2cb0a6
+M 469f06b67b716b30bb5f115639644d1284dbe4b1
M 4852a50d335817c50882f641197fd189207571eb
M 4992b309f274750c0074d544b491e46402dd928b
M 4b714edc4805395974da2ff9c683b61ec9b23db9
@@ -182,6 +183,7 @@ M 50bef0418d228a071a14ee117638d89827d58444
M 512e984140bb47cd8a0afe199cccb8832888e701
M 531a1871253cfb1adbf4def72d055b9f1efed646
M 5409cc649fa5542e0f68af24546ab05a4e38a50c
+M 541ec1e3bd63890a64831d2470f972bf0ed4811d
M 54c6601328dc47713ae8bcb3149d4ae7e2f8efb2
M 56e2ebb60cf8b581da41fbb22b57266ef5574344
M 59ef61b0288e1e9b05f0bdc3e78f8b55eb76ad88
@@ -267,6 +269,7 @@ M b72f0ce5426eb342145611ee5529c7df172d71c7
M b8a2f139f8a4f80a90ef49c2a0757395cb303be6
M b909e6dd478272d2c3e094922801a201ef94eeb5
M bb73cfaaebea3c74025c51da7b6478b91122a245
+M bc03476635143bc867908996e6cf572b9340d786
M bd0cbb621f42899f64d4d769376c1c9218c9e3d4
M bfc509c206d67124d3f0ae46cea6963cabb8f3ca
M c02e932e97b8580eaa80e7152f633741bc49334f
[cxf] 01/03: Update Jetty to 9.4.45.v20220203 (#901)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 39e1d08afb73b57ea36157200c667f78034b65fd
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Feb 7 19:05:43 2022 -0500
Update Jetty to 9.4.45.v20220203 (#901)
(cherry picked from commit b1d519a47641dee041303ac9d68b09e2acb4ffaf)
(cherry picked from commit 469f06b67b716b30bb5f115639644d1284dbe4b1)
# Conflicts:
# distribution/src/main/release/samples/pom.xml
---
distribution/src/main/release/samples/pom.xml | 2 +-
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 9ad57a5..120b296 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -32,7 +32,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.boot.version>2.3.9.RELEASE</spring.boot.version>
<spring.cloud.eureka.version>2.2.3.RELEASE</spring.cloud.eureka.version>
- <cxf.jetty9.version>9.4.44.v20210927</cxf.jetty9.version>
+ <cxf.jetty9.version>9.4.45.v20220203</cxf.jetty9.version>
<cxf.netty.version>4.1.73.Final</cxf.netty.version>
<cxf.httpcomponents.client.version>4.5.13</cxf.httpcomponents.client.version>
<cxf.swagger.ui.version>4.1.2</cxf.swagger.ui.version>
diff --git a/parent/pom.xml b/parent/pom.xml
index bb658ea..fcc3c88 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -155,7 +155,7 @@
<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.44.v20210927</cxf.jetty9.version>
+ <cxf.jetty9.version>9.4.45.v20220203</cxf.jetty9.version>
<cxf.jetty.version>${cxf.jetty9.version}</cxf.jetty.version>
<cxf.jexl.version>3.1</cxf.jexl.version>
<cxf.joda.time.version>2.10.10</cxf.joda.time.version>