This is an automated email from the ASF dual-hosted git repository. grossws pushed a commit to branch build-refactoring in repository https://gitbox.apache.org/repos/asf/tika.git
commit ce625326cd9e327a24ae70e621fa7d163049b637 Author: Konstantin Gribov <[email protected]> AuthorDate: Sat Nov 19 22:24:09 2022 +0300 Replace commons-logging with jcl-over-slf4j --- tika-app/pom.xml | 4 ++++ tika-example/pom.xml | 4 ++++ .../tika-parser-scientific-module/pom.xml | 8 +++++++ .../tika-parser-advancedmedia-module/pom.xml | 12 +++++++++++ .../tika-parsers-ml/tika-parser-nlp-module/pom.xml | 11 ++++++++++ .../tika-parsers-ml/tika-transcribe-aws/pom.xml | 12 +++++++++++ .../tika-parsers-standard-modules/pom.xml | 25 ++++++++++++++++++++++ .../tika-parser-font-module/pom.xml | 6 ++++++ .../tika-parser-microsoft-module/pom.xml | 12 +++++++++++ .../tika-parser-pdf-module/pom.xml | 6 ++++++ .../tika-parser-xmp-commons/pom.xml | 6 ++++++ tika-pipes/tika-emitters/tika-emitter-s3/pom.xml | 11 ++++++++++ tika-pipes/tika-fetchers/tika-fetcher-http/pom.xml | 5 +++++ tika-pipes/tika-fetchers/tika-fetcher-s3/pom.xml | 11 ++++++++++ tika-pipes/tika-httpclient-commons/pom.xml | 6 ++++++ .../tika-pipes-iterator-s3/pom.xml | 11 ++++++++++ 16 files changed, 150 insertions(+) diff --git a/tika-app/pom.xml b/tika-app/pom.xml index b44192c45..e9d624236 100644 --- a/tika-app/pom.xml +++ b/tika-app/pom.xml @@ -85,6 +85,10 @@ <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>log4j-over-slf4j</artifactId> + </dependency> </dependencies> <build> diff --git a/tika-example/pom.xml b/tika-example/pom.xml index 140feb971..52fdb556e 100644 --- a/tika-example/pom.xml +++ b/tika-example/pom.xml @@ -82,6 +82,10 @@ <groupId>org.apache.tika</groupId> <artifactId>tika-core</artifactId> </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> </exclusions> </dependency> <dependency> 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 3314eea57..df7babc6c 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 @@ -70,6 +70,10 @@ <groupId>net.sf.ehcache</groupId> <artifactId>ehcache-core</artifactId> </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -81,6 +85,10 @@ <groupId>org.jsoup</groupId> <artifactId>jsoup</artifactId> </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> </exclusions> </dependency> <!-- TIKA-3095: Required for grib --> 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 884e6bdd2..ff21aa768 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 @@ -45,6 +45,12 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> @@ -57,6 +63,12 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpmime</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.github.openjson</groupId> 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 00154510f..0c1785e5c 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 @@ -84,6 +84,12 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> @@ -142,6 +148,11 @@ </exclusions> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>log4j-over-slf4j</artifactId> 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 fdb4227c3..718bb27e5 100644 --- a/tika-parsers/tika-parsers-ml/tika-transcribe-aws/pom.xml +++ b/tika-parsers/tika-parsers-ml/tika-transcribe-aws/pom.xml @@ -40,11 +40,23 @@ <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-transcribe</artifactId> <version>${aws.version}</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-s3</artifactId> <version>${aws.version}</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.googlecode.json-simple</groupId> diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/pom.xml index d7b5bbe03..43be87b5c 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/pom.xml +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/pom.xml @@ -40,6 +40,31 @@ <artifactId>tika-core</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jul-to-slf4j</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>log4j-over-slf4j</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j2-impl</artifactId> + <scope>test</scope> + </dependency> </dependencies> <modules> diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-font-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-font-module/pom.xml index 67b5e0ef5..0e5751c33 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-font-module/pom.xml +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-font-module/pom.xml @@ -38,6 +38,12 @@ <groupId>org.apache.pdfbox</groupId> <artifactId>fontbox</artifactId> <version>${pdfbox.version}</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> 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 6111290f3..a170d6e20 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 @@ -88,6 +88,12 @@ <dependency> <groupId>com.healthmarketscience.jackcess</groupId> <artifactId>jackcess</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.healthmarketscience.jackcess</groupId> @@ -101,6 +107,7 @@ <groupId>org.bouncycastle</groupId> <artifactId>bcprov-jdk18on</artifactId> </dependency> + <!-- logging --> <dependency> <groupId>org.apache.logging.log4j</groupId> @@ -112,6 +119,11 @@ <artifactId>log4j-slf4j2-impl</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> 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 38be3cf5f..4fc885b55 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 @@ -43,6 +43,12 @@ <groupId>org.apache.pdfbox</groupId> <artifactId>pdfbox</artifactId> <version>${pdfbox.version}</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.pdfbox</groupId> diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/pom.xml index d275a6798..e68f7adce 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/pom.xml +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/pom.xml @@ -43,6 +43,12 @@ <groupId>org.apache.pdfbox</groupId> <artifactId>xmpbox</artifactId> <version>${pdfbox.version}</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> diff --git a/tika-pipes/tika-emitters/tika-emitter-s3/pom.xml b/tika-pipes/tika-emitters/tika-emitter-s3/pom.xml index 5a499b80b..406c07d66 100644 --- a/tika-pipes/tika-emitters/tika-emitter-s3/pom.xml +++ b/tika-pipes/tika-emitters/tika-emitter-s3/pom.xml @@ -49,6 +49,12 @@ <dependency> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-s3</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -56,6 +62,11 @@ <artifactId>log4j-slf4j2-impl</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <scope>provided</scope> + </dependency> </dependencies> <build> diff --git a/tika-pipes/tika-fetchers/tika-fetcher-http/pom.xml b/tika-pipes/tika-fetchers/tika-fetcher-http/pom.xml index 7b2a9c4ec..dabece55a 100644 --- a/tika-pipes/tika-fetchers/tika-fetcher-http/pom.xml +++ b/tika-pipes/tika-fetchers/tika-fetcher-http/pom.xml @@ -48,6 +48,11 @@ <artifactId>log4j-slf4j2-impl</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <scope>provided</scope> + </dependency> <!-- test dependencies --> <dependency> diff --git a/tika-pipes/tika-fetchers/tika-fetcher-s3/pom.xml b/tika-pipes/tika-fetchers/tika-fetcher-s3/pom.xml index 5e58921ed..999d804da 100644 --- a/tika-pipes/tika-fetchers/tika-fetcher-s3/pom.xml +++ b/tika-pipes/tika-fetchers/tika-fetcher-s3/pom.xml @@ -42,6 +42,12 @@ <dependency> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-s3</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -49,6 +55,11 @@ <artifactId>log4j-slf4j2-impl</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <scope>provided</scope> + </dependency> </dependencies> <build> diff --git a/tika-pipes/tika-httpclient-commons/pom.xml b/tika-pipes/tika-httpclient-commons/pom.xml index 19253b81a..93faa77b0 100644 --- a/tika-pipes/tika-httpclient-commons/pom.xml +++ b/tika-pipes/tika-httpclient-commons/pom.xml @@ -43,6 +43,12 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> </project> 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 df4596662..988f916f2 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 @@ -43,6 +43,12 @@ <dependency> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-s3</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -50,6 +56,11 @@ <artifactId>log4j-slf4j2-impl</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <scope>provided</scope> + </dependency> </dependencies> <build>
