(tika) branch main updated: TIKA-4166: update jaxb and prevent convergence problem

[ti...@apache.org]

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

tilman pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git


The following commit(s) were added to refs/heads/main by this push:
     new 0f077da2a TIKA-4166: update jaxb and prevent convergence problem
0f077da2a is described below

commit 0f077da2ac33d9fdd1320b339a097e9af51de983
Author: Tilman Hausherr <ti...@apache.org>
AuthorDate: Sat Mar 9 18:09:09 2024 +0100

    TIKA-4166: update jaxb and prevent convergence problem
---
 tika-parent/pom.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 7f66165de..e1c42d9fb 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -364,7 +364,7 @@
     <jakarta.xml.soap.version>3.0.1</jakarta.xml.soap.version>
     <javax.annotation.version>1.3.2</javax.annotation.version>
     <javax.jcr.version>2.0</javax.jcr.version>
-    <jaxb.runtime.version>4.0.4</jaxb.runtime.version>
+    <jaxb.runtime.version>4.0.5</jaxb.runtime.version>
     <jbig2.version>3.0.4</jbig2.version>
     <jcommander.version>1.82</jcommander.version>
     <jdom2.version>2.0.6.1</jdom2.version>
@@ -1013,6 +1013,12 @@
           <artifactId>stax2-api</artifactId>
           <version>4.2.2</version>
       </dependency>
+      <!-- because of convergence problems with jaxb 2.0.4, because cxf 4.0.3 uses an older version -->
+      <dependency>
+          <groupId>org.eclipse.angus</groupId>
+          <artifactId>angus-activation</artifactId>
+          <version>2.0.2</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>