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 2019/01/02 16:02:55 UTC

[cxf] branch 3.2.x-fixes updated (28be3e6 -> b5f3f84)

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

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


    from 28be3e6  Recording .gitmergeinfo Changes
     new 935b084  Updating Tika
     new b5f3f84  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  | 6 ++++++
 parent/pom.xml | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)


[cxf] 01/02: Updating Tika

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

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

commit 935b084bf7fc4fa6155547c7a4d8875f9c71659a
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Jan 2 10:29:43 2019 +0000

    Updating Tika
    
    (cherry picked from commit 1cdf673a8ce2fc5c57318d1a102ca0923cb1d945)
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 433ed2f..4e3bfc44 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -221,7 +221,7 @@
         <cxf.dom4j.bundle.version>1.6.1_5</cxf.dom4j.bundle.version>
         <cxf.jdom.bundle.version>1.1_4</cxf.jdom.bundle.version>
         <cxf.olingo.version>2.0.10</cxf.olingo.version>
-        <cxf.tika.version>1.19.1</cxf.tika.version>
+        <cxf.tika.version>1.20</cxf.tika.version>
         <cxf.jexl.version>2.1.1</cxf.jexl.version>
         <cxf.htrace.version>4.2.0-incubating</cxf.htrace.version>
         <cxf.zest.version>2.1</cxf.zest.version>


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

commit b5f3f8495b493ada0d0ec13680bc18d853eddcd1
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Jan 2 15:50:49 2019 +0000

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index e80fe54..3d8691b 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -21,6 +21,7 @@ B 189e23aa82a2a05d60396a8cdd6c8faef5be41b5
 B 19f212a3f770250bcaae87bb52c19e6f5d02fa7a
 B 1cfdb42724549fdef21a9d50d62cd9dbdc5d8dd3
 B 1e35c3ac012c3acda3b82f225bada42c883e4098
+B 1e3f132d74bf032be991995a587b7d107424ff05
 B 1f431e2f8063793e84af56bc645484a9f0da58e7
 B 23bbcdbabf84348fc8a17c0f54fc039de32d35e7
 B 2566c8ff08e0b237d18c97bc919d32628eaa39ea
@@ -35,6 +36,7 @@ B 2c7d90e86e29000111b5551d21400f71f8383105
 B 2cb11b19660909971e7cd475bd358c6830773e58
 B 2cc3dab0e8423c7ac364480e3ec844b3f8792b52
 B 320a7f161a4c4eb7c6f2379a9a4238dbb7e2e66f
+B 33fc044f2c006de4724cbe9410330e0ab7bddd03
 B 34170252753466af095203b64442028a137a90a5
 B 35fd40f5b5e043f0044dce9286a9ce922bc30d2c
 B 37e9a9b3ed51cb9042fd288ab5f9b847e96bff1d
@@ -62,10 +64,12 @@ B 58e72337226f4e963abfc6f1a65625d86b7003b5
 B 58e9812a84a1a98d1f0699b59a86a147c847cb2f
 B 5960c04d98d4cbe5cb154dffd017d867412d31f7
 B 5a72b4170110d58fb6186fd7ce9f5339b9550f5e
+B 5d164a22c1934f6c499d12146c6ab9d59b13e6ee
 B 5d43800e5a3b8d65e97b8c5c3262e81c11070edb
 B 5ecf2214e4cfa0992da3ca74cd92128a3048b4f4
 B 5fdfd70af65f53b0bd73ecfc10906e28648ede94
 B 612b03ea00b8a9e747411dbfa9a4eb1c6ff4b529
+B 6228a705ec8e101667a786ecd039dd309f6ab474
 B 63f3a02afddd8e8e82aed4c18e24627b4c284a12
 B 64dd999db1c712cd54f003a76abe1d221a1e3295
 B 6756c49b7b8d949c09fa98cc9c5725b90ed5370b
@@ -82,6 +86,7 @@ B 7c7186c506e662ed0512dc47cdf58caa2ff2eafb
 B 7f17e03737171237c0b91f0af4d5adf5333fd68b
 B 7f5eae3a606c57eac5d01e102ea5d46fc2049eec
 B 7fd63e8d23cd1c3eec1ff1b6272321112dc1258c
+B 81cd495c14feb9c40dddd525385711ebe0df0fda
 B 841045fab49846ffd1332089b8b4d618d0454335
 B 84de75d9f72730b49481f577a1ea3d701670d3d8
 B 852b02eced57ed48e8f291ff1bae76137836047e
@@ -170,6 +175,7 @@ M 05b8db050b158d82aad57081a0dbb5e7c92cc3b1
 M 0b920d7275800e651b2c48c982b1977249516ddf
 M 0f6490cb4e63118dcf4deedd0345ed4b6a35b669
 M 1449f125586deaf6f5d87e282f0e1502eef4b6b4
+M 1cdf673a8ce2fc5c57318d1a102ca0923cb1d945
 M 37537350f8c56635902b6566dc94bec19a4e19c3
 M 3904a477e70fe6385777120bfe4820ff9a7713f3
 M 3aaaad57c6bf541825c6ccfe427de2bae2c246d9