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/10/05 19:11:27 UTC
[cxf] branch 3.6.x-fixes updated (9d4a768e56 -> cedaa7ee33)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from 9d4a768e56 Updating to Tika 2.5.0
new 410728df7c Update Swagger UI to 4.14.2
new cedaa7ee33 Recording .gitmergeinfo Changes
The 2 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 | 2 ++
distribution/src/main/release/samples/pom.xml | 2 +-
parent/pom.xml | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
[cxf] 01/02: Update Swagger UI to 4.14.2
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 410728df7c306a759afb74e51c609ccac86920b5
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Oct 5 15:09:13 2022 -0400
Update Swagger UI to 4.14.2
(cherry picked from commit 0007353d751a67c94489a9f4649b00879b3db674)
# 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 673c9c442f..62690c34b6 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -35,7 +35,7 @@
<cxf.jetty9.version>9.4.49.v20220914</cxf.jetty9.version>
<cxf.netty.version>4.1.82.Final</cxf.netty.version>
<cxf.httpcomponents.client.version>4.5.13</cxf.httpcomponents.client.version>
- <cxf.swagger.ui.version>4.11.1</cxf.swagger.ui.version>
+ <cxf.swagger.ui.version>4.14.2</cxf.swagger.ui.version>
<cxf.tika.version>2.5.0</cxf.tika.version>
<cxf.tomcat.version>9.0.67</cxf.tomcat.version>
<graalvm.version>21.1.0</graalvm.version>
diff --git a/parent/pom.xml b/parent/pom.xml
index 81fd26ce72..bfd7918c46 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -206,7 +206,7 @@
<cxf.spring.security.version>5.7.3</cxf.spring.security.version>
<cxf.spring.version>5.3.23</cxf.spring.version>
<cxf.stax-ex.version>1.8.3</cxf.stax-ex.version>
- <cxf.swagger.ui.version>4.14.0</cxf.swagger.ui.version>
+ <cxf.swagger.ui.version>4.14.2</cxf.swagger.ui.version>
<cxf.swagger.v3.version>2.2.3</cxf.swagger.v3.version>
<cxf.swagger2.version>1.6.7</cxf.swagger2.version>
<cxf.swagger2.guava.version>31.0.1-jre</cxf.swagger2.guava.version>
[cxf] 02/02: 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.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit cedaa7ee3302717bd9ca44b2996655c437d7a67c
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Oct 5 15:11:14 2022 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 5dc5ba081a..7239ff9f44 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -31,6 +31,7 @@ B cfe9f430ee617552eb743140cb78cc5df4c4eb83
B d77fd3ac9eb11bd69e5d534dffe53296e4c00ae8
B e476d83ee9ca5c01d6098a14bd4d5d9bc847eca7
B ff995172b7a80ea31c9e944011dce331dc138a29
+M 0007353d751a67c94489a9f4649b00879b3db674
M 065778af4c03fba406f4529ffaabcad88b2b7a01
M 079d7ecbdaa87dcb6dbcff530595f128fe6e7519
M 07a3a8a8b8fb11b05d074cb270d0289602f24f28
@@ -46,6 +47,7 @@ M 1e4658323353b57ab3b7f07bc0ac1951256b8ac7
M 1ecc24d817d4ef0cba4a4079a1c69abf33d1ad9b
M 227e81b07f547106af5e76af7e526fc6c3c8ffc2
M 278431e8adc631b7089f979d455fc54a721c7ab0
+M 27f756d64a3267c0865d6498824bd9c32b959391
M 2ad9d0b2eef17c0d57d3cb96f3b2cecd1e704869
M 2afed183de17550a2a57d266ca4ad666ed1edbf0
M 2c0b7979141a9536b178bf81106709182856d30a