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/16 17:56:36 UTC
[tika] 01/03: TIKA-3510 -- further clean up
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 5985b629df562b15ab39ca8a02332daf9936a383
Author: tallison <ta...@apache.org>
AuthorDate: Mon Aug 16 10:17:57 2021 -0400
TIKA-3510 -- further clean up
---
.../tika-parser-scientific-module/pom.xml | 16 +-
.../tika-parser-scientific-package/pom.xml | 171 +--------------------
.../tika-parser-sqlite3-module/pom.xml | 2 -
.../tika-parser-sqlite3-package/pom.xml | 10 --
4 files changed, 2 insertions(+), 197 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 4add4b4..92f9833 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
@@ -35,31 +35,26 @@
<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>
@@ -107,7 +102,6 @@
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.quartz-scheduler</groupId>
@@ -119,7 +113,6 @@
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@@ -139,31 +132,26 @@
<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>
@@ -191,7 +179,6 @@
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
- <scope>provided</scope>
</dependency>
<!-- TIKA-3095: Required for grib -->
<dependency>
@@ -203,7 +190,6 @@
<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.
@@ -213,7 +199,6 @@ 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>
@@ -233,6 +218,7 @@ May the gods of dependency management fix this in the future.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <version>${maven.jar.version}</version>
<configuration>
<archive>
<manifestEntries>
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 df827ab..222ac12 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,176 +38,6 @@
<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>
@@ -231,6 +61,7 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>${maven.shade.version}</version>
<executions>
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 b94bbf0..71fbe20 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
@@ -33,13 +33,11 @@
<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>
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 1a4a26c..1d0f8b2 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,16 +35,6 @@
<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>