diff --git a/bin/phoenix_utils.py b/bin/phoenix_utils.py index 27032df5f13..e08544c2894 100755 --- a/bin/phoenix_utils.py +++ b/bin/phoenix_utils.py @@ -93,7 +93,7 @@ def setPath(): PHOENIX_TRACESERVER_JAR_PATTERN = "phoenix-tracing-webapp-*-runnable.jar" PHOENIX_TESTS_JAR_PATTERN = "phoenix-core-*-tests*.jar" PHOENIX_PHERF_JAR_PATTERN = "phoenix-pherf-*[!s].jar" - SLF4J_BACKEND_JAR_PATTERN = "log4j-slf4j*.jar" + SLF4J_BACKEND_JAR_PATTERN = "log4j-slf4j2*.jar" LOGGING_JAR_PATTERN = "log4j-core*.jar" LOGGING_JAR_PATTERN2 = "log4j-api*.jar" LOGGING_JAR_PATTERN3 = "log4j-1.2-api*.jar" diff --git a/phoenix-assembly/src/build/components/all-common-dependencies.xml b/phoenix-assembly/src/build/components/all-common-dependencies.xml index 9ed81f0afa5..98e838d9d4c 100644 --- a/phoenix-assembly/src/build/components/all-common-dependencies.xml +++ b/phoenix-assembly/src/build/components/all-common-dependencies.xml @@ -26,7 +26,7 @@ sqlline:sqlline:jar:jar-with-dependencies org.slf4j:jul-to-slf4j org.slf4j:jcl-over-slf4j - org.apache.logging.log4j:log4j-slf4j-impl + org.apache.logging.log4j:log4j-slf4j2-impl org.apache.logging.log4j:log4j-api org.apache.logging.log4j:log4j-core org.apache.logging.log4j:log4j-1.2-api diff --git a/phoenix-core-client/pom.xml b/phoenix-core-client/pom.xml index 07769c9f685..e8f11743587 100644 --- a/phoenix-core-client/pom.xml +++ b/phoenix-core-client/pom.xml @@ -391,7 +391,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl org.apache.logging.log4j diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index 32080670f14..2b7d4b4648f 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -381,7 +381,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl test @@ -442,7 +442,7 @@ org.apache.phoenix:phoenix-hbase-compat-${hbase.compat.version} org.apache.logging.log4j:log4j-api org.apache.logging.log4j:log4j-core - org.apache.logging.log4j:log4j-slf4j-impl + org.apache.logging.log4j:log4j-slf4j2-impl org.apache.logging.log4j:log4j-1.2-api org.slf4j:jul-to-slf4j org.slf4j:jcl-over-slf4j diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml index 2a6a8c4e3f6..9528ce8920b 100644 --- a/phoenix-pherf/pom.xml +++ b/phoenix-pherf/pom.xml @@ -181,7 +181,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl test @@ -295,7 +295,7 @@ org.apache.hbase:hbase-testing-util org.apache.logging.log4j:log4j-api org.apache.logging.log4j:log4j-core - org.apache.logging.log4j:log4j-slf4j-impl + org.apache.logging.log4j:log4j-slf4j2-impl org.apache.logging.log4j:log4j-1.2-api org.slf4j:jul-to-slf4j org.slf4j:jcl-over-slf4j diff --git a/phoenix-tracing-webapp/pom.xml b/phoenix-tracing-webapp/pom.xml index 3dd2cecadc8..9d219b4e442 100755 --- a/phoenix-tracing-webapp/pom.xml +++ b/phoenix-tracing-webapp/pom.xml @@ -68,7 +68,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl org.apache.logging.log4j diff --git a/pom.xml b/pom.xml index b1e72db4240..ac76f56ad86 100644 --- a/pom.xml +++ b/pom.xml @@ -98,9 +98,9 @@ 3.5.2 1.2.19 - 2.18.0 + 2.25.1 3.3.6 - 1.7.36 + 2.0.17 com.google.protobuf 2.5.0 @@ -1398,7 +1398,7 @@ org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl ${log4j2.version} @@ -1609,7 +1609,7 @@ org.apache.hbase:hbase-testing-util org.apache.logging.log4j:log4j-api org.apache.logging.log4j:log4j-core - org.apache.logging.log4j:log4j-slf4j-impl + org.apache.logging.log4j:log4j-slf4j2-impl org.apache.logging.log4j:log4j-1.2-api