This is an automated email from the ASF dual-hosted git repository. dongjoon pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push: new e22ddcbd852c [SPARK-47538][BUILD] Remove `commons-logging` dependency e22ddcbd852c is described below commit e22ddcbd852c95375d39fd6074627e1b5a91c6e7 Author: Dongjoon Hyun <dh...@apple.com> AuthorDate: Sun Mar 24 23:16:50 2024 -0700 [SPARK-47538][BUILD] Remove `commons-logging` dependency ### What changes were proposed in this pull request? This PR aims to remove `commons-logging` dependency in favor of `jcl-over-slf4j`. ### Why are the changes needed? - https://slf4j.org/legacy.html#jclOverSLF4J > To ease migration to SLF4J from JCL, SLF4J distributions include the jar file jcl-over-slf4j.jar. This jar file is intended as a drop-in replacement for JCL version 1.1.1. It implements the public API of JCL but using SLF4J underneath, hence the name "JCL over SLF4J." ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Pass the CIs. ### Was this patch authored or co-authored using generative AI tooling? No. Closes #45687 from dongjoon-hyun/commons-logging. Authored-by: Dongjoon Hyun <dh...@apple.com> Signed-off-by: Dongjoon Hyun <dh...@apple.com> --- LICENSE-binary | 1 - NOTICE-binary | 8 -------- connector/kafka-0-10-sql/pom.xml | 4 ++++ connector/kafka-0-10/pom.xml | 4 ++++ dev/deps/spark-deps-hadoop-3-hive-2.3 | 1 - pom.xml | 24 ++++++++++++++++++------ sql/hive-thriftserver/pom.xml | 6 ++++++ 7 files changed, 32 insertions(+), 16 deletions(-) diff --git a/LICENSE-binary b/LICENSE-binary index 2073d85246b6..b9e7820c0baf 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -325,7 +325,6 @@ commons-cli:commons-cli commons-dbcp:commons-dbcp commons-io:commons-io commons-lang:commons-lang -commons-logging:commons-logging commons-net:commons-net commons-pool:commons-pool io.fabric8:zjsonpatch diff --git a/NOTICE-binary b/NOTICE-binary index ef2dba45055a..5f1c1c617c36 100644 --- a/NOTICE-binary +++ b/NOTICE-binary @@ -271,14 +271,6 @@ benchmarking framework, which can be obtained at: * HOMEPAGE: * https://github.com/google/caliper -This product optionally depends on 'Apache Commons Logging', a logging -framework, which can be obtained at: - - * LICENSE: - * license/LICENSE.commons-logging.txt (Apache License 2.0) - * HOMEPAGE: - * http://commons.apache.org/logging/ - This product optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: diff --git a/connector/kafka-0-10-sql/pom.xml b/connector/kafka-0-10-sql/pom.xml index e22a57354b89..35f58134f1a8 100644 --- a/connector/kafka-0-10-sql/pom.xml +++ b/connector/kafka-0-10-sql/pom.xml @@ -116,6 +116,10 @@ <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/connector/kafka-0-10/pom.xml b/connector/kafka-0-10/pom.xml index 6a71a5d446c8..1b26839a371c 100644 --- a/connector/kafka-0-10/pom.xml +++ b/connector/kafka-0-10/pom.xml @@ -92,6 +92,10 @@ <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/dev/deps/spark-deps-hadoop-3-hive-2.3 b/dev/deps/spark-deps-hadoop-3-hive-2.3 index d39c92f3fc37..2ffef88dbe7e 100644 --- a/dev/deps/spark-deps-hadoop-3-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-3-hive-2.3 @@ -46,7 +46,6 @@ commons-dbcp/1.4//commons-dbcp-1.4.jar commons-io/2.15.1//commons-io-2.15.1.jar commons-lang/2.6//commons-lang-2.6.jar commons-lang3/3.14.0//commons-lang3-3.14.0.jar -commons-logging/1.1.3//commons-logging-1.1.3.jar commons-math3/3.6.1//commons-math3-3.6.1.jar commons-pool/1.5.4//commons-pool-1.5.4.jar commons-text/1.11.0//commons-text-1.11.0.jar diff --git a/pom.xml b/pom.xml index 5a878a1c3319..8e68ad7346f8 100644 --- a/pom.xml +++ b/pom.xml @@ -651,12 +651,6 @@ <artifactId>commons-beanutils</artifactId> <version>1.9.4</version> </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <!-- Hive uses commons-logging 1.1.3 from 0.13 to 1.2 --> - <version>1.1.3</version> - </dependency> <dependency> <groupId>org.apache.ivy</groupId> <artifactId>ivy</artifactId> @@ -671,6 +665,12 @@ <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> <version>${commons.httpclient.version}</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> @@ -721,6 +721,12 @@ <artifactId>htmlunit3-driver</artifactId> <version>${htmlunit3-driver.version}</version> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <!-- log4j --> @@ -1347,6 +1353,12 @@ <artifactId>hadoop-client-runtime</artifactId> <version>${hadoop.version}</version> <scope>${hadoop.deps.scope}</scope> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> diff --git a/sql/hive-thriftserver/pom.xml b/sql/hive-thriftserver/pom.xml index d9b16f64970e..6a352f8a530d 100644 --- a/sql/hive-thriftserver/pom.xml +++ b/sql/hive-thriftserver/pom.xml @@ -141,6 +141,12 @@ <dependency> <groupId>net.sf.jpam</groupId> <artifactId>jpam</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>commons-cli</groupId> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org