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/12/05 21:11:00 UTC
[cxf] branch 3.5.x-fixes updated (92bea43627 -> c0f22672cc)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from 92bea43627 Recording .gitmergeinfo Changes
new 20a27b0a4c Update Apache Tika to 2.6.0
new c0f22672cc 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 Apache Tika to 2.6.0
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 20a27b0a4cf238e32a42f51a718c07bb653f19b1
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Dec 5 11:31:26 2022 -0500
Update Apache Tika to 2.6.0
(cherry picked from commit 1931627bce92559e1bc0cf585163b4c9c921fcf7)
# Conflicts:
# distribution/src/main/release/samples/pom.xml
# parent/pom.xml
(cherry picked from commit d4dd039adf8bc4d797c792b18b24b19d0c28a60d)
---
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 9f8cd73b4b..e88ac36edf 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -36,7 +36,7 @@
<cxf.netty.version>4.1.85.Final</cxf.netty.version>
<cxf.httpcomponents.client.version>4.5.13</cxf.httpcomponents.client.version>
<cxf.swagger.ui.version>4.15.5</cxf.swagger.ui.version>
- <cxf.tika.version>2.5.0</cxf.tika.version>
+ <cxf.tika.version>2.6.0</cxf.tika.version>
<cxf.tomcat.version>9.0.67</cxf.tomcat.version>
<graalvm.version>21.1.0</graalvm.version>
</properties>
diff --git a/parent/pom.xml b/parent/pom.xml
index 79a359676c..d082923c89 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -212,7 +212,7 @@
<cxf.swagger2.version>1.6.8</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>2.5.0</cxf.tika.version>
+ <cxf.tika.version>2.6.0</cxf.tika.version>
<cxf.tomcat.version>9.0.67</cxf.tomcat.version>
<cxf.tomitribe.http.signature.version>1.8</cxf.tomitribe.http.signature.version>
<cxf.undertow.osgi.version>[1.4,3.0)</cxf.undertow.osgi.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.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit c0f22672cc7af9fc5866279c8d76299997d0ff72
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Dec 5 13:45:57 2022 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 5d790c1963..1400fa4025 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -65,6 +65,7 @@ B b176e8e4a5a6bb6097c4e399ee0fa843f81e4b32
B b30f428e74d86a182e8101b0de555cfa2f57d826
B b740e0a7f606d9e5acb8c27dfb3a671708bb19db
B b837cc4613590e6b2a3cec9a74b4b3c958359a78
+B b9214b2ffe3233abf7774332ec689e797e66e4ec
B ba839e6b1f3ee5c26fd600834ea10227dd4cc317
B c0d5bad32938019dea92f99be0773abd39ad7288
B c122fbdd9e1923cdb4daaef16f2e0fd65e2498b6
@@ -173,6 +174,7 @@ M c9b0768cafe58d756dc9d38d1cf703fbd7f21c04
M ca7b6d8daff836949e95f41ef825155d66e512e2
M cbb59bbd3e9e4ae0259b43465fbff8b5c45991c0
M d21fa935e85a93a64545a20d3c814e6b1afdc1b6
+M d4dd039adf8bc4d797c792b18b24b19d0c28a60d
M d4f4b7712b3c8c5c684fa4fa0a28758d9a27cef3
M d849512da6499d00e3e84eb60733a0343a473b44
M d86920ce70dfe74836f18180dc5d47c8437f0250