diff --git a/hbase-archetypes/hbase-client-project/pom.xml b/hbase-archetypes/hbase-client-project/pom.xml index 49c0591fca3b..e8eea1b8af36 100644 --- a/hbase-archetypes/hbase-client-project/pom.xml +++ b/hbase-archetypes/hbase-client-project/pom.xml @@ -65,12 +65,12 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j runtime - log4j - log4j + ch.qos.reload4j + reload4j runtime diff --git a/hbase-archetypes/hbase-shaded-client-project/pom.xml b/hbase-archetypes/hbase-shaded-client-project/pom.xml index 28a7240b6cf6..ad163b422aba 100644 --- a/hbase-archetypes/hbase-shaded-client-project/pom.xml +++ b/hbase-archetypes/hbase-shaded-client-project/pom.xml @@ -71,12 +71,12 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j runtime - log4j - log4j + ch.qos.reload4j + reload4j runtime diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml index ccf8e07c07ab..e6898ea63f46 100644 --- a/hbase-assembly/pom.xml +++ b/hbase-assembly/pom.xml @@ -353,11 +353,11 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j - log4j - log4j + ch.qos.reload4j + reload4j diff --git a/hbase-asyncfs/pom.xml b/hbase-asyncfs/pom.xml index 68c2ad517f90..2cb984012b63 100644 --- a/hbase-asyncfs/pom.xml +++ b/hbase-asyncfs/pom.xml @@ -150,12 +150,12 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j test - log4j - log4j + ch.qos.reload4j + reload4j test diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml index a5af55a41c88..f47349787144 100644 --- a/hbase-client/pom.xml +++ b/hbase-client/pom.xml @@ -178,12 +178,12 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j test - log4j - log4j + ch.qos.reload4j + reload4j test diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml index fb11bf8776e0..f983c4c143a5 100644 --- a/hbase-common/pom.xml +++ b/hbase-common/pom.xml @@ -236,12 +236,12 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j test - log4j - log4j + ch.qos.reload4j + reload4j test diff --git a/hbase-compression/hbase-compression-aircompressor/pom.xml b/hbase-compression/hbase-compression-aircompressor/pom.xml index c5543d78a845..ccb4f272fc72 100644 --- a/hbase-compression/hbase-compression-aircompressor/pom.xml +++ b/hbase-compression/hbase-compression-aircompressor/pom.xml @@ -136,12 +136,12 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j test - log4j - log4j + ch.qos.reload4j + reload4j test diff --git a/hbase-compression/hbase-compression-lz4/pom.xml b/hbase-compression/hbase-compression-lz4/pom.xml index 380f8e6499e5..6489aee169c9 100644 --- a/hbase-compression/hbase-compression-lz4/pom.xml +++ b/hbase-compression/hbase-compression-lz4/pom.xml @@ -125,12 +125,12 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j test - log4j - log4j + ch.qos.reload4j + reload4j test diff --git a/hbase-compression/hbase-compression-snappy/pom.xml b/hbase-compression/hbase-compression-snappy/pom.xml index 89123807f3f3..6ccf48ac7704 100644 --- a/hbase-compression/hbase-compression-snappy/pom.xml +++ b/hbase-compression/hbase-compression-snappy/pom.xml @@ -125,12 +125,12 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j test - log4j - log4j + ch.qos.reload4j + reload4j test diff --git a/hbase-compression/hbase-compression-xz/pom.xml b/hbase-compression/hbase-compression-xz/pom.xml index 89dca0dfd9e3..425366f7d163 100644 --- a/hbase-compression/hbase-compression-xz/pom.xml +++ b/hbase-compression/hbase-compression-xz/pom.xml @@ -109,12 +109,12 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j test - log4j - log4j + ch.qos.reload4j + reload4j test diff --git a/hbase-compression/hbase-compression-zstd/pom.xml b/hbase-compression/hbase-compression-zstd/pom.xml index ecbe63f35b6c..8afe65677fde 100644 --- a/hbase-compression/hbase-compression-zstd/pom.xml +++ b/hbase-compression/hbase-compression-zstd/pom.xml @@ -125,12 +125,12 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j test - log4j - log4j + ch.qos.reload4j + reload4j test diff --git a/hbase-endpoint/pom.xml b/hbase-endpoint/pom.xml index 632d424529d4..42ed82d29bb4 100644 --- a/hbase-endpoint/pom.xml +++ b/hbase-endpoint/pom.xml @@ -229,12 +229,12 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j test - log4j - log4j + ch.qos.reload4j + reload4j test diff --git a/hbase-examples/pom.xml b/hbase-examples/pom.xml index a45807f332a0..f9600c8048ea 100644 --- a/hbase-examples/pom.xml +++ b/hbase-examples/pom.xml @@ -226,12 +226,12 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j test - log4j - log4j + ch.qos.reload4j + reload4j test diff --git a/hbase-hadoop-compat/pom.xml b/hbase-hadoop-compat/pom.xml index 3e02d6d2a929..ee74fd91d867 100644 --- a/hbase-hadoop-compat/pom.xml +++ b/hbase-hadoop-compat/pom.xml @@ -104,12 +104,12 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j test - log4j - log4j + ch.qos.reload4j + reload4j test diff --git a/hbase-hadoop2-compat/pom.xml b/hbase-hadoop2-compat/pom.xml index f8b8d4ef98e8..54174481f0fe 100644 --- a/hbase-hadoop2-compat/pom.xml +++ b/hbase-hadoop2-compat/pom.xml @@ -181,12 +181,12 @@ limitations under the License. org.slf4j - slf4j-log4j12 + slf4j-reload4j test - log4j - log4j + ch.qos.reload4j + reload4j test diff --git a/hbase-hbtop/pom.xml b/hbase-hbtop/pom.xml index ea5c045f1ecc..a1e62180c022 100644 --- a/hbase-hbtop/pom.xml +++ b/hbase-hbtop/pom.xml @@ -93,12 +93,12 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j test - log4j - log4j + ch.qos.reload4j + reload4j test diff --git a/hbase-http/pom.xml b/hbase-http/pom.xml index 8662b87bea67..bc91be32b6ae 100644 --- a/hbase-http/pom.xml +++ b/hbase-http/pom.xml @@ -247,12 +247,12 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j test - log4j - log4j + ch.qos.reload4j + reload4j test diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml index 4efba454a658..eddc3a40be6c 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -269,12 +269,12 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j test - log4j - log4j + ch.qos.reload4j + reload4j test diff --git a/hbase-logging/pom.xml b/hbase-logging/pom.xml index 814b4e0f652d..91703bff9a58 100644 --- a/hbase-logging/pom.xml +++ b/hbase-logging/pom.xml @@ -80,7 +80,7 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j test @@ -89,8 +89,8 @@ provided - log4j - log4j + ch.qos.reload4j + reload4j provided diff --git a/hbase-mapreduce/pom.xml b/hbase-mapreduce/pom.xml index 5407ca12019a..5ae021cd2f4a 100644 --- a/hbase-mapreduce/pom.xml +++ b/hbase-mapreduce/pom.xml @@ -220,6 +220,24 @@ compile true + + org.apache.hadoop + hadoop-common + + + org.apache.hadoop + hadoop-hdfs + + + org.apache.hadoop + hadoop-mapreduce-client-core + + + + org.apache.hadoop + hadoop-minicluster + test + org.apache.hadoop hadoop-mapreduce-client-jobclient @@ -289,12 +307,12 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j test - log4j - log4j + ch.qos.reload4j + reload4j test @@ -322,100 +340,6 @@ - - org.apache.hadoop - hadoop-common - - - net.java.dev.jets3t - jets3t - - - javax.servlet.jsp - jsp-api - - - org.mortbay.jetty - jetty - - - com.sun.jersey - jersey-server - - - com.sun.jersey - jersey-core - - - com.sun.jersey - jersey-json - - - javax.servlet - servlet-api - - - tomcat - jasper-compiler - - - tomcat - jasper-runtime - - - com.google.code.findbugs - jsr305 - - - - - org.apache.hadoop - hadoop-hdfs - - - javax.servlet.jsp - jsp-api - - - javax.servlet - servlet-api - - - io.netty - netty - - - stax - stax-api - - - xerces - xercesImpl - - - - - org.apache.hadoop - hadoop-mapreduce-client-core - - - com.google.guava - guava - - - - - - org.apache.hadoop - hadoop-minicluster - test - - - org.apache.zookeeper - zookeeper - - - io.netty @@ -426,42 +350,6 @@ - - - - hadoop-3.0 - - - hadoop.profile - 3.0 - - - - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-hdfs - - - - org.apache.hadoop - hadoop-minicluster - test - - - javax.ws.rs - jsr311-api - - - - - eclipse-specific diff --git a/hbase-metrics-api/pom.xml b/hbase-metrics-api/pom.xml index 3c17b81ed287..9bd2f13b0d73 100644 --- a/hbase-metrics-api/pom.xml +++ b/hbase-metrics-api/pom.xml @@ -134,12 +134,12 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j test - log4j - log4j + ch.qos.reload4j + reload4j test diff --git a/hbase-metrics/pom.xml b/hbase-metrics/pom.xml index 2e30278a7101..280c0c80fd5d 100644 --- a/hbase-metrics/pom.xml +++ b/hbase-metrics/pom.xml @@ -142,12 +142,12 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j test - log4j - log4j + ch.qos.reload4j + reload4j test diff --git a/hbase-procedure/pom.xml b/hbase-procedure/pom.xml index 5f8734a81172..d9e784c8f960 100644 --- a/hbase-procedure/pom.xml +++ b/hbase-procedure/pom.xml @@ -131,12 +131,12 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j test - log4j - log4j + ch.qos.reload4j + reload4j test diff --git a/hbase-replication/pom.xml b/hbase-replication/pom.xml index 0c51e75b006c..946bffdc4464 100644 --- a/hbase-replication/pom.xml +++ b/hbase-replication/pom.xml @@ -137,12 +137,12 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j test - log4j - log4j + ch.qos.reload4j + reload4j test diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml index cacdbefbc8a8..c88cee8a040b 100644 --- a/hbase-rest/pom.xml +++ b/hbase-rest/pom.xml @@ -373,12 +373,12 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j test - log4j - log4j + ch.qos.reload4j + reload4j test diff --git a/hbase-rsgroup/pom.xml b/hbase-rsgroup/pom.xml index 77861ca275b8..d5a5a0587c64 100644 --- a/hbase-rsgroup/pom.xml +++ b/hbase-rsgroup/pom.xml @@ -182,12 +182,12 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j test - log4j - log4j + ch.qos.reload4j + reload4j test diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 9593f68e0d34..36ae87ea27d8 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -528,12 +528,12 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j test - log4j - log4j + ch.qos.reload4j + reload4j test diff --git a/hbase-shaded/hbase-shaded-check-invariants/pom.xml b/hbase-shaded/hbase-shaded-check-invariants/pom.xml index a2570d2c6c71..f9ac3fb898e1 100644 --- a/hbase-shaded/hbase-shaded-check-invariants/pom.xml +++ b/hbase-shaded/hbase-shaded-check-invariants/pom.xml @@ -60,8 +60,8 @@ provided - log4j - log4j + ch.qos.reload4j + reload4j provided diff --git a/hbase-shaded/hbase-shaded-client/pom.xml b/hbase-shaded/hbase-shaded-client/pom.xml index ee65fcc44701..de9a070ded87 100644 --- a/hbase-shaded/hbase-shaded-client/pom.xml +++ b/hbase-shaded/hbase-shaded-client/pom.xml @@ -77,6 +77,7 @@ org.apache.htrace:* org.apache.yetus:* log4j:* + ch.qos.reload4j:* commons-logging:* org.javassist:* io.opentelemetry:* diff --git a/hbase-shaded/hbase-shaded-testing-util-tester/pom.xml b/hbase-shaded/hbase-shaded-testing-util-tester/pom.xml index bf437d81f1a0..74d9be39804d 100644 --- a/hbase-shaded/hbase-shaded-testing-util-tester/pom.xml +++ b/hbase-shaded/hbase-shaded-testing-util-tester/pom.xml @@ -57,7 +57,7 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j test diff --git a/hbase-shaded/hbase-shaded-testing-util/pom.xml b/hbase-shaded/hbase-shaded-testing-util/pom.xml index 5b2afa730caf..de8b1bbd127f 100644 --- a/hbase-shaded/hbase-shaded-testing-util/pom.xml +++ b/hbase-shaded/hbase-shaded-testing-util/pom.xml @@ -37,43 +37,8 @@ org.apache.hadoop hadoop-common - ${hadoop.version} test-jar compile - - - javax.servlet.jsp - jsp-api - - - org.codehaus.jackson - jackson-mapper-asl - - - org.codehaus.jackson - jackson-core-asl - - - org.codehaus.jackson - jackson-jaxrs - - - org.codehaus.jackson - jackson-xc - - - javax.xml.bind - jaxb-api - - - javax.ws.rs - jsr311-api - - - javax.servlet - servlet-api - - org.apache.hadoop @@ -84,44 +49,12 @@ org.apache.hadoop hadoop-mapreduce-client-app - ${hadoop.version} test-jar compile - - - org.codehaus.jackson - jackson-mapper-asl - - - org.codehaus.jackson - jackson-core-asl - - - org.codehaus.jackson - jackson-jaxrs - - - org.codehaus.jackson - jackson-xc - - - javax.xml.bind - jaxb-api - - - javax.ws.rs - jsr311-api - - - javax.servlet - servlet-api - - org.apache.hadoop hadoop-mapreduce-client-jobclient - ${hadoop.version} test-jar compile diff --git a/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/pom.xml b/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/pom.xml index a715603ea92a..90d5be2510ed 100644 --- a/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/pom.xml +++ b/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/pom.xml @@ -49,8 +49,8 @@ provided - log4j - log4j + ch.qos.reload4j + reload4j provided diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml index 3adb6c2278d7..d2f0a4f25e47 100644 --- a/hbase-shaded/pom.xml +++ b/hbase-shaded/pom.xml @@ -55,13 +55,13 @@ - log4j - log4j + ch.qos.reload4j + reload4j true org.slf4j - slf4j-log4j12 + slf4j-reload4j true @@ -157,6 +157,7 @@ org.apache.htrace:* org.apache.yetus:* log4j:* + ch.qos.reload4j:* commons-logging:* org.javassist:* io.opentelemetry:* diff --git a/hbase-shell/pom.xml b/hbase-shell/pom.xml index 735bce28ca88..cb63fe5c2cda 100644 --- a/hbase-shell/pom.xml +++ b/hbase-shell/pom.xml @@ -148,12 +148,12 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j test - log4j - log4j + ch.qos.reload4j + reload4j test diff --git a/hbase-testing-util/pom.xml b/hbase-testing-util/pom.xml index 9390e955127f..c82ccf799373 100644 --- a/hbase-testing-util/pom.xml +++ b/hbase-testing-util/pom.xml @@ -140,12 +140,12 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j test - log4j - log4j + ch.qos.reload4j + reload4j test diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml index a4a749ff162b..54c1f607182e 100644 --- a/hbase-thrift/pom.xml +++ b/hbase-thrift/pom.xml @@ -256,12 +256,12 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j test - log4j - log4j + ch.qos.reload4j + reload4j test diff --git a/hbase-zookeeper/pom.xml b/hbase-zookeeper/pom.xml index bdce19bf29e0..45029db88518 100644 --- a/hbase-zookeeper/pom.xml +++ b/hbase-zookeeper/pom.xml @@ -175,12 +175,12 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j test - log4j - log4j + ch.qos.reload4j + reload4j test diff --git a/pom.xml b/pom.xml index a83282164a21..b7d8247929ce 100755 --- a/pom.xml +++ b/pom.xml @@ -1051,6 +1051,25 @@ + + banned-log4j + + enforce + + + + + + log4j:** + org.slf4j:slf4j-log4j12 + + + Use reload4j instead + + + + + check-aggregate-license @@ -1506,7 +1525,7 @@ 1.3 1.0.1 1.0.1 - 1.2.17 + 1.2.18.3 2.28.2 com.google.protobuf @@ -1517,7 +1536,7 @@ 0.14.1 3.5.7 2.11 - 1.7.30 + 1.7.33 4.0.3 2.4.1 1.3.8 @@ -1979,7 +1998,7 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j ${slf4j.version} @@ -1993,9 +2012,9 @@ ${slf4j.version} - log4j - log4j - ${log4j.version} + ch.qos.reload4j + reload4j + ${reload4j.version} @@ -2772,7 +2791,15 @@ org.codehaus.jackson jackson-mapper-asl - + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + + org.apache.hadoop @@ -2795,6 +2822,14 @@ javax.servlet servlet-api + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + @@ -2820,6 +2855,58 @@ javax.servlet servlet-api + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + + + + + org.apache.hadoop + hadoop-mapreduce-client-app + ${hadoop-two.version} + test-jar + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + javax.xml.bind + jaxb-api + + + javax.ws.rs + jsr311-api + + + javax.servlet + servlet-api + + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + @@ -2867,6 +2954,14 @@ com.google.guava guava + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + @@ -2916,6 +3011,14 @@ com.sun.jersey jersey-core + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + @@ -2931,6 +3034,14 @@ net.minidev json-smart + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + @@ -2990,6 +3101,14 @@ org.codehaus.jackson jackson-mapper-asl + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + @@ -3000,12 +3119,16 @@ test - com.sun.jersey - jersey-core + javax.servlet.jsp + jsp-api - com.google.code.findbugs - jsr305 + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-core-asl org.codehaus.jackson @@ -3015,10 +3138,38 @@ org.codehaus.jackson jackson-xc + + javax.xml.bind + jaxb-api + + + javax.ws.rs + jsr311-api + + + javax.servlet + servlet-api + + + com.sun.jersey + jersey-core + + + com.google.code.findbugs + jsr305 + io.netty netty + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + @@ -3035,6 +3186,16 @@ org.apache.hadoop hadoop-client ${hadoop-two.version} + + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + + @@ -3083,6 +3244,14 @@ com.google.code.findbugs jsr305 + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + @@ -3090,6 +3259,16 @@ hadoop-minikdc ${hadoop-two.version} test + + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + + org.apache.hadoop @@ -3259,6 +3438,50 @@ + + org.apache.hadoop + hadoop-mapreduce-client-app + ${hadoop-three.version} + test-jar + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + javax.xml.bind + jaxb-api + + + javax.ws.rs + jsr311-api + + + javax.servlet + servlet-api + + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + + + org.apache.hadoop hadoop-hdfs @@ -3488,9 +3711,41 @@ org.apache.hadoop hadoop-common test-jar - tests + test ${hadoop-three.version} + + javax.servlet.jsp + jsp-api + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + javax.xml.bind + jaxb-api + + + javax.ws.rs + jsr311-api + + + javax.servlet + servlet-api + com.sun.jersey jersey-core @@ -3499,6 +3754,18 @@ com.google.code.findbugs jsr305 + + io.netty + netty + + + org.slf4j + slf4j-log4j12 + + + log4j + log4j +