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 59390b0  TIKA-3244: revert, didn't work on jdk11 / jdk14
59390b0 is described below

commit 59390b0253117e5009aec2533860432e87ff814b
Author: THausherr <[email protected]>
AuthorDate: Thu Dec 10 15:24:09 2020 +0100

    TIKA-3244: revert, didn't work on jdk11 / jdk14
---
 tika-bundles/tika-bundle-classic/pom.xml | 8 +++++++-
 tika-parent/pom.xml                      | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/tika-bundles/tika-bundle-classic/pom.xml 
b/tika-bundles/tika-bundle-classic/pom.xml
index f69543f..dda2f13 100644
--- a/tika-bundles/tika-bundle-classic/pom.xml
+++ b/tika-bundles/tika-bundle-classic/pom.xml
@@ -143,9 +143,14 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>com.sun.activation</groupId>
+      <artifactId>javax.activation</artifactId>
+      <version>1.2.0</version>
+    </dependency>
+    <dependency>
       <groupId>com.sun.istack</groupId>
       <artifactId>istack-commons-runtime</artifactId>
-      <version>4.0.0</version>
+      <version>3.0.11</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -180,6 +185,7 @@
               org.apache.tika.parser.internal.Activator
             </Bundle-Activator>
             
<Embed-Dependency>*;scope=compile;artifactId=tika-parsers-classic-package|
+              javax.activation|
               xerces|
               xercesImpl|
               commons-compress|
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 95137b8..290a399 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -307,7 +307,7 @@
     <javax.annotation.version>1.3.2</javax.annotation.version>
     <javax.jcr.version>2.0</javax.jcr.version>
     <javax.rest.version>2.1.1</javax.rest.version>
-    <jaxb.version>3.0.0</jaxb.version>
+    <jaxb.version>2.3.3</jaxb.version>
     <jbig2.version>3.0.3</jbig2.version>
     <jdom2.version>2.0.6</jdom2.version>
     <jempbox.version>1.8.16</jempbox.version>

Reply via email to