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 2021/12/11 14:42:17 UTC
[tika] branch TIKA-3164-v2 created (now 4933fc4)
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a change to branch TIKA-3164-v2
in repository https://gitbox.apache.org/repos/asf/tika.git.
at 4933fc4 TIKA-3164, take two -- still broken in the bundle
This branch includes the following new commits:
new 4933fc4 TIKA-3164, take two -- still broken in the bundle
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[tika] 01/01: TIKA-3164, take two -- still broken in the bundle
Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch TIKA-3164-v2
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 4933fc4750ef200b19a2839fc1249ecdd23ec67f
Author: tallison <ta...@apache.org>
AuthorDate: Sat Dec 11 09:42:03 2021 -0500
TIKA-3164, take two -- still broken in the bundle
---
tika-bundles/tika-bundle-standard/pom.xml | 1 -
.../src/test/java/org/apache/tika/bundle/BundleIT.java | 2 ++
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/tika-bundles/tika-bundle-standard/pom.xml b/tika-bundles/tika-bundle-standard/pom.xml
index 933fe65..2424387 100644
--- a/tika-bundles/tika-bundle-standard/pom.xml
+++ b/tika-bundles/tika-bundle-standard/pom.xml
@@ -221,7 +221,6 @@
!org.junit.*,
!junit.*,
org.apache.tika.fork,
- org.apache.logging.log4j,
android.util;resolution:=optional,
com.apple.eawt;resolution:=optional,
com.github.luben.zstd;resolution:=optional,
diff --git a/tika-bundles/tika-bundle-standard/src/test/java/org/apache/tika/bundle/BundleIT.java b/tika-bundles/tika-bundle-standard/src/test/java/org/apache/tika/bundle/BundleIT.java
index 1635476..2951000 100644
--- a/tika-bundles/tika-bundle-standard/src/test/java/org/apache/tika/bundle/BundleIT.java
+++ b/tika-bundles/tika-bundle-standard/src/test/java/org/apache/tika/bundle/BundleIT.java
@@ -100,6 +100,8 @@ public class BundleIT {
//I couldn't find a way to get the build of bundle to work via imports
//for this one
mavenBundle("commons-io", "commons-io", "2.8.0"),
+ mavenBundle("org.apache.logging.log4j", "log4j-core", "2.15.0"),
+ mavenBundle("org.apache.logging.log4j", "log4j-api", "2.15.0"),
mavenBundle("org.ops4j.pax.logging", "pax-logging-api", "1.8.5"),
mavenBundle("org.ops4j.pax.logging", "pax-logging-service", "1.8.5"),
junitBundles(),