This is an automated email from the ASF dual-hosted git repository. tallison pushed a commit to branch TIKA-3914 in repository https://gitbox.apache.org/repos/asf/tika.git
commit e27334308c5a78cbaa06faca74882c24ede48d2b Author: tballison <talli...@apache.org> AuthorDate: Tue Nov 1 16:21:31 2022 -0400 TIKA-3914 -- remove unnecessary version tags in poms --- tika-app/pom.xml | 2 - tika-batch/pom.xml | 3 - tika-bundles/tika-bundle-standard/pom.xml | 3 - tika-detectors/tika-detector-siegfried/pom.xml | 2 - tika-eval/tika-eval-app/pom.xml | 3 - tika-eval/tika-eval-core/pom.xml | 4 - tika-langdetect/tika-langdetect-lingo24/pom.xml | 3 - tika-langdetect/tika-langdetect-mitll-text/pom.xml | 3 - tika-parent/pom.xml | 94 +++++++++++++++++++++- .../tika-parser-advancedmedia-module/pom.xml | 9 --- .../tika-parsers-ml/tika-parser-nlp-module/pom.xml | 12 --- .../tika-parsers-ml/tika-transcribe-aws/pom.xml | 7 -- .../tika-parser-audiovideo-module/pom.xml | 1 - .../tika-parser-cad-module/pom.xml | 1 - .../tika-parser-crypto-module/pom.xml | 2 - .../tika-parser-digest-commons/pom.xml | 3 - .../tika-parser-html-module/pom.xml | 1 - .../tika-parser-image-module/pom.xml | 15 ++-- .../tika-parser-mail-module/pom.xml | 1 - .../tika-parser-microsoft-module/pom.xml | 9 --- .../tika-parser-miscoffice-module/pom.xml | 5 -- .../tika-parser-ocr-module/pom.xml | 1 - .../tika-parser-pdf-module/pom.xml | 7 -- .../tika-parser-text-module/pom.xml | 2 - .../tika-parser-xml-module/pom.xml | 1 - .../tika-parser-zip-commons/pom.xml | 1 - .../tika-parsers-standard-package/pom.xml | 1 - tika-pipes/pom.xml | 10 +++ tika-pipes/tika-emitters/tika-emitter-gcs/pom.xml | 1 - .../tika-emitters/tika-emitter-opensearch/pom.xml | 2 - tika-pipes/tika-emitters/tika-emitter-s3/pom.xml | 1 - tika-pipes/tika-fetchers/tika-fetcher-gcs/pom.xml | 1 - tika-pipes/tika-fetchers/tika-fetcher-http/pom.xml | 1 - tika-pipes/tika-fetchers/tika-fetcher-s3/pom.xml | 1 - tika-pipes/tika-httpclient-commons/pom.xml | 1 - .../tika-pipes-iterator-csv/pom.xml | 1 - .../tika-pipes-iterator-gcs/pom.xml | 1 - .../tika-pipes-iterator-s3/pom.xml | 2 - tika-serialization/pom.xml | 1 - tika-server/tika-server-core/pom.xml | 11 --- tika-server/tika-server-standard/pom.xml | 2 - tika-translate/pom.xml | 16 ---- 42 files changed, 108 insertions(+), 140 deletions(-) diff --git a/tika-app/pom.xml b/tika-app/pom.xml index 7cc33ca2e..b9adf75ea 100644 --- a/tika-app/pom.xml +++ b/tika-app/pom.xml @@ -83,12 +83,10 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> - <version>${log4j2.version}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j2-impl</artifactId> - <version>${log4j2.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> diff --git a/tika-batch/pom.xml b/tika-batch/pom.xml index 4dc40f216..24b50a215 100644 --- a/tika-batch/pom.xml +++ b/tika-batch/pom.xml @@ -49,12 +49,10 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-compress</artifactId> - <version>${commons.compress.version}</version> </dependency> <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> - <version>${commons.cli.version}</version> </dependency> <dependency> @@ -67,7 +65,6 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> - <version>${slf4j.version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/tika-bundles/tika-bundle-standard/pom.xml b/tika-bundles/tika-bundle-standard/pom.xml index 0529eab67..64d625ac9 100644 --- a/tika-bundles/tika-bundle-standard/pom.xml +++ b/tika-bundles/tika-bundle-standard/pom.xml @@ -107,7 +107,6 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId> - <version>${osgi.core.version}</version> <scope>test</scope> </dependency> @@ -115,14 +114,12 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> - <version>${slf4j.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> diff --git a/tika-detectors/tika-detector-siegfried/pom.xml b/tika-detectors/tika-detector-siegfried/pom.xml index 3fa8eb9ce..878e8d1e7 100644 --- a/tika-detectors/tika-detector-siegfried/pom.xml +++ b/tika-detectors/tika-detector-siegfried/pom.xml @@ -33,13 +33,11 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> - <version>${log4j2.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j2-impl</artifactId> - <version>${log4j2.version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/tika-eval/tika-eval-app/pom.xml b/tika-eval/tika-eval-app/pom.xml index dce304c34..c7f3c6f5d 100644 --- a/tika-eval/tika-eval-app/pom.xml +++ b/tika-eval/tika-eval-app/pom.xml @@ -43,12 +43,10 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> - <version>${log4j2.version}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j2-impl</artifactId> - <version>${log4j2.version}</version> </dependency> <dependency> <groupId>com.h2database</groupId> @@ -57,7 +55,6 @@ <dependency> <groupId>org.apache.poi</groupId> <artifactId>poi-ooxml</artifactId> - <version>${poi.version}</version> </dependency> <dependency> <groupId>org.apache.tika</groupId> diff --git a/tika-eval/tika-eval-core/pom.xml b/tika-eval/tika-eval-core/pom.xml index 17e90302f..23cfeb1e1 100644 --- a/tika-eval/tika-eval-core/pom.xml +++ b/tika-eval/tika-eval-core/pom.xml @@ -52,12 +52,10 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>${commons.codec.version}</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-math3</artifactId> - <version>${commons.math3.version}</version> </dependency> <dependency> <groupId>org.apache.lucene</groupId> @@ -77,12 +75,10 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>${commons.lang3.version}</version> </dependency> <dependency> <groupId>org.ccil.cowan.tagsoup</groupId> <artifactId>tagsoup</artifactId> - <version>1.2.1</version> </dependency> <dependency> diff --git a/tika-langdetect/tika-langdetect-lingo24/pom.xml b/tika-langdetect/tika-langdetect-lingo24/pom.xml index a61b1c4b8..5f4bb8106 100644 --- a/tika-langdetect/tika-langdetect-lingo24/pom.xml +++ b/tika-langdetect/tika-langdetect-lingo24/pom.xml @@ -37,12 +37,10 @@ <dependency> <groupId>org.glassfish.jaxb</groupId> <artifactId>jaxb-runtime</artifactId> - <version>${jaxb.version}</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-client</artifactId> - <version>${cxf.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> @@ -53,7 +51,6 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j2-impl</artifactId> - <version>${log4j2.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> diff --git a/tika-langdetect/tika-langdetect-mitll-text/pom.xml b/tika-langdetect/tika-langdetect-mitll-text/pom.xml index f6578ed94..4066ef89b 100644 --- a/tika-langdetect/tika-langdetect-mitll-text/pom.xml +++ b/tika-langdetect/tika-langdetect-mitll-text/pom.xml @@ -36,7 +36,6 @@ <dependency> <groupId>org.glassfish.jaxb</groupId> <artifactId>jaxb-runtime</artifactId> - <version>${jaxb.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> @@ -45,14 +44,12 @@ <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-client</artifactId> - <version>${cxf.version}</version> </dependency> <!-- Test dependencies --> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j2-impl</artifactId> - <version>${log4j2.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml index 7aad1a3e4..65457cb17 100644 --- a/tika-parent/pom.xml +++ b/tika-parent/pom.xml @@ -410,6 +410,11 @@ <artifactId>org.osgi.util.function</artifactId> <version>1.2.0</version> </dependency> + <dependency> + <groupId>com.drewnoakes</groupId> + <artifactId>metadata-extractor</artifactId> + <version>${metadata.extractor.version}</version> + </dependency> <dependency> <groupId>com.mchange</groupId> <artifactId>c3p0</artifactId> @@ -460,6 +465,7 @@ </exclusion> </exclusions> </dependency> + <!-- jai-imageio-core is allowed since LEGAL-304 --> <dependency> <groupId>com.github.jai-imageio</groupId> <artifactId>jai-imageio-core</artifactId> @@ -480,6 +486,17 @@ <artifactId>guava</artifactId> <version>${guava.version}</version> </dependency> + <dependency> + <groupId>com.googlecode.json-simple</groupId> + <artifactId>json-simple</artifactId> + <version>${json.simple.version}</version> + <exclusions> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java</artifactId> @@ -505,6 +522,16 @@ <artifactId>commons-codec</artifactId> <version>${commons.codec.version}</version> </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + <version>${commons.collections4.version}</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-csv</artifactId> + <version>${commons.csv.version}</version> + </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> @@ -515,6 +542,11 @@ <artifactId>commons-logging</artifactId> <version>${commons.logging.version}</version> </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-math3</artifactId> + <version>${commons.math3.version}</version> + </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty-common</artifactId> @@ -550,6 +582,11 @@ <artifactId>javax.annotation-api</artifactId> <version>${javax.annotation.version}</version> </dependency> + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>javax.ws.rs-api</artifactId> + <version>${javax.rest.version}</version> + </dependency> <dependency> <groupId>javax.xml.soap</groupId> <artifactId>javax.xml.soap-api</artifactId> @@ -570,11 +607,41 @@ <artifactId>commons-compress</artifactId> <version>${commons.compress.version}</version> </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-exec</artifactId> + <version>${commons.exec.version}</version> + </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> <version>${commons.lang3.version}</version> </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-frontend-jaxrs</artifactId> + <version>${cxf.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-rs-client</artifactId> + <version>${cxf.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-rs-service-description</artifactId> + <version>${cxf.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-rs-security-cors</artifactId> + <version>${cxf.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-transports-http-jetty</artifactId> + <version>${cxf.version}</version> + </dependency> <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.scr.annotations</artifactId> @@ -637,6 +704,16 @@ <artifactId>opennlp-tools</artifactId> <version>${opennlp.version}</version> </dependency> + <dependency> + <groupId>org.apache.poi</groupId> + <artifactId>poi</artifactId> + <version>${poi.version}</version> + </dependency> + <dependency> + <groupId>org.apache.poi</groupId> + <artifactId>poi-ooxml</artifactId> + <version>${poi.version}</version> + </dependency> <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcmail-jdk15on</artifactId> @@ -652,6 +729,11 @@ <artifactId>bcprov-jdk15on</artifactId> <version>${bouncycastle.version}</version> </dependency> + <dependency> + <groupId>org.ccil.cowan.tagsoup</groupId> + <artifactId>tagsoup</artifactId> + <version>1.2.1</version> + </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> @@ -716,6 +798,11 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>${mockito.version}</version> + </dependency> <dependency> <groupId>org.netpreserve</groupId> <artifactId>jwarc</artifactId> @@ -741,6 +828,11 @@ <artifactId>quartz</artifactId> <version>2.3.2</version> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <version>${slf4j.version}</version> + </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> @@ -748,7 +840,7 @@ </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> + <artifactId>slf4j-simple</artifactId> <version>${slf4j.version}</version> </dependency> <dependency> diff --git a/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/pom.xml b/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/pom.xml index 5257689dd..495bcfa38 100644 --- a/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/pom.xml +++ b/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/pom.xml @@ -37,27 +37,22 @@ <dependency> <groupId>com.googlecode.json-simple</groupId> <artifactId>json-simple</artifactId> - <version>1.1.1</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>${httpcomponents.version}</version> </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.apache.httpcomponents</groupId> <artifactId>httpmime</artifactId> - <version>${httpcomponents.version}</version> </dependency> <dependency> <groupId>com.github.openjson</groupId> @@ -67,23 +62,19 @@ <dependency> <groupId>javax.ws.rs</groupId> <artifactId>javax.ws.rs-api</artifactId> - <version>${javax.rest.version}</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-exec</artifactId> - <version>${commons.exec.version}</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>${commons.lang3.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-client</artifactId> - <version>${cxf.version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/pom.xml b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/pom.xml index f1b4f142f..3b547e149 100644 --- a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/pom.xml +++ b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/pom.xml @@ -83,38 +83,26 @@ <dependency> <groupId>com.googlecode.json-simple</groupId> <artifactId>json-simple</artifactId> - <version>${json.simple.version}</version> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-client</artifactId> - <version>${cxf.version}</version> </dependency> <dependency> <groupId>javax.annotation</groupId> <artifactId>javax.annotation-api</artifactId> - <version>${javax.annotation.version}</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>${httpcomponents.version}</version> </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>com.google.code.gson</groupId> diff --git a/tika-parsers/tika-parsers-ml/tika-transcribe-aws/pom.xml b/tika-parsers/tika-parsers-ml/tika-transcribe-aws/pom.xml index 09aba010f..b7b8fb8c0 100644 --- a/tika-parsers/tika-parsers-ml/tika-transcribe-aws/pom.xml +++ b/tika-parsers/tika-parsers-ml/tika-transcribe-aws/pom.xml @@ -47,13 +47,6 @@ <dependency> <groupId>com.googlecode.json-simple</groupId> <artifactId>json-simple</artifactId> - <version>${json.simple.version}</version> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> </dependency> </dependencies> <build> diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/pom.xml index 4c83ae3a6..eeb0234f9 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/pom.xml +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/pom.xml @@ -33,7 +33,6 @@ <dependency> <groupId>com.drewnoakes</groupId> <artifactId>metadata-extractor</artifactId> - <version>${metadata.extractor.version}</version> </dependency> </dependencies> diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-cad-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-cad-module/pom.xml index 5588afa8e..93ff2b38a 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-cad-module/pom.xml +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-cad-module/pom.xml @@ -67,7 +67,6 @@ </plugin> </plugins> </build> - <scm> <tag>2.2.1-rc2</tag> </scm> diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-crypto-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-crypto-module/pom.xml index 6208345c8..b2ee5987b 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-crypto-module/pom.xml +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-crypto-module/pom.xml @@ -33,12 +33,10 @@ <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcmail-jdk15on</artifactId> - <version>${bouncycastle.version}</version> </dependency> <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-jdk15on</artifactId> - <version>${bouncycastle.version}</version> </dependency> </dependencies> <build> diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-digest-commons/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-digest-commons/pom.xml index 55f8cf397..5cb3ba49d 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-digest-commons/pom.xml +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-digest-commons/pom.xml @@ -33,17 +33,14 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>${commons.codec.version}</version> </dependency> <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcmail-jdk15on</artifactId> - <version>${bouncycastle.version}</version> </dependency> <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-jdk15on</artifactId> - <version>${bouncycastle.version}</version> </dependency> </dependencies> diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-module/pom.xml index 5e9d041d8..ab6061b98 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-module/pom.xml +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-module/pom.xml @@ -39,7 +39,6 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>${commons.codec.version}</version> </dependency> <!-- test scope --> diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/pom.xml index c3dbc2642..4553a5041 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/pom.xml +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/pom.xml @@ -33,18 +33,20 @@ <dependency> <groupId>com.drewnoakes</groupId> <artifactId>metadata-extractor</artifactId> - <version>${metadata.extractor.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>tika-parser-xmp-commons</artifactId> <version>${project.version}</version> </dependency> - <!-- jai-imageio-core is allowed since LEGAL-304 --> <dependency> <groupId>com.github.jai-imageio</groupId> <artifactId>jai-imageio-core</artifactId> - <version>${imageio.version}</version> + </dependency> + <dependency> + <groupId>org.apache.pdfbox</groupId> + <artifactId>jbig2-imageio</artifactId> + <version>${jbig2.version}</version> </dependency> <!-- For legal reasons (incompatible license), jai-imageio-jpeg2000 is to be used only in the tests and may not be distributed. See also LEGAL-195 --> @@ -54,12 +56,6 @@ <version>${imageio.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.pdfbox</groupId> - <artifactId>jbig2-imageio</artifactId> - <version>${jbig2.version}</version> - </dependency> - <dependency> <groupId>${project.groupId}</groupId> <artifactId>tika-parser-xmp-commons</artifactId> @@ -70,7 +66,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito.version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-mail-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-mail-module/pom.xml index c7a55da3c..7da8b4bf3 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-mail-module/pom.xml +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-mail-module/pom.xml @@ -48,7 +48,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito.version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/pom.xml index baf48892a..1aec55de1 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/pom.xml +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/pom.xml @@ -68,17 +68,14 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>${commons.codec.version}</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>${commons.lang3.version}</version> </dependency> <dependency> <groupId>org.apache.poi</groupId> <artifactId>poi</artifactId> - <version>${poi.version}</version> </dependency> <dependency> <groupId>org.apache.poi</groupId> @@ -88,13 +85,11 @@ <dependency> <groupId>org.apache.poi</groupId> <artifactId>poi-ooxml</artifactId> - <version>${poi.version}</version> </dependency> <!-- needed by jackcess --> <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>${commons.logging.version}</version> </dependency> <dependency> <groupId>com.healthmarketscience.jackcess</groupId> @@ -117,24 +112,20 @@ <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcmail-jdk15on</artifactId> - <version>${bouncycastle.version}</version> </dependency> <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-jdk15on</artifactId> - <version>${bouncycastle.version}</version> </dependency> <!-- logging --> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> - <version>${log4j2.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j2-impl</artifactId> - <version>${log4j2.version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/pom.xml index df419aef1..14c78a4bb 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/pom.xml +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/pom.xml @@ -48,27 +48,22 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>${commons.lang3.version}</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> - <version>${commons.collections4.version}</version> </dependency> <dependency> <groupId>org.apache.poi</groupId> <artifactId>poi</artifactId> - <version>${poi.version}</version> </dependency> <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>${commons.codec.version}</version> </dependency> <dependency> <groupId>org.glassfish.jaxb</groupId> <artifactId>jaxb-runtime</artifactId> - <version>${jaxb.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-ocr-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-ocr-module/pom.xml index 2444cf1c6..a552d2407 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-ocr-module/pom.xml +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-ocr-module/pom.xml @@ -33,7 +33,6 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>${commons.lang3.version}</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/pom.xml index eacca9fae..dcdbf5182 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/pom.xml +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/pom.xml @@ -63,12 +63,10 @@ <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcmail-jdk15on</artifactId> - <version>${bouncycastle.version}</version> </dependency> <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-jdk15on</artifactId> - <version>${bouncycastle.version}</version> </dependency> <!-- for java 10 See TIKA-2778 for why we need to do this now. @@ -78,18 +76,15 @@ <dependency> <groupId>org.glassfish.jaxb</groupId> <artifactId>jaxb-runtime</artifactId> - <version>${jaxb.version}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> - <version>${log4j2.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j2-impl</artifactId> - <version>${log4j2.version}</version> <scope>test</scope> </dependency> <dependency> @@ -97,11 +92,9 @@ <artifactId>jcl-over-slf4j</artifactId> <scope>test</scope> </dependency> - <!-- incompatible with Apache license, only use in testing --> <dependency> <groupId>com.github.jai-imageio</groupId> <artifactId>jai-imageio-core</artifactId> - <version>${imageio.version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/pom.xml index cc78f2ce5..e24c2f51b 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/pom.xml +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/pom.xml @@ -38,12 +38,10 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>${commons.codec.version}</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-csv</artifactId> - <version>${commons.csv.version}</version> </dependency> </dependencies> diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/pom.xml index 24202eaf9..b31abe417 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/pom.xml +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/pom.xml @@ -33,7 +33,6 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>${commons.codec.version}</version> </dependency> <dependency> <groupId>xerces</groupId> diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-zip-commons/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-zip-commons/pom.xml index c9e0fd4ee..7131a79db 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-zip-commons/pom.xml +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-zip-commons/pom.xml @@ -33,7 +33,6 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-compress</artifactId> - <version>${commons.compress.version}</version> </dependency> </dependencies> <build> diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/pom.xml index e034afad8..6aa841ed9 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/pom.xml +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/pom.xml @@ -34,7 +34,6 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId> - <version>${osgi.core.version}</version> <scope>provided</scope> <optional>true</optional> </dependency> diff --git a/tika-pipes/pom.xml b/tika-pipes/pom.xml index 6a79e7bab..f18f0a25b 100644 --- a/tika-pipes/pom.xml +++ b/tika-pipes/pom.xml @@ -50,6 +50,11 @@ in the submodules. --> <dependencies> + <dependency> + <groupId>com.amazonaws</groupId> + <artifactId>aws-java-sdk-s3</artifactId> + <version>${aws.version}</version> + </dependency> <dependency> <groupId>com.azure</groupId> <artifactId>azure-storage-blob</artifactId> @@ -72,6 +77,11 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>com.google.cloud</groupId> + <artifactId>google-cloud-storage</artifactId> + <version>${google.cloud.version}</version> + </dependency> <dependency> <groupId>io.projectreactor</groupId> <artifactId>reactor-core</artifactId> diff --git a/tika-pipes/tika-emitters/tika-emitter-gcs/pom.xml b/tika-pipes/tika-emitters/tika-emitter-gcs/pom.xml index b6eb98055..339e1e206 100644 --- a/tika-pipes/tika-emitters/tika-emitter-gcs/pom.xml +++ b/tika-pipes/tika-emitters/tika-emitter-gcs/pom.xml @@ -46,7 +46,6 @@ <dependency> <groupId>com.google.cloud</groupId> <artifactId>google-cloud-storage</artifactId> - <version>${google.cloud.version}</version> </dependency> </dependencies> diff --git a/tika-pipes/tika-emitters/tika-emitter-opensearch/pom.xml b/tika-pipes/tika-emitters/tika-emitter-opensearch/pom.xml index 8634fdbce..9127453b4 100644 --- a/tika-pipes/tika-emitters/tika-emitter-opensearch/pom.xml +++ b/tika-pipes/tika-emitters/tika-emitter-opensearch/pom.xml @@ -56,12 +56,10 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-io</artifactId> - <version>${jetty.version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> - <version>${jetty.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> diff --git a/tika-pipes/tika-emitters/tika-emitter-s3/pom.xml b/tika-pipes/tika-emitters/tika-emitter-s3/pom.xml index 04abfb1a0..8c22411b1 100644 --- a/tika-pipes/tika-emitters/tika-emitter-s3/pom.xml +++ b/tika-pipes/tika-emitters/tika-emitter-s3/pom.xml @@ -46,7 +46,6 @@ <dependency> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-s3</artifactId> - <version>${aws.version}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> diff --git a/tika-pipes/tika-fetchers/tika-fetcher-gcs/pom.xml b/tika-pipes/tika-fetchers/tika-fetcher-gcs/pom.xml index 20a222125..654c951da 100644 --- a/tika-pipes/tika-fetchers/tika-fetcher-gcs/pom.xml +++ b/tika-pipes/tika-fetchers/tika-fetcher-gcs/pom.xml @@ -38,7 +38,6 @@ <dependency> <groupId>com.google.cloud</groupId> <artifactId>google-cloud-storage</artifactId> - <version>${google.cloud.version}</version> </dependency> </dependencies> diff --git a/tika-pipes/tika-fetchers/tika-fetcher-http/pom.xml b/tika-pipes/tika-fetchers/tika-fetcher-http/pom.xml index a6877aa76..fce84e2a3 100644 --- a/tika-pipes/tika-fetchers/tika-fetcher-http/pom.xml +++ b/tika-pipes/tika-fetchers/tika-fetcher-http/pom.xml @@ -55,7 +55,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito.version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/tika-pipes/tika-fetchers/tika-fetcher-s3/pom.xml b/tika-pipes/tika-fetchers/tika-fetcher-s3/pom.xml index 3a72f656a..d45172dd1 100644 --- a/tika-pipes/tika-fetchers/tika-fetcher-s3/pom.xml +++ b/tika-pipes/tika-fetchers/tika-fetcher-s3/pom.xml @@ -32,7 +32,6 @@ <dependency> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-s3</artifactId> - <version>${aws.version}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> diff --git a/tika-pipes/tika-httpclient-commons/pom.xml b/tika-pipes/tika-httpclient-commons/pom.xml index 02d645c22..28298c5e8 100644 --- a/tika-pipes/tika-httpclient-commons/pom.xml +++ b/tika-pipes/tika-httpclient-commons/pom.xml @@ -39,7 +39,6 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>${httpcomponents.version}</version> </dependency> </dependencies> diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/pom.xml b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/pom.xml index a75258603..75c40cde5 100644 --- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/pom.xml +++ b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/pom.xml @@ -41,7 +41,6 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-csv</artifactId> - <version>${commons.csv.version}</version> </dependency> </dependencies> <build> diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-gcs/pom.xml b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-gcs/pom.xml index ff995afe8..74bd2e9d9 100644 --- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-gcs/pom.xml +++ b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-gcs/pom.xml @@ -41,7 +41,6 @@ <dependency> <groupId>com.google.cloud</groupId> <artifactId>google-cloud-storage</artifactId> - <version>${google.cloud.version}</version> </dependency> </dependencies> <build> diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/pom.xml b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/pom.xml index 5a1ee12f6..2809bebe2 100644 --- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/pom.xml +++ b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-s3/pom.xml @@ -41,12 +41,10 @@ <dependency> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-s3</artifactId> - <version>${aws.version}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j2-impl</artifactId> - <version>${log4j2.version}</version> <scope>provided</scope> </dependency> </dependencies> diff --git a/tika-serialization/pom.xml b/tika-serialization/pom.xml index 03f810dae..c1d5fad70 100644 --- a/tika-serialization/pom.xml +++ b/tika-serialization/pom.xml @@ -38,7 +38,6 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId> - <version>${osgi.core.version}</version> <scope>provided</scope> <optional>true</optional> </dependency> diff --git a/tika-server/tika-server-core/pom.xml b/tika-server/tika-server-core/pom.xml index eff551787..dfc52365b 100644 --- a/tika-server/tika-server-core/pom.xml +++ b/tika-server/tika-server-core/pom.xml @@ -70,43 +70,35 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-csv</artifactId> - <version>${commons.csv.version}</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxrs</artifactId> - <version>${cxf.version}</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-service-description</artifactId> - <version>${cxf.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-http-jetty</artifactId> - <version>${cxf.version}</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-security-cors</artifactId> - <version>${cxf.version}</version> </dependency> <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> - <version>${commons.cli.version}</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-client</artifactId> - <version>${cxf.version}</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>${commons.lang3.version}</version> </dependency> <!-- logging --> <dependency> @@ -129,14 +121,11 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> - <version>${log4j2.version}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j2-impl</artifactId> - <version>${log4j2.version}</version> </dependency> - </dependencies> <build> diff --git a/tika-server/tika-server-standard/pom.xml b/tika-server/tika-server-standard/pom.xml index b8c48cdd9..a3c8a2d78 100644 --- a/tika-server/tika-server-standard/pom.xml +++ b/tika-server/tika-server-standard/pom.xml @@ -67,12 +67,10 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> - <version>${log4j2.version}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j2-impl</artifactId> - <version>${log4j2.version}</version> </dependency> <!-- test jars --> <dependency> diff --git a/tika-translate/pom.xml b/tika-translate/pom.xml index 7bed8b338..85b388065 100644 --- a/tika-translate/pom.xml +++ b/tika-translate/pom.xml @@ -50,23 +50,10 @@ <artifactId>microsoft-translator-java-api</artifactId> <version>${microsoft.translator.version}</version> <type>jar</type> - <exclusions> - <exclusion> - <groupId>com.googlecode.json-simple</groupId> - <artifactId>json-simple</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>com.googlecode.json-simple</groupId> <artifactId>json-simple</artifactId> - <version>${json.simple.version}</version> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> </dependency> <!-- for java 10 See TIKA-2778 for why we need to do this now. @@ -75,12 +62,10 @@ <dependency> <groupId>org.glassfish.jaxb</groupId> <artifactId>jaxb-runtime</artifactId> - <version>${jaxb.version}</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-client</artifactId> - <version>${cxf.version}</version> <exclusions> <exclusion> <groupId>org.glassfish.jaxb</groupId> @@ -91,7 +76,6 @@ <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxrs</artifactId> - <version>${cxf.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.jaxrs</groupId>