[cxf] branch master updated: cxf-rt-rs-extension-search: update dependency exclusion for tika

[buhhunyx]

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

buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/master by this push:
     new ca5d02b  cxf-rt-rs-extension-search: update dependency exclusion for 
tika
ca5d02b is described below

commit ca5d02bf9581a28971c8b8d021732972dce5377e
Author: Alexey Markevich <buhhu...@gmail.com>
AuthorDate: Mon Mar 29 22:50:37 2021 +0300

    cxf-rt-rs-extension-search: update dependency exclusion for tika
---
 rt/rs/extensions/search/pom.xml | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/rt/rs/extensions/search/pom.xml b/rt/rs/extensions/search/pom.xml
index d487ed1..40df271 100644
--- a/rt/rs/extensions/search/pom.xml
+++ b/rt/rs/extensions/search/pom.xml
@@ -84,6 +84,16 @@
             <groupId>org.apache.tika</groupId>
             <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>
@@ -92,15 +102,15 @@
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.poi</groupId>
-                    <artifactId>poi-ooxml</artifactId>                
+                    <artifactId>poi-ooxml</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>javax.xml.bind</groupId>
                     <artifactId>jaxb-api</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <artifactId>jaxb-core</artifactId>
+                    <groupId>javax.activation</groupId>
+                    <artifactId>javax.activation-api</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>javax.annotation</groupId>