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 2020/03/18 17:49:19 UTC

[cxf] branch 3.3.x-fixes updated (adcc3a1 -> f820e8e)

This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a change to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.


    from adcc3a1  Recording .gitmergeinfo Changes
     new d13c658  Updating Tika to 1.24 in the samples
     new f820e8e  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 +-
 2 files changed, 3 insertions(+), 1 deletion(-)


[cxf] 01/02: Updating Tika to 1.24 in the samples

Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit d13c65872b9c98ec428d018717d72907d6918b03
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Mar 18 17:41:25 2020 +0000

    Updating Tika to 1.24 in the samples
    
    (cherry picked from commit 3026d63ae2e770bc1e18986224a485b34a7968c0)
---
 distribution/src/main/release/samples/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 09a43d9..f281d34 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.26.v20200117</cxf.jetty9.version>
         <cxf.httpcomponents.client.version>4.5.8</cxf.httpcomponents.client.version>
         <cxf.swagger.ui.version>3.24.3</cxf.swagger.ui.version>
-        <cxf.tika.version>1.23</cxf.tika.version>
+        <cxf.tika.version>1.24</cxf.tika.version>
     </properties>
     <dependencies>
         <dependency>


[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.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit f820e8e4459613f35e6695c0439b38ee481b1c90
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Mar 18 17:49:07 2020 +0000

    Recording .gitmergeinfo Changes
---
 .gitmergeinfo | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitmergeinfo b/.gitmergeinfo
index a060bfa..d38101f 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -5,8 +5,10 @@ B 07a8053b1ff92a1d8c59f51098b691c65d23eed3
 B 08164e1f0e07c222ae45d320973401833df6ab9c
 B 0b1c413071a7c4c933667d6ab21e2bb51252163c
 B 0b7580839ddcd7879aa3f14576ea959a1aa872bc
+B 0bd7ffeb9e599718ff1279f1b86df7c1e13a8ca4
 B 0c7ab097483a2a30844cae32e6532f1028afc17e
 B 0c81f1b0de1ca78933c145479dfefa81c98dbd09
+B 0de9dcab4516addb4c3a6b575c0293cc307a19cb
 B 0deb502385473af355a96c20eea624a812addcd2
 B 0e8b0fac8fe12e56c30980cf08590b549af0c0d9
 B 10ef461c261a9242025b1369556f5368711435d7