You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2020/12/08 15:09:30 UTC
[tika] 01/02: TIKA-3178 -- do not bundle commons-io with tika-core
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 555706b80e2fa27737d5aa1668e778bb02321e33
Author: tallison <ta...@apache.org>
AuthorDate: Tue Dec 8 10:04:19 2020 -0500
TIKA-3178 -- do not bundle commons-io with tika-core
---
tika-bundles/tika-bundle-classic/pom.xml | 7 ++++++-
tika-core/pom.xml | 3 +--
tika-parsers/pom.xml | 6 +++---
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/tika-bundles/tika-bundle-classic/pom.xml b/tika-bundles/tika-bundle-classic/pom.xml
index ab31e2b..3fd80bd 100644
--- a/tika-bundles/tika-bundle-classic/pom.xml
+++ b/tika-bundles/tika-bundle-classic/pom.xml
@@ -180,7 +180,7 @@
org.apache.tika.parser.internal.Activator
</Bundle-Activator>
<Embed-Dependency>*;scope=compile;artifactId=tika-parsers-classic-package|
- xerces|
+ xercesImpl|
commons-compress|
xz|
commons-codec|
@@ -258,6 +258,7 @@
org.apache.tika.detect,
org.apache.tika.mime,
org.apache.tika.fork,
+ org.apache.commons.io,
android.util;resolution:=optional,
com.adobe.xmp;resolution:=optional,
com.adobe.xmp.impl;resolution:=optional,
@@ -318,6 +319,10 @@
org.apache.xerces.xni;resolution:=optional,
org.apache.xerces.xni.parser;resolution:=optional,
org.apache.xml.resolver;resolution:=optional,
+ org.apache.xml.resolver.readers;resolution:=optional,
+ org.w3c.dom.ranges;resolution:=optional,
+ org.w3c.dom.traversal;resolution:=optional,
+ sun.io;resolution:=optional,
org.apache.xml.resolver.tools;resolution:=optional,
org.apache.xml.security;resolution:=optional,
org.apache.xml.security.c14n;resolution:=optional,
diff --git a/tika-core/pom.xml b/tika-core/pom.xml
index 7903616..84acb72 100644
--- a/tika-core/pom.xml
+++ b/tika-core/pom.xml
@@ -100,8 +100,7 @@
org.apache.tika.config.TikaActivator
</Bundle-Activator>
<Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
- <Import-Package>!org.apache.xerces.util,!sun.misc,*</Import-Package>
- <Embed-Dependency>commons-io</Embed-Dependency>
+ <Import-Package>!sun.misc,org.apache.xerces.util;resolution:=optional,*</Import-Package>
<Export-Package>
org.apache.tika.*
</Export-Package>
diff --git a/tika-parsers/pom.xml b/tika-parsers/pom.xml
index 4c55a7f..d5d1e3d 100644
--- a/tika-parsers/pom.xml
+++ b/tika-parsers/pom.xml
@@ -35,10 +35,10 @@
<modules>
<!-- basic parsers - avoid network dependent parsers, native code -->
<module>tika-parsers-classic</module>
- <!-- allow network dependent parsers and native code -->
+ <!-- allow network dependent parsers and native code - - >
<module>tika-parsers-extended</module>
- <!-- potentially massive dependencies (e.g. dl4j) -->
- <module>tika-parsers-advanced</module>
+ < ! - - potentially massive dependencies (e.g. dl4j) - - >
+ <module>tika-parsers-advanced</module> -->
</modules>
</project>
\ No newline at end of file