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/11/19 22:27:16 UTC
[tika] branch branch_1x updated: TIKA-3231 -- fix broken build
after upgrade of maven-bundle-plugin
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch branch_1x
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/branch_1x by this push:
new 38ca119 TIKA-3231 -- fix broken build after upgrade of maven-bundle-plugin
38ca119 is described below
commit 38ca11929c72f5f6b00573246b276ed6225a91f8
Author: tallison <ta...@apache.org>
AuthorDate: Thu Nov 19 17:26:55 2020 -0500
TIKA-3231 -- fix broken build after upgrade of maven-bundle-plugin
---
tika-bundle/pom.xml | 14 ++++++++++++++
.../src/test/java/org/apache/tika/bundle/BundleIT.java | 5 +++--
tika-core/pom.xml | 6 +++++-
tika-parent/pom.xml | 2 +-
4 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/tika-bundle/pom.xml b/tika-bundle/pom.xml
index b0a79da..6e64fb2 100644
--- a/tika-bundle/pom.xml
+++ b/tika-bundle/pom.xml
@@ -68,6 +68,12 @@
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId>
<version>${pax.exam.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.ops4j.base</groupId>
+ <artifactId>ops4j-base-store</artifactId>
+ </exclusion>
+ </exclusions>
<scope>test</scope>
</dependency>
<dependency>
@@ -128,6 +134,12 @@
<version>${osgi.core.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.cm</artifactId>
+ <version>1.6.0</version>
+ <scope>test</scope>
+ </dependency>
<!-- use non-log4j slf4j backend to prevent main classloader from loading log4j classes -->
<dependency>
@@ -359,6 +371,7 @@
org.apache.tools.ant;resolution:=optional,
org.apache.tools.ant.taskdefs;resolution:=optional,
org.apache.tools.ant.types;resolution:=optional,
+ org.apache.xerces.impl;resolution:=optional,
org.apache.xerces.parsers;resolution:=optional,
org.apache.xerces.util;resolution:=optional,
org.apache.xerces.xni;resolution:=optional,
@@ -414,6 +427,7 @@
org.xmlpull.v1;resolution:=optional,
com.microsoft.schemas.office.powerpoint;resolution:=optional,
com.microsoft.schemas.office.word;resolution:=optional,
+ sun.java2d.cmm.kcms;resolution:=optional,
sun.misc;resolution:=optional,
ucar.units;resolution:=optional,
ucar.httpservices;resolution:=optional,
diff --git a/tika-bundle/src/test/java/org/apache/tika/bundle/BundleIT.java b/tika-bundle/src/test/java/org/apache/tika/bundle/BundleIT.java
index af7cc50..6fd1b09 100644
--- a/tika-bundle/src/test/java/org/apache/tika/bundle/BundleIT.java
+++ b/tika-bundle/src/test/java/org/apache/tika/bundle/BundleIT.java
@@ -94,8 +94,9 @@ public class BundleIT {
return options(
systemPackages("javax.xml.bind"),
bundle(new File(base, "tika-core.jar").toURI().toURL().toString()),
- mavenBundle("org.ops4j.pax.logging", "pax-logging-api", "1.8.5"),
- mavenBundle("org.ops4j.pax.logging", "pax-logging-service", "1.8.5"),
+ //versions > 1.9.1 cause the forkparser test to fail ¯\_(ツ)_/¯
+ mavenBundle("org.ops4j.pax.logging", "pax-logging-api", "1.9.1"),
+ mavenBundle("org.ops4j.pax.logging", "pax-logging-service", "1.9.1"),
junitBundles(),
bundle(new File(base, "tika-bundle.jar").toURI().toURL().toString())
);
diff --git a/tika-core/pom.xml b/tika-core/pom.xml
index 339cbf7..2d57fef 100644
--- a/tika-core/pom.xml
+++ b/tika-core/pom.xml
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>4.0.0</version>
+ <version>5.0.0</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
@@ -78,6 +78,10 @@
org.apache.tika.config.TikaActivator
</Bundle-Activator>
<Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
+ <!-- modern versions of the bundle plugin figure out that we
+ test for a class in org.apache.xerces.util even though
+ we don't include it in core -->
+ <Import-Package>!org.apache.xerces.util,!sun.misc,*</Import-Package>
</instructions>
</configuration>
</plugin>
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 7e2e0b0..36a0ca7 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -326,7 +326,7 @@
<groovy.maven.version>2.1</groovy.maven.version>
<maven.antrun.version>1.8</maven.antrun.version>
<maven.assembly.version>3.1.0</maven.assembly.version>
- <maven.bundle.version>4.1.0</maven.bundle.version>
+ <maven.bundle.version>5.1.1</maven.bundle.version>
<maven.failsafe.version>2.22.1</maven.failsafe.version>
<maven.javadoc.version>3.1.1</maven.javadoc.version>
<maven.scr.version>1.26.0</maven.scr.version>