diff --git a/hbase-assembly/src/main/assembly/client.xml b/hbase-assembly/src/main/assembly/client.xml index 48940b75d5b..41aeea577eb 100644 --- a/hbase-assembly/src/main/assembly/client.xml +++ b/hbase-assembly/src/main/assembly/client.xml @@ -55,6 +55,7 @@ com.github.stephenc.findbugs:findbugs-annotations commons-logging:commons-logging log4j:log4j + ch.qos.reload4j:reload4j org.apache.hbase:hbase-shaded-client org.apache.hbase:hbase-shaded-client-byo-hadoop org.apache.hbase:hbase-shaded-mapreduce @@ -65,6 +66,7 @@ org.slf4j:jcl-over-slf4j org.slf4j:jul-to-slf4j org.slf4j:slf4j-log4j12 + org.slf4j:slf4j-reload4j io.opentelemetry.javaagent:* @@ -146,14 +148,14 @@ com.github.stephenc.findbugs:findbugs-annotations commons-logging:commons-logging - log4j:log4j + ch.qos.reload4j:reload4j org.apache.htrace:htrace-core4 org.apache.htrace:htrace-core org.apache.yetus:audience-annotations org.slf4j:slf4j-api org.slf4j:jcl-over-slf4j org.slf4j:jul-to-slf4j - org.slf4j:slf4j-log4j12 + org.slf4j:slf4j-reload4j io.opentelemetry:* diff --git a/hbase-assembly/src/main/assembly/hadoop-three-compat.xml b/hbase-assembly/src/main/assembly/hadoop-three-compat.xml index 6c670a77f7e..d24f5822427 100644 --- a/hbase-assembly/src/main/assembly/hadoop-three-compat.xml +++ b/hbase-assembly/src/main/assembly/hadoop-three-compat.xml @@ -107,11 +107,13 @@ com.github.stephenc.findbugs:findbugs-annotations commons-logging:commons-logging log4j:log4j + ch.qos.reload4j:reload4j org.apache.htrace:htrace-core4 org.apache.htrace:htrace-core org.apache.yetus:audience-annotations org.slf4j:slf4j-api org.slf4j:slf4j-log4j12 + org.slf4j:slf4j-reload4j io.opentelemetry.javaagent:* @@ -205,14 +207,14 @@ com.github.stephenc.findbugs:findbugs-annotations commons-logging:commons-logging - log4j:log4j + ch.qos.reload4j:reload4j org.apache.htrace:htrace-core4 org.apache.htrace:htrace-core org.apache.yetus:audience-annotations org.slf4j:slf4j-api org.slf4j:jcl-over-slf4j org.slf4j:jul-to-slf4j - org.slf4j:slf4j-log4j12 + org.slf4j:slf4j-reload4j io.opentelemetry:* diff --git a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml index 750027812e0..88aa9dc6cbb 100644 --- a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml +++ b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml @@ -104,6 +104,7 @@ commons-logging:commons-logging jline:jline log4j:log4j + ch.qos.reload4j:reload4j org.apache.hbase:hbase-shaded-client-byo-hadoop org.apache.hbase:hbase-shaded-client org.apache.hbase:hbase-shaded-mapreduce @@ -113,6 +114,7 @@ org.jruby:jruby-complete org.slf4j:slf4j-api org.slf4j:slf4j-log4j12 + org.slf4j:slf4j-reload4j @@ -205,12 +207,12 @@ com.github.stephenc.findbugs:findbugs-annotations commons-logging:commons-logging - log4j:log4j + ch.qos.reload4j:reload4j org.apache.htrace:htrace-core4 org.apache.htrace:htrace-core org.apache.yetus:audience-annotations org.slf4j:slf4j-api - org.slf4j:slf4j-log4j12 + org.slf4j:slf4j-reload4j diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml index b16d0533c88..b7cf14e24f1 100644 --- a/hbase-protocol-shaded/pom.xml +++ b/hbase-protocol-shaded/pom.xml @@ -163,6 +163,7 @@ org.codehaus.mojo:animal-sniffer-annotations junit:junit log4j:log4j + ch.qos.reload4j:* commons-logging:commons-logging org.slf4j:slf4j-api org.apache.yetus:audience-annotations diff --git a/hbase-shaded/hbase-shaded-check-invariants/pom.xml b/hbase-shaded/hbase-shaded-check-invariants/pom.xml index 4109e5b062a..4b506388589 100644 --- a/hbase-shaded/hbase-shaded-check-invariants/pom.xml +++ b/hbase-shaded/hbase-shaded-check-invariants/pom.xml @@ -109,6 +109,7 @@ org.slf4j:* log4j:* + ch.qos.reload4j:* commons-logging:* com.google.code.findbugs:* diff --git a/hbase-shaded/hbase-shaded-testing-util/pom.xml b/hbase-shaded/hbase-shaded-testing-util/pom.xml index e55bd42c782..f46d0f6fdb3 100644 --- a/hbase-shaded/hbase-shaded-testing-util/pom.xml +++ b/hbase-shaded/hbase-shaded-testing-util/pom.xml @@ -167,6 +167,7 @@ org.apache.htrace:* org.apache.yetus:* log4j:* + ch.qos.reload4j:* commons-logging:* org.javassist:* io.opentelemetry:* 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 7aec3d16225..027236a9343 100644 --- a/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/pom.xml +++ b/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/pom.xml @@ -98,6 +98,7 @@ org.slf4j:* log4j:* + ch.qos.reload4j:* commons-logging:* com.google.code.findbugs:* diff --git a/pom.xml b/pom.xml index b1c8b2418c5..34925d59e51 100755 --- a/pom.xml +++ b/pom.xml @@ -1533,7 +1533,7 @@ 1.3 1.0.1 1.0.1 - 1.2.18.3 + 1.2.19 2.28.2 com.google.protobuf