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/08/11 21:04:49 UTC
[tika] branch main updated: TIKA-3510 -- further fixes
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
The following commit(s) were added to refs/heads/main by this push:
new a2b21f8 TIKA-3510 -- further fixes
a2b21f8 is described below
commit a2b21f85817333c4e8396713069e6b389899af82
Author: tallison <ta...@apache.org>
AuthorDate: Wed Aug 11 17:04:35 2021 -0400
TIKA-3510 -- further fixes
---
.../tika-parser-scientific-module/pom.xml | 38 ++++-
.../tika-parser-scientific-package/pom.xml | 170 +++++++++++++++++++++
.../tika-parser-sqlite3-module/pom.xml | 25 ++-
.../tika-parser-sqlite3-package/pom.xml | 10 ++
.../pom.xml | 2 +-
5 files changed, 240 insertions(+), 5 deletions(-)
diff --git a/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/pom.xml b/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/pom.xml
index cebab61..4add4b4 100644
--- a/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/pom.xml
+++ b/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/pom.xml
@@ -17,7 +17,8 @@
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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>tika-parsers-extended</artifactId>
<groupId>org.apache.tika</groupId>
@@ -27,7 +28,6 @@
<artifactId>tika-parser-scientific-module</artifactId>
<name>Apache Tika scientific parser module</name>
- <packaging>pom</packaging>
<dependencies>
<!-- needed by AutoDetectReader in EnviHeaderParser -->
@@ -35,26 +35,31 @@
<groupId>${project.groupId}</groupId>
<artifactId>tika-parser-text-module</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sis.core</groupId>
<artifactId>sis-utility</artifactId>
<version>${sis.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sis.storage</groupId>
<artifactId>sis-netcdf</artifactId>
<version>${sis.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sis.core</groupId>
<artifactId>sis-metadata</artifactId>
<version>${sis.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.opengis</groupId>
<artifactId>geoapi</artifactId>
<version>${geoapi.version}</version>
+ <scope>provided</scope>
</dependency>
<!-- edu.ucar dependencies -->
<dependency>
@@ -102,6 +107,7 @@
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.quartz-scheduler</groupId>
@@ -113,6 +119,7 @@
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@@ -132,26 +139,31 @@
<artifactId>httpcore</artifactId>
</exclusion>
</exclusions>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>${httpcore.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${commons.codec.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom2</artifactId>
<version>2.0.6</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>edu.ucar</groupId>
@@ -179,6 +191,7 @@
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
+ <scope>provided</scope>
</dependency>
<!-- TIKA-3095: Required for grib -->
<dependency>
@@ -190,6 +203,7 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
<version>${commons.csv.version}</version>
+ <scope>provided</scope>
</dependency>
<!-- for java 10
See TIKA-2778 for why we need to do this now.
@@ -199,6 +213,7 @@ May the gods of dependency management fix this in the future.
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>${jaxb.version}</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
@@ -215,7 +230,24 @@ May the gods of dependency management fix this in the future.
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Automatic-Module-Name>org.apache.tika.parser.scientific.module</Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
-
</build>
</project>
\ No newline at end of file
diff --git a/tika-parsers/tika-parsers-extended/tika-parser-scientific-package/pom.xml b/tika-parsers/tika-parsers-extended/tika-parser-scientific-package/pom.xml
index f66f3b3..df827ab 100644
--- a/tika-parsers/tika-parsers-extended/tika-parser-scientific-package/pom.xml
+++ b/tika-parsers/tika-parsers-extended/tika-parser-scientific-package/pom.xml
@@ -38,6 +38,176 @@
<artifactId>tika-parser-scientific-module</artifactId>
<version>${project.version}</version>
</dependency>
+ <!-- needed by AutoDetectReader in EnviHeaderParser -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-text-module</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sis.core</groupId>
+ <artifactId>sis-utility</artifactId>
+ <version>${sis.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sis.storage</groupId>
+ <artifactId>sis-netcdf</artifactId>
+ <version>${sis.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sis.core</groupId>
+ <artifactId>sis-metadata</artifactId>
+ <version>${sis.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.opengis</groupId>
+ <artifactId>geoapi</artifactId>
+ <version>${geoapi.version}</version>
+ </dependency>
+ <!-- edu.ucar dependencies -->
+ <dependency>
+ <groupId>edu.ucar</groupId>
+ <artifactId>netcdf4</artifactId>
+ <version>${netcdf-java.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom2</artifactId>
+ </exclusion>
+ <!--TIKA 2672 exclude jna to resolve the dependency convergence with tika-dl's
+ deeplearning4j-nn:1.0.0-SNAPSHOT-->
+ <exclusion>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz</artifactId>
+ </exclusion>
+ <exclusion>
+ <!-- dependency convergence problems -->
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz</artifactId>
+ <version>${quartz.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${httpcomponents.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>${httpcore.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${commons.codec.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom2</artifactId>
+ <version>2.0.6</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>edu.ucar</groupId>
+ <artifactId>grib</artifactId>
+ <version>${netcdf-java.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>edu.ucar</groupId>
+ <artifactId>jj2000</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jsoup</groupId>
+ <artifactId>jsoup</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom2</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- TIKA-3095: Required for grib -->
+ <dependency>
+ <groupId>net.jcip</groupId>
+ <artifactId>jcip-annotations</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-csv</artifactId>
+ <version>${commons.csv.version}</version>
+ </dependency>
+ <!-- for java 10
+ See TIKA-2778 for why we need to do this now.
+ May the gods of dependency management fix this in the future.
+ -->
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb.version}</version>
+ </dependency>
</dependencies>
<build>
diff --git a/tika-parsers/tika-parsers-extended/tika-parser-sqlite3-module/pom.xml b/tika-parsers/tika-parsers-extended/tika-parser-sqlite3-module/pom.xml
index 5934b6c..b94bbf0 100644
--- a/tika-parsers/tika-parsers-extended/tika-parser-sqlite3-module/pom.xml
+++ b/tika-parsers/tika-parsers-extended/tika-parser-sqlite3-module/pom.xml
@@ -27,18 +27,41 @@
<artifactId>tika-parser-sqlite3-module</artifactId>
<name>Apache Tika sqlite3 parser module</name>
- <packaging>pom</packaging>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>tika-parser-jdbc-commons</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
<version>${sqlite.version}</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Automatic-Module-Name>org.apache.tika.parser.sqlite3.module</Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/tika-parsers/tika-parsers-extended/tika-parser-sqlite3-package/pom.xml b/tika-parsers/tika-parsers-extended/tika-parser-sqlite3-package/pom.xml
index 1d0f8b2..1a4a26c 100644
--- a/tika-parsers/tika-parsers-extended/tika-parser-sqlite3-package/pom.xml
+++ b/tika-parsers/tika-parsers-extended/tika-parser-sqlite3-package/pom.xml
@@ -35,6 +35,16 @@
<artifactId>tika-parser-sqlite3-module</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tika-parser-jdbc-commons</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.xerial</groupId>
+ <artifactId>sqlite-jdbc</artifactId>
+ <version>${sqlite.version}</version>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --git a/tika-parsers/tika-parsers-extended/tika-parsers-extended-integration-tests/pom.xml b/tika-parsers/tika-parsers-extended/tika-parsers-extended-integration-tests/pom.xml
index c33802d..1cc8e8b 100644
--- a/tika-parsers/tika-parsers-extended/tika-parsers-extended-integration-tests/pom.xml
+++ b/tika-parsers/tika-parsers-extended/tika-parsers-extended-integration-tests/pom.xml
@@ -43,7 +43,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>tika-parser-sqlite3-module</artifactId>
+ <artifactId>tika-parser-sqlite3-package</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>