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/03 22:57:25 UTC
[tika] branch main updated (15d1c8f -> b8404b6)
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git.
from 15d1c8f Fix wrong dependency for tika-java7 module
add 2892ad5 TIKA-3178 -- WIP -- does not build. do not merge
add 1bda1ac TIKA-3178 -- passes all tests but one. See @Ignore message in BundleIT
new 074d135 Merge branch 'TIKA-3178' into main
new e3e6c87 TIKA-3178 -- add back tika-bundle...left in one todo to figure out how to load detector from tika-core via spi
new b8404b6 Merge remote-tracking branch 'origin/main' into main
The 3 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.
Summary of changes:
pom.xml | 2 +-
tika-bundle/pom.xml | 234 +++++----------------
.../test/java/org/apache/tika/bundle/BundleIT.java | 8 +-
tika-core/pom.xml | 5 +
tika-parsers/pom.xml | 22 +-
.../org/apache/tika/parser/internal/Activator.java | 54 +++++
.../tika-parsers-classic-package/pom.xml | 156 ++++++++++----
.../org/apache/tika/parser/internal/Activator.java | 54 +++++
8 files changed, 304 insertions(+), 231 deletions(-)
create mode 100644 tika-parsers/src/main/java/org/apache/tika/parser/internal/Activator.java
create mode 100644 tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/main/java/org/apache/tika/parser/internal/Activator.java
[tika] 02/03: TIKA-3178 -- add back tika-bundle...left in one todo
to figure out how to load detector from tika-core via spi
Posted by ta...@apache.org.
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 e3e6c87ba963e5bf9eba211c2795d6f743830def
Author: tallison <ta...@apache.org>
AuthorDate: Thu Dec 3 17:55:43 2020 -0500
TIKA-3178 -- add back tika-bundle...left in one todo to figure out how to load detector from tika-core via spi
---
tika-bundle/pom.xml | 237 +++++----------------
.../test/java/org/apache/tika/bundle/BundleIT.java | 7 +-
tika-core/pom.xml | 3 +-
tika-parsers/pom.xml | 4 +-
.../tika-parsers-classic-package/pom.xml | 156 ++++++++++----
.../org/apache/tika/parser/internal/Activator.java | 54 +++++
6 files changed, 223 insertions(+), 238 deletions(-)
diff --git a/tika-bundle/pom.xml b/tika-bundle/pom.xml
index ec49ff3..dc5d9cf 100644
--- a/tika-bundle/pom.xml
+++ b/tika-bundle/pom.xml
@@ -1,23 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
+ <!--
+ Licenseadsfd to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -54,14 +52,9 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>tika-parsers</artifactId>
+ <artifactId>tika-parsers-classic-package</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons.io.version}</version>
- </dependency>
<!-- Test dependencies -->
<dependency>
@@ -140,33 +133,33 @@
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
-
+
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <version>${jaxb.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.istack</groupId>
- <artifactId>istack-commons-runtime</artifactId>
- <version>3.0.11</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.fastinfoset</groupId>
- <artifactId>FastInfoset</artifactId>
- <version>1.2.16</version>
- <scope>test</scope>
- </dependency>
+ <groupId>com.sun.istack</groupId>
+ <artifactId>istack-commons-runtime</artifactId>
+ <version>3.0.11</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>txw2</artifactId>
- <version>${jaxb.version}</version>
- <scope>test</scope>
- </dependency>
-
-
+ <groupId>com.sun.xml.fastinfoset</groupId>
+ <artifactId>FastInfoset</artifactId>
+ <version>1.2.16</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>txw2</artifactId>
+ <version>${jaxb.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+
</dependencies>
<build>
@@ -184,13 +177,12 @@
<Bundle-Activator>
org.apache.tika.parser.internal.Activator
</Bundle-Activator>
- <Embed-Dependency>*;scope=compile;artifactId=tika-parsers|
+ <Embed-Dependency>*;scope=compile;artifactId=tika-parsers-classic-package|
commons-compress|
xz|
commons-codec|
commons-csv|
commons-io|
- org.apache.commons.io;version=2.8.0|
commons-exec|
commons-collections4|
dd-plist|
@@ -258,23 +250,14 @@
org.apache.tika.exception,
org.apache.tika.fork,
org.apache.tika.io,
- org.apache.tika.metadata.serialization.*,
+ org.apache.tika.metadata.serialization.*,
</Export-Package>
<Import-Package>
!org.junit,
!org.junit.*,
!junit.*,
- !org.apache.ctakes.*,
- !org.apache.uima.*,
- !org.apache.solr.client.solrj.*,
- !org.apache.solr.common.*,
- !org.apache.spark.api.java.*,
- !org.apache.spark.ml.*,
- !org.apache.spark.mllib.*,
- !org.apache.spark.sql.*,
- org.apache.tika.mime,
+ 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,
@@ -282,10 +265,7 @@
com.dd.plist;resolution:=optional,
com.adobe.xmp.properties;resolution:=optional,
com.github.luben.zstd;resolution:=optional,
- com.github.openjson;resolution:=optional,
com.github.jaiimageio.*;resolution:=optional,
- com.google.appengine.api.*;resolution:=optional,
- com.google.apphosting.api.*;resolution:=optional,
com.google.common.util.concurrent.internal;resolution:=optional,
com.google.errorprone.annotations;resolution:=optional,
com.google.errorprone.annotations.concurrent;resolution:=optional,
@@ -299,11 +279,6 @@
com.sun.msv.datatype;resolution:=optional,
com.sun.msv.datatype.xsd;resolution:=optional,
com.sun.tools.javadoc;resolution:=optional,
- edu.mit.ll.mitie;resolution:=optional,
- edu.stanford.nlp.*;resolution:=optional,
- edu.wisc.ssec.mcidas;resolution:=optional,
- edu.wisc.ssec.mcidas.adde;resolution:=optional,
- edu.usc.irds.agepredictor.spark.authorage;resolution:=optional,
javax.annotation;resolution:=optional,
javax.mail;resolution:=optional,
javax.mail.internet;resolution:=optional,
@@ -319,15 +294,6 @@
javax.xml.bind.attachment;resolution:=optional,
javax.xml.bind.helpers;resolution:=optional,
javax.xml.bind.util;resolution:=optional,
- net.sf.ehcache;resolution:=optional,
- nu.xom;resolution:=optional,
- opendap.dap.http;resolution:=optional,
- opendap.dap;resolution:=optional,
- opendap.dap.parser;resolution:=optional,
- opennlp.maxent;resolution:=optional,
- opennlp.tools.namefind;resolution:=optional,
- opennlp.tools.authorage;resolution:=optional,
- net.didion.jwnl;resolution:=optional,
net.sf.saxon;resolution:=optional,
net.sf.saxon.dom;resolution:=optional,
net.sf.saxon.om;resolution:=optional,
@@ -340,43 +306,10 @@
org.apache.batik.ext.awt.image.renderable;resolution:=optional,
org.apache.batik.gvt;resolution:=optional,
org.apache.batik.util;resolution:=optional,
- org.apache.cxf.jaxrs.client;resolution:=optional,
- org.apache.cxf.jaxrs.ext.multipart;resolution:=optional,
org.apache.commons.exec;resolution:=optional,
- org.apache.commons.httpclient;resolution:=optional,
- org.apache.commons.httpclient.auth;resolution:=optional,
- org.apache.commons.httpclient.methods;resolution:=optional,
- org.apache.commons.httpclient.params;resolution:=optional,
- org.apache.commons.httpclient.protocol;resolution:=optional,
- org.apache.commons.httpclient.util;resolution:=optional,
- org.apache.commons.vfs2;resolution:=optional,
- org.apache.commons.vfs2.provider;resolution:=optional,
- org.apache.commons.vfs2.util;resolution:=optional,
- org.apache.crimson.jaxp;resolution:=optional,
org.apache.jcp.xml.dsig.internal.dom;resolution:=optional,
org.apache.pdfbox.debugger;resolution:=optional,
org.apache.pdfbox.preflight.*;resolution:=optional,
- org.apache.sis;resolution:=optional,
- org.apache.sis.coverage;resolution:=optional,
- org.apache.sis.coverage.grid;resolution:=optional,
- org.apache.sis.distance;resolution:=optional,
- org.apache.sis.feature;resolution:=optional,
- org.apache.sis.geometry;resolution:=optional,
- org.apache.sis.internal.coverage;resolution:=optional,
- org.apache.sis.internal.feature;resolution:=optional,
- org.apache.sis.internal.referencing;resolution:=optional,
- org.apache.sis.internal.referencing.j2d;resolution:=optional,
- org.apache.sis.internal.referencing.provider;resolution:=optional,
- org.apache.sis.io.wkt;resolution:=optional,
- org.apache.sis.parameter;resolution:=optional,
- org.apache.sis.referencing;resolution:=optional,
- org.apache.sis.referencing.crs;resolution:=optional,
- org.apache.sis.referencing.cs;resolution:=optional,
- org.apache.sis.referencing.datum;resolution:=optional,
- org.apache.sis.referencing.operation;resolution:=optional,
- org.apache.sis.referencing.operation.builder;resolution:=optional,
- org.apache.sis.referencing.operation.matrix;resolution:=optional,
- org.apache.sis.referencing.operation.transform;resolution:=optional,
org.apache.tools.ant;resolution:=optional,
org.apache.tools.ant.taskdefs;resolution:=optional,
org.apache.tools.ant.types;resolution:=optional,
@@ -400,25 +333,13 @@
org.bouncycastle.operator.bc;resolution:=optional,
org.bouncycastle.tsp;resolution:=optional,
org.brotli.dec;resolution:=optional,
- org.checkerframework.checker.nullness.qual;resolution:=optional,
org.cyberneko.html.xercesbridge;resolution:=optional,
org.etsi.uri.x01903.v14;resolution:=optional,
- org.ibex.nestedvm;resolution:=optional,
- org.gjt.xpp;resolution:=optional,
org.jaxen;resolution:=optional,
org.jaxen.dom4j;resolution:=optional,
org.jaxen.pattern;resolution:=optional,
org.jaxen.saxpath;resolution:=optional,
org.jaxen.util;resolution:=optional,
- org.jdom;resolution:=optional,
- org.jdom.input;resolution:=optional,
- org.jdom.output;resolution:=optional,
- org.jdom2;resolution:=optional,
- org.jdom2.input;resolution:=optional,
- org.jdom2.input.sax;resolution:=optional,
- org.jdom2.output;resolution:=optional,
- org.jdom2.filter;resolution:=optional,
- org.json.simple;resolution:=optional,
org.openxmlformats.schemas.officeDocument.x2006.math;resolution:=optional,
org.openxmlformats.schemas.schemaLibrary.x2006.main;resolution:=optional,
org.osgi.framework;resolution:=optional,
@@ -426,53 +347,17 @@
org.quartz.impl;resolution:=optional,
org.slf4j;resolution:=optional,
org.slf4j.helpers;resolution:=optional,
- org.sqlite;resolution:=optional,
org.w3c.dom;resolution:=optional,
- org.relaxng.datatype;resolution:=optional,
org.xml.sax;resolution:=optional,
org.xml.sax.ext;resolution:=optional,
org.xml.sax.helpers;resolution:=optional,
- 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,
- ucar.nc2.util;resolution:=optional,
- ucar.nc2.util.cache;resolution:=optional,
- ucar.nc2.dataset;resolution:=optional,
- ucar.nc2;resolution:=optional,
- ucar.nc2.constants;resolution:=optional,
- ucar.nc2.dt;resolution:=optional,
- ucar.nc2.dt.grid;resolution:=optional,
- ucar.nc2.ft;resolution:=optional,
- ucar.nc2.iosp;resolution:=optional,
- ucar.nc2.iosp.hdf4;resolution:=optional,
- ucar.nc2.ncml;resolution:=optional,
- ucar.nc2.stream;resolution:=optional,
- ucar.nc2.time;resolution:=optional,
- ucar.nc2.units;resolution:=optional,
- ucar.nc2.wmo;resolution:=optional,
- ucar.nc2.write;resolution:=optional,
- ucar.ma2;resolution:=optional,
- ucar.grib;resolution:=optional,
- ucar.grib.grib1;resolution:=optional,
- ucar.grib.grib2;resolution:=optional,
- ucar.grid;resolution:=optional,
- ucar.unidata.geoloc;resolution:=optional,
- ucar.unidata.geoloc.projection;resolution:=optional,
- ucar.unidata.geoloc.projection.proj4;resolution:=optional,
- ucar.unidata.geoloc.projection.sat;resolution:=optional,
- ucar.unidata.io;resolution:=optional,
- ucar.unidata.util;resolution:=optional,
com.jmatio.io;resolution:=optional,
com.google.gson;resolution:=optional,
- com.google.gson.reflect;resolution:=optional,
- visad;resolution:=optional,
- visad.data;resolution:=optional,
- visad.data.vis5d;resolution:=optional,
- visad.jmet;resolution:=optional,
- visad.util;resolution:=optional,
+ com.google.gson.reflect;resolution:=optional,
colorspace;resolution:=optional,
com.sun.jna;resolution:=optional,
com.sun.jna.ptr;resolution:=optional,
@@ -495,34 +380,10 @@
org.jsoup.nodes;resolution:=optional,
org.jsoup.select;resolution:=optional,
thredds.featurecollection;resolution:=optional,
- thredds.filesystem;resolution:=optional,
- thredds.inventory;resolution:=optional,
- thredds.inventory.filter;resolution:=optional,
- thredds.inventory.partition;resolution:=optional,
com.beust.jcommander;resolution:=optional,
com.google.common.base;resolution:=optional,
com.google.common.math;resolution:=optional,
- org.apache.http;resolution:=optional,
- org.apache.http.client.utils;resolution:=optional,
- org.joda.time;resolution:=optional,
- org.joda.time.chrono;resolution:=optional,
- org.joda.time.field;resolution:=optional,
- org.joda.time.format;resolution:=optional,
sun.reflect.generics.reflectiveObjects;resolution:=optional,
- org.apache.http.auth;resolution:=optional,
- org.apache.http.client;resolution:=optional,
- org.apache.http.client.entity;resolution:=optional,
- org.apache.http.client.methods;resolution:=optional,
- org.apache.http.conn;resolution:=optional,
- org.apache.http.conn.scheme;resolution:=optional,
- org.apache.http.cookie;resolution:=optional,
- org.apache.http.entity;resolution:=optional,
- org.apache.http.impl.client;resolution:=optional,
- org.apache.http.impl.conn;resolution:=optional,
- org.apache.http.message;resolution:=optional,
- org.apache.http.params;resolution:=optional,
- org.apache.http.protocol;resolution:=optional,
- org.apache.http.util;resolution:=optional,
org.apache.commons.logging;resolution:=optional,
org.apache.log4j;resolution:=optional,
*
@@ -599,7 +460,7 @@
</executions>
<configuration>
<additionalClasspathElements>
- <additionalClasspathElement>${project.build.directory}/test-bundles/jdk9plus</additionalClasspathElement>
+ <additionalClasspathElement>${project.build.directory}/test-bundles/jdk9plus</additionalClasspathElement>
</additionalClasspathElements>
<systemPropertyVariables>
<org.ops4j.pax.logging.DefaultServiceLog.level>
@@ -634,3 +495,5 @@
<url>https://builds.apache.org/job/Tika-trunk/</url>
</ciManagement>
</project>
+
+
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 b84c7cf..4f18eae 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
@@ -179,7 +179,7 @@ public class BundleIT {
}
@Test
- @Ignore("until we can figure out why OverrideDetector is not loaded by osgi")
+ //@Ignore("until we can figure out why OverrideDetector is not loaded by osgi")
public void testBundleDetectors() throws Exception {
//For some reason, the detector created by OSGi has a flat
//list of detectors, whereas the detector created by the traditional
@@ -209,7 +209,10 @@ public class BundleIT {
rawDetectors.add(dChild.getClass().getName());
}
} else {
- rawDetectors.add(d.getClass().getName());
+ //TODO: figure out how to get this loaded correctly from tika-core
+ if (! d.getClass().getName().equals("org.apache.tika.detect.OverrideDetector")) {
+ rawDetectors.add(d.getClass().getName());
+ }
}
}
assertEquals(rawDetectors, osgiDetectors);
diff --git a/tika-core/pom.xml b/tika-core/pom.xml
index cba61bf..7903616 100644
--- a/tika-core/pom.xml
+++ b/tika-core/pom.xml
@@ -101,8 +101,7 @@
</Bundle-Activator>
<Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
<Import-Package>!org.apache.xerces.util,!sun.misc,*</Import-Package>
- <Embed-Dependency>commons-io;inline=true</Embed-Dependency>
- <Embed-Transitive>true</Embed-Transitive>
+ <Embed-Dependency>commons-io</Embed-Dependency>
<Export-Package>
org.apache.tika.*
</Export-Package>
diff --git a/tika-parsers/pom.xml b/tika-parsers/pom.xml
index 5e54115..acb63fb 100644
--- a/tika-parsers/pom.xml
+++ b/tika-parsers/pom.xml
@@ -35,9 +35,9 @@
<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) -->
+ <!-- potentially massive dependencies (e.g. dl4j) -->
<module>tika-parsers-advanced</module>
</modules>
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/pom.xml b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/pom.xml
index 03eb343..7c50d8b 100644
--- a/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/pom.xml
+++ b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/pom.xml
@@ -32,6 +32,15 @@
<artifactId>tika-parsers-classic-package</artifactId>
<dependencies>
+ <!-- Optional OSGi dependency, used only when running within OSGi -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${osgi.core.version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>tika-parser-apple-module</artifactId>
@@ -151,52 +160,109 @@
</dependencies>
+
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>${rat.version}</version>
- <configuration>
- <excludes>
- <exclude>src/test/resources/test-documents/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-DocURL>${project.url}</Bundle-DocURL>
- <Import-Package>
- org.apache.tika.*,
- *;resolution:=optional
- </Import-Package>
- </instructions>
- </configuration>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-DocURL>${project.url}</Bundle-DocURL>
+ <Bundle-Activator>
+ org.apache.tika.parser.internal.Activator
+ </Bundle-Activator>
+ <Import-Package>
+ org.w3c.dom,
+ org.apache.tika.*,
+ *;resolution:=optional
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>${rat.version}</version>
+ <configuration>
+ <excludes>
+ <exclude>src/test/resources/test-data/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>${maven.shade.version}</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <createDependencyReducedPom>
+ false
+ </createDependencyReducedPom>
+ <artifactSet>
+ <includes>
+ <include>org.apache.tika:tika-parser-apple-module</include>
+ <include>org.apache.tika:tika-parser-audiovideo-module</include>
+ <include>org.apache.tika:tika-parser-cad-module</include>
+ <include>org.apache.tika:tika-parser-code-module</include>
+ <include>org.apache.tika:tika-parser-crypto-module</include>
+ <include>org.apache.tika:tika-parser-digest-commons</include>
+ <include>org.apache.tika:tika-parser-font-module</include>
+ <include>org.apache.tika:tika-parser-html-module</include>
+ <include>org.apache.tika:tika-parser-image-module</include>
+ <include>org.apache.tika:tika-parser-jdbc-commons</include>
+ <include>org.apache.tika:tika-parser-mail-commons</include>
+ <include>org.apache.tika:tika-parser-mail-module</include>
+ <include>org.apache.tika:tika-parser-microsoft-module</include>
+ <include>org.apache.tika:tika-parser-miscoffice-module</include>
+ <include>org.apache.tika:tika-parser-news-module</include>
+ <include>org.apache.tika:tika-parser-ocr-module</include>
+ <include>org.apache.tika:tika-parser-pdf-module</include>
+ <include>org.apache.tika:tika-parser-pkg-module</include>
+ <include>org.apache.tika:tika-parser-text-module</include>
+ <include>org.apache.tika:tika-parser-xml-module</include>
+ <include>org.apache.tika:tika-parser-xmp-commons</include>
+ <include>org.apache.tika:tika-parser-zip-commons</include>
+ </includes>
+ </artifactSet>
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>LICENSE.txt</exclude>
+ <exclude>NOTICE.txt</exclude>
+ <exclude>CHANGES</exclude>
+ <exclude>README</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+ <manifestEntries>
+ <Automatic-Module-Name>org.apache.tika.parsers</Automatic-Module-Name>
+ </manifestEntries>
+ </transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+ <resource>META-INF/services/org.apache.tika.detect.Detector</resource>
+ </transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+ <resource>META-INF/services/org.apache.tika.detect.EncodingDetector</resource>
+ </transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+ <resource>META-INF/services/org.apache.tika.parser.Parser</resource>
+ </transformer>
+ </transformers>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
</build>
</project>
\ No newline at end of file
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/main/java/org/apache/tika/parser/internal/Activator.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/main/java/org/apache/tika/parser/internal/Activator.java
new file mode 100644
index 0000000..b436dd6
--- /dev/null
+++ b/tika-parsers/tika-parsers-classic/tika-parsers-classic-package/src/main/java/org/apache/tika/parser/internal/Activator.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tika.parser.internal;
+
+import org.apache.tika.detect.DefaultDetector;
+import org.apache.tika.detect.Detector;
+import org.apache.tika.parser.DefaultParser;
+import org.apache.tika.parser.Parser;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
+
+import java.util.Hashtable;
+
+public class Activator implements BundleActivator {
+
+ private ServiceRegistration detectorService;
+
+ private ServiceRegistration parserService;
+
+ @Override
+ public void start(BundleContext context) throws Exception {
+ detectorService = context.registerService(
+ Detector.class.getName(),
+ new DefaultDetector(Activator.class.getClassLoader()),
+ new Hashtable<>());
+ Parser parser = new DefaultParser(Activator.class.getClassLoader());
+ parserService = context.registerService(
+ Parser.class.getName(),
+ parser,
+ new Hashtable<>());
+ }
+
+ @Override
+ public void stop(BundleContext context) throws Exception {
+ parserService.unregister();
+ detectorService.unregister();
+ }
+
+}
[tika] 01/03: Merge branch 'TIKA-3178' into main
Posted by ta...@apache.org.
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 074d135e58b3fbaa832056d62c96393bb94fc42e
Merge: 1219866 1bda1ac
Author: tallison <ta...@apache.org>
AuthorDate: Wed Dec 2 13:09:46 2020 -0500
Merge branch 'TIKA-3178' into main
# Conflicts:
# pom.xml
# tika-parsers/pom.xml
pom.xml | 2 +-
tika-bundle/pom.xml | 17 +++++--
.../test/java/org/apache/tika/bundle/BundleIT.java | 3 +-
tika-core/pom.xml | 6 +++
tika-parsers/pom.xml | 18 ++++++++
.../org/apache/tika/parser/internal/Activator.java | 54 ++++++++++++++++++++++
6 files changed, 94 insertions(+), 6 deletions(-)
diff --cc pom.xml
index 82933c0,c2f3a09..30a3821
--- a/pom.xml
+++ b/pom.xml
@@@ -37,8 -37,10 +37,8 @@@
<modules>
<module>tika-parent</module>
<module>tika-core</module>
- <module>tika-parser-modules</module>
<module>tika-parsers</module>
- <!-- <module>tika-bundle</module> turn this off for now -->
+ <module>tika-bundle</module>
- <module>tika-parsers-extended</module>
<module>tika-xmp</module>
<module>tika-serialization</module>
<module>tika-batch</module>
[tika] 03/03: Merge remote-tracking branch 'origin/main' into main
Posted by ta...@apache.org.
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 b8404b68139955eb49e85c0270700038816b7d0b
Merge: e3e6c87 15d1c8f
Author: tallison <ta...@apache.org>
AuthorDate: Thu Dec 3 17:57:13 2020 -0500
Merge remote-tracking branch 'origin/main' into main
tika-java7/pom.xml | 2 +-
.../resources/org/apache/tika/parser/ner/opennlp/ModelGetter.groovy | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)