You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2021/03/29 16:21:23 UTC
[cxf] branch 3.4.x-fixes updated (fa3f30d -> 7a38b31)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from fa3f30d Recording .gitmergeinfo Changes
new 1960547 Update Tika to 1.26
new 7a38b31 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] 02/02: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 7a38b3174a21e5e92d1781ae4f2e2fb8fb68270f
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Mar 29 17:21:12 2021 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index d42dff9..af3fc6f 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -16,6 +16,7 @@ B 4119762989d4976bfbe51e78a763304c83ecafa0
B 46366e20613d4b17628d0309c5caa8e3af715391
B 48e63678e194e9a92c8ee0a5b43a3a04a53d44f1
B 49169ac265c14a022fcdafded19b364e0f8b12d5
+B 4da29ea7d55227c652b930318666639adae0c77d
B 4f0cf0632192b9327562ff65ca95546c73311b50
B 4f932d881de23b88e6388d4b624eed119942031a
B 5915e900fdfe5f3b5622ba0d0772606d101680a6
@@ -70,6 +71,7 @@ M 62dee0b664bc1d0c1dfd1617895c731d7d079bb5
M 64e772e56271ed2dd588317646e1ef0796c77635
M 675006323cdc3d1f8c8fbe1f65c03f4884782401
M 6a77819f4bc141fcddd53a36b178972f1f68fe97
+M 700cf3929763d551d9fac6c570c2560039c6238c
M 70c7d6a1e3f23522609d58b72b61c52e3cbc919a
M 752a8a2dafff76ed8098cd73f1e071ffa0514754
M 7a05e4fb0b67a89b86ed6eee68b9416005d6f631
[cxf] 01/02: Update Tika to 1.26
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 1960547a50ff1911cae6701b906352f6bd9d9eed
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Mar 29 17:20:33 2021 +0100
Update Tika to 1.26
(cherry picked from commit 700cf3929763d551d9fac6c570c2560039c6238c)
---
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 8302409..d64dacc 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.39.v20210325</cxf.jetty9.version>
<cxf.httpcomponents.client.version>4.5.13</cxf.httpcomponents.client.version>
<cxf.swagger.ui.version>3.38.0</cxf.swagger.ui.version>
- <cxf.tika.version>1.25</cxf.tika.version>
+ <cxf.tika.version>1.26</cxf.tika.version>
<cxf.tomcat.version>9.0.44</cxf.tomcat.version>
</properties>
<dependencies>
diff --git a/parent/pom.xml b/parent/pom.xml
index 91fcf3c..ce17978 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -205,7 +205,7 @@
<cxf.swagger.v3.version>2.1.6</cxf.swagger.v3.version>
<cxf.swagger2.version>1.6.2</cxf.swagger2.version>
<cxf.swagger2.guava.version>27.0-jre</cxf.swagger2.guava.version>
- <cxf.tika.version>1.25</cxf.tika.version>
+ <cxf.tika.version>1.26</cxf.tika.version>
<cxf.tomcat.version>9.0.44</cxf.tomcat.version>
<cxf.tomitribe.http.signature.version>1.3</cxf.tomitribe.http.signature.version>
<cxf.undertow.osgi.version>[1.4,3.0)</cxf.undertow.osgi.version>