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/09/30 09:22:46 UTC
[cxf] 01/01: Initial Tika 2.x port
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch tika2
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 51caf1684abb3155a8a8d2f43c6a3656e5684a92
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Sep 30 10:22:19 2021 +0100
Initial Tika 2.x port
---
parent/pom.xml | 13 +------------
rt/rs/extensions/search/pom.xml | 3 ++-
systests/jaxrs/pom.xml | 24 +++++++++++++++++++++++-
3 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 39b487f..515179b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -205,7 +205,7 @@
<cxf.swagger.v3.version>2.1.11</cxf.swagger.v3.version>
<cxf.swagger2.version>1.6.3</cxf.swagger2.version>
<cxf.swagger2.guava.version>27.0-jre</cxf.swagger2.guava.version>
- <cxf.tika.version>1.27</cxf.tika.version>
+ <cxf.tika.version>2.1.0</cxf.tika.version>
<cxf.tomcat.version>9.0.53</cxf.tomcat.version>
<cxf.tomitribe.http.signature.version>1.7</cxf.tomitribe.http.signature.version>
<cxf.undertow.osgi.version>[1.4,3.0)</cxf.undertow.osgi.version>
@@ -1881,17 +1881,6 @@
<version>${cxf.tika.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-parsers</artifactId>
- <version>${cxf.tika.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-jexl3</artifactId>
<version>${cxf.jexl.version}</version>
diff --git a/rt/rs/extensions/search/pom.xml b/rt/rs/extensions/search/pom.xml
index 40df271..2660d20 100644
--- a/rt/rs/extensions/search/pom.xml
+++ b/rt/rs/extensions/search/pom.xml
@@ -97,7 +97,8 @@
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
- <artifactId>tika-parsers</artifactId>
+ <artifactId>tika-parsers-standard-package</artifactId>
+ <version>${cxf.tika.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml
index 45ded74..8772739 100644
--- a/systests/jaxrs/pom.xml
+++ b/systests/jaxrs/pom.xml
@@ -462,6 +462,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ <scope>test</scope>
+ <version>${cxf.httpcomponents.client.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.asynchttpclient</groupId>
<artifactId>async-http-client</artifactId>
<scope>test</scope>
@@ -480,8 +486,24 @@
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
- <artifactId>tika-parsers</artifactId>
+ <artifactId>tika-core</artifactId>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers-standard-package</artifactId>
<scope>test</scope>
+ <version>${cxf.tika.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.poi</groupId>