This is an automated email from the ASF dual-hosted git repository. slfan1989 pushed a commit to branch branch-3.4.0 in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.4.0 by this push: new 5ed3a27df041 HADOOP-19084. Prune hadoop-common transitive dependencies (#6574) 5ed3a27df041 is described below commit 5ed3a27df041ebb57e4983792e28b13320cb96df Author: Steve Loughran <ste...@cloudera.com> AuthorDate: Fri Feb 23 17:56:46 2024 +0000 HADOOP-19084. Prune hadoop-common transitive dependencies (#6574) Exclude more artifacts which are dependencies of hadoop-* modules, with the goal of keeping conflict out of downstream applications. In particular we have pruned the dependencies of of: -zookeeper -other libraries referencing logging This keeps slf4j-log4j12 and log4j12 off the classpath of applications importing hadoop-common. Somehow logback references do still surface; applications pulling in hadoop-common directly or indirectly should review their imports carefully. Contributed by Steve Loughran --- hadoop-project/pom.xml | 46 ++++++++++++++-------- .../hadoop-yarn-applications-mawo-core/pom.xml | 19 --------- 2 files changed, 29 insertions(+), 36 deletions(-) diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index bd93a7e392c7..0ed96d087bc6 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -126,7 +126,7 @@ <commons-csv.version>1.9.0</commons-csv.version> <commons-io.version>2.14.0</commons-io.version> <commons-lang3.version>3.12.0</commons-lang3.version> - <commons-logging.version>1.1.3</commons-logging.version> + <commons-logging.version>1.2</commons-logging.version> <commons-math3.version>3.6.1</commons-math3.version> <commons-net.version>3.9.0</commons-net.version> <commons-text.version>1.10.0</commons-text.version> @@ -1435,15 +1435,11 @@ </exclusion> <exclusion> <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-handler</artifactId> + <artifactId>*</artifactId> </exclusion> <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-transport-native-epoll</artifactId> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> </exclusion> <exclusion> <groupId>commons-collections</groupId> @@ -1507,15 +1503,7 @@ </exclusion> <exclusion> <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-handler</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-transport-native-epoll</artifactId> + <artifactId>*</artifactId> </exclusion> <exclusion> <groupId>org.eclipse.jetty</groupId> @@ -1596,6 +1584,12 @@ <groupId>${leveldbjni.group}</groupId> <artifactId>leveldbjni-all</artifactId> <version>1.8</version> + <exclusions> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.fusesource.hawtjni</groupId> @@ -1958,11 +1952,23 @@ <groupId>org.ehcache</groupId> <artifactId>ehcache</artifactId> <version>${ehcache.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.zaxxer</groupId> <artifactId>HikariCP</artifactId> <version>${hikari.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.derby</groupId> @@ -2024,6 +2030,12 @@ <groupId>org.jsonschema2pojo</groupId> <artifactId>jsonschema2pojo-core</artifactId> <version>${jsonschema2pojo.version}</version> + <exclusions> + <exclusion> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.xerial.snappy</groupId> diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/pom.xml index ecdda6280f1c..f53cb2fff8ad 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/pom.xml @@ -93,25 +93,6 @@ <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <exclusions> - <exclusion> - <!-- otherwise seems to drag in junit 3.8.1 via jline --> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jdmk</groupId> - <artifactId>jmxtools</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jmx</groupId> - <artifactId>jmxri</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org