This is an automated email from the ASF dual-hosted git repository. alsuliman pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 621cd023395938dcc36ff8cd024c94a19829338b Author: Michael Blow <[email protected]> AuthorDate: Wed Feb 15 20:00:51 2023 -0500 [NO ISSUE] Exclude reload4j-related deps from Hadoop Change-Id: I8698431b3456279a76f16124db7a4dc6b888ec61 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17385 Reviewed-by: Michael Blow <[email protected]> Reviewed-by: Ali Alsuliman <[email protected]> Tested-by: Michael Blow <[email protected]> Integration-Tests: Jenkins <[email protected]> --- asterixdb/pom.xml | 90 ++++++++------------------ hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml | 38 +++++------ hyracks-fullstack/pom.xml | 34 ++++++---- 3 files changed, 63 insertions(+), 99 deletions(-) diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index 6e198a7e3d..c89e7e4688 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -972,17 +972,13 @@ <artifactId>hadoop-client</artifactId> <version>${hadoop.version}</version> <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> <exclusion> <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <artifactId>slf4j-reload4j</artifactId> </exclusion> <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> </exclusion> </exclusions> </dependency> @@ -991,17 +987,13 @@ <artifactId>hadoop-hdfs</artifactId> <version>${hadoop.version}</version> <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> <exclusion> <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <artifactId>slf4j-reload4j</artifactId> </exclusion> <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> </exclusion> <!-- TODO(htowaileb): Remove after updating to hadoop 3.3.4 --> <exclusion> @@ -1043,17 +1035,13 @@ <groupId>jdk.tools</groupId> <artifactId>jdk.tools</artifactId> </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> <exclusion> <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <artifactId>slf4j-reload4j</artifactId> </exclusion> <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> </exclusion> <exclusion> <groupId>com.fasterxml</groupId> @@ -1091,17 +1079,13 @@ <artifactId>hadoop-hdfs-client</artifactId> <version>${hadoop.version}</version> <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> <exclusion> <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <artifactId>slf4j-reload4j</artifactId> </exclusion> <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> </exclusion> </exclusions> </dependency> @@ -1115,17 +1099,13 @@ <groupId>com.nimbusds</groupId> <artifactId>nimbus-jose-jwt</artifactId> </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> <exclusion> <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <artifactId>slf4j-reload4j</artifactId> </exclusion> <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> </exclusion> <!-- TODO(htowaileb): Remove after updating to hadoop 3.3.4 --> <exclusion> @@ -1147,17 +1127,13 @@ <groupId>jdk.tools</groupId> <artifactId>jdk.tools</artifactId> </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> <exclusion> <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <artifactId>slf4j-reload4j</artifactId> </exclusion> <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> </exclusion> <exclusion> <groupId>org.jline</groupId> @@ -1175,17 +1151,13 @@ <artifactId>hadoop-annotations</artifactId> <version>${hadoop.version}</version> <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> <exclusion> <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <artifactId>slf4j-reload4j</artifactId> </exclusion> <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> </exclusion> </exclusions> </dependency> @@ -1194,17 +1166,13 @@ <artifactId>hadoop-minicluster</artifactId> <version>${hadoop.version}</version> <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> <exclusion> <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <artifactId>slf4j-reload4j</artifactId> </exclusion> <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> </exclusion> <!-- TODO(htowaileb): Remove after updating to hadoop 3.3.4 --> <exclusion> @@ -1227,17 +1195,13 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> <exclusion> <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <artifactId>slf4j-reload4j</artifactId> </exclusion> <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> </exclusion> <!-- TODO(htowaileb): Remove after updating to hadoop 3.3.4 --> <exclusion> diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml b/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml index b16904df1c..5bf7abd9a4 100644 --- a/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml @@ -112,8 +112,12 @@ <artifactId>servlet-api</artifactId> </exclusion> <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-reload4j</artifactId> + </exclusion> + <exclusion> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> </exclusion> </exclusions> </dependency> @@ -125,17 +129,13 @@ <groupId>com.sun.jersey.jersey-test-framework</groupId> <artifactId>jersey-test-framework-grizzly2</artifactId> </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> <exclusion> <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <artifactId>slf4j-reload4j</artifactId> </exclusion> <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> </exclusion> </exclusions> </dependency> @@ -151,17 +151,13 @@ <groupId>io.netty</groupId> <artifactId>netty-all</artifactId> </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> <exclusion> <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <artifactId>slf4j-reload4j</artifactId> </exclusion> <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> </exclusion> <!-- TODO(htowaileb): Remove after updating to hadoop 3.3.4 --> <exclusion> @@ -182,17 +178,13 @@ <classifier>tests</classifier> <scope>test</scope> <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> <exclusion> <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <artifactId>slf4j-reload4j</artifactId> </exclusion> <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> </exclusion> <!-- TODO(htowaileb): Remove after updating to hadoop 3.3.4 --> <exclusion> diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml index 69a82799b5..695b74926d 100644 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@ -171,17 +171,13 @@ <groupId>jdk.tools</groupId> <artifactId>jdk.tools</artifactId> </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> <exclusion> <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <artifactId>slf4j-reload4j</artifactId> </exclusion> <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> </exclusion> <!-- TODO(htowaileb): Remove after updating to hadoop 3.3.4 --> <exclusion> @@ -204,8 +200,12 @@ <artifactId>netty-all</artifactId> </exclusion> <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-reload4j</artifactId> + </exclusion> + <exclusion> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> </exclusion> <!-- TODO(htowaileb): Remove after updating to hadoop 3.3.4 --> <exclusion> @@ -224,8 +224,12 @@ <version>${hadoop.version}</version> <exclusions> <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-reload4j</artifactId> + </exclusion> + <exclusion> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> </exclusion> <!-- TODO(htowaileb): Remove after updating to hadoop 3.3.4 --> <exclusion> @@ -258,8 +262,12 @@ <scope>test</scope> <exclusions> <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-reload4j</artifactId> + </exclusion> + <exclusion> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> </exclusion> <!-- TODO(htowaileb): Remove after updating to hadoop 3.3.4 --> <exclusion>
