This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 5f8e637 HDDS-6291. Do not let slf4j-log4j12 leak into Ozone FS shaded
jar (#3064)
5f8e637 is described below
commit 5f8e63787c450ffaecb7a9f4ffc07ae39d921aac
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Thu Feb 10 09:39:01 2022 +0100
HDDS-6291. Do not let slf4j-log4j12 leak into Ozone FS shaded jar (#3064)
---
hadoop-ozone/client/pom.xml | 1 +
hadoop-ozone/dist/src/main/smoketest/mapreduce.robot | 1 +
hadoop-ozone/dist/src/main/smoketest/ozonefs/hadoopo3fs.robot | 1 +
hadoop-ozone/ozonefs-shaded/pom.xml | 2 +-
4 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/hadoop-ozone/client/pom.xml b/hadoop-ozone/client/pom.xml
index b5ba8e7..9ba3af6 100644
--- a/hadoop-ozone/client/pom.xml
+++ b/hadoop-ozone/client/pom.xml
@@ -51,6 +51,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
diff --git a/hadoop-ozone/dist/src/main/smoketest/mapreduce.robot
b/hadoop-ozone/dist/src/main/smoketest/mapreduce.robot
index c11695a..82387c9 100644
--- a/hadoop-ozone/dist/src/main/smoketest/mapreduce.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/mapreduce.robot
@@ -38,6 +38,7 @@ Execute PI calculation
${root} = Format FS URL ${SCHEME} ${volume} ${bucket}
${output} = Execute yarn jar
${exampleJar} pi -D fs.defaultFS=${root} 3 3
Should Contain ${output} completed
successfully
+ Should Not Contain ${output} multiple SLF4J
bindings
Execute WordCount
${exampleJar} Find example jar
diff --git a/hadoop-ozone/dist/src/main/smoketest/ozonefs/hadoopo3fs.robot
b/hadoop-ozone/dist/src/main/smoketest/ozonefs/hadoopo3fs.robot
index a2779d9..51fab51 100644
--- a/hadoop-ozone/dist/src/main/smoketest/ozonefs/hadoopo3fs.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/ozonefs/hadoopo3fs.robot
@@ -33,6 +33,7 @@ Test hadoop dfs
${dir} = Format FS URL ${SCHEME} ${volume}
${bucket}
${random} = Generate Random String 5 [NUMBERS]
${result} = Execute hdfs dfs -put
/opt/hadoop/NOTICE.txt ${dir}/${PREFIX}-${random}
+ Should Not Contain ${result} multiple
SLF4J bindings
${result} = Execute hdfs dfs -ls ${dir}
Should contain ${result}
${PREFIX}-${random}
${result} = Execute hdfs dfs -cat
${dir}/${PREFIX}-${random}
diff --git a/hadoop-ozone/ozonefs-shaded/pom.xml
b/hadoop-ozone/ozonefs-shaded/pom.xml
index 257279c..f28f37c 100644
--- a/hadoop-ozone/ozonefs-shaded/pom.xml
+++ b/hadoop-ozone/ozonefs-shaded/pom.xml
@@ -57,7 +57,7 @@
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.protobuf</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
