From 0396589ca343068865e13677e621236bb965c3e2 Mon Sep 17 00:00:00 2001 From: Norbert Meszaros Date: Wed, 7 May 2025 17:45:07 +0200 Subject: [PATCH 1/5] PHOENIX-7600 - Replace commons-logging with slf4j --- phoenix-queryserver-it/pom.xml | 5 +++++ phoenix-queryserver-orchestrator/pom.xml | 5 +++++ pom.xml | 10 ++++++++++ 3 files changed, 20 insertions(+) diff --git a/phoenix-queryserver-it/pom.xml b/phoenix-queryserver-it/pom.xml index 04103bc..6d3f422 100644 --- a/phoenix-queryserver-it/pom.xml +++ b/phoenix-queryserver-it/pom.xml @@ -208,6 +208,11 @@ log4j-slf4j-impl test + + org.slf4j + jcl-over-slf4j + test + org.apache.logging.log4j log4j-1.2-api diff --git a/phoenix-queryserver-orchestrator/pom.xml b/phoenix-queryserver-orchestrator/pom.xml index a383550..d24430c 100644 --- a/phoenix-queryserver-orchestrator/pom.xml +++ b/phoenix-queryserver-orchestrator/pom.xml @@ -59,6 +59,11 @@ org.slf4j slf4j-api + + org.slf4j + jcl-over-slf4j + test + net.sourceforge.argparse4j argparse4j diff --git a/pom.xml b/pom.xml index 687676f..d891aeb 100644 --- a/pom.xml +++ b/pom.xml @@ -761,6 +761,12 @@ slf4j-api ${slf4j.version} + + org.slf4j + jcl-over-slf4j + ${slf4j.version} + test + org.apache.logging.log4j log4j-api @@ -809,6 +815,10 @@ org.jruby jruby-complete + + commons-logging + commons-logging + From 1e1c1b54591649f31eabf4153e51e0b29d3f1767 Mon Sep 17 00:00:00 2001 From: Norbert Meszaros Date: Mon, 12 May 2025 14:08:42 +0200 Subject: [PATCH 2/5] PHOENIX-7600 - Added jcl-over-slf4j to the python files and to the assembly --- bin/phoenix_queryserver_utils.py | 5 +++++ bin/queryserver.py | 1 + phoenix-queryserver-assembly/src/assembly/cluster.xml | 1 + 3 files changed, 7 insertions(+) diff --git a/bin/phoenix_queryserver_utils.py b/bin/phoenix_queryserver_utils.py index 2013873..190c9dd 100755 --- a/bin/phoenix_queryserver_utils.py +++ b/bin/phoenix_queryserver_utils.py @@ -85,6 +85,7 @@ def setPath(): PHOENIX_LOADBALANCER_JAR_PATTERN = "load-balancer-*[!t][!e][!s][!t][!s].jar" SQLLINE_WITH_DEPS_PATTERN = "sqlline-*-jar-with-dependencies.jar" SLF4J_BACKEND_JAR_PATTERN = "log4j-slf4j*.jar" + JCL_OVER_SLF4J_PATTERN = "jcl-over-slf4j*.jar" LOGGING_JAR_PATTERN = "log4j-core*.jar" LOGGING_JAR_PATTERN2 = "log4j-api*.jar" LOGGING_JAR_PATTERN3 = "log4j-1.2-api*.jar" @@ -172,6 +173,9 @@ def setPath(): if slf4j_backend_jar is None or slf4j_backend_jar == "": slf4j_backend_jar = findFileInPathWithoutRecursion(SLF4J_BACKEND_JAR_PATTERN, os.path.join(current_dir, "..","lib")) + global jcl_over_slf4j + jcl_over_slf4j = findFileInPathWithoutRecursion(JCL_OVER_SLF4J_PATTERN, os.path.join(current_dir, "..","lib")) + global logging_jar logging_jar = os.environ.get(OVERRIDE_LOGGING) if logging_jar is None or logging_jar == "": @@ -290,6 +294,7 @@ def common_sqlline_args(parser): print("phoenix_thin_client_jar:", phoenix_thin_client_jar) print("sqlline_with_deps_jar", sqlline_with_deps_jar) print("slf4j_backend_jar:", slf4j_backend_jar) + print("jcl_over_slf4j:", jcl_over_slf4j) print("java_home:", java_home) print("java:", java) print("jvm_module_flags:", jvm_module_flags) diff --git a/bin/queryserver.py b/bin/queryserver.py index 8120d9b..13e8a74 100755 --- a/bin/queryserver.py +++ b/bin/queryserver.py @@ -100,6 +100,7 @@ hadoop_conf_dir + os.pathsep + \ phoenix_queryserver_utils.slf4j_backend_jar + os.pathsep + \ phoenix_queryserver_utils.logging_jar + os.pathsep + \ + phoenix_queryserver_utils.jcl_over_slf4j + os.pathsep + \ phoenix_queryserver_utils.phoenix_client_jar + os.pathsep + \ phoenix_queryserver_utils.phoenix_queryserver_jar + \ " -Dproc_phoenixserver" + \ diff --git a/phoenix-queryserver-assembly/src/assembly/cluster.xml b/phoenix-queryserver-assembly/src/assembly/cluster.xml index d0ed572..473669c 100644 --- a/phoenix-queryserver-assembly/src/assembly/cluster.xml +++ b/phoenix-queryserver-assembly/src/assembly/cluster.xml @@ -63,6 +63,7 @@ org.apache.logging.log4j:log4j-api org.apache.logging.log4j:log4j-core org.apache.logging.log4j:log4j-1.2-api + org.slf4j:jcl-over-slf4j From 59ec05792f46b8180c188353e1605be9bdef7eb1 Mon Sep 17 00:00:00 2001 From: Norbert Meszaros Date: Wed, 14 May 2025 14:43:01 +0200 Subject: [PATCH 3/5] PHOENIX-7600 - Forgotten dependency added --- phoenix-queryserver-assembly/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/phoenix-queryserver-assembly/pom.xml b/phoenix-queryserver-assembly/pom.xml index f3bb867..8fb7211 100644 --- a/phoenix-queryserver-assembly/pom.xml +++ b/phoenix-queryserver-assembly/pom.xml @@ -62,6 +62,10 @@ org.apache.logging.log4j log4j-1.2-api + + org.slf4j + jcl-over-slf4j + From 88e65dae5fbf9c89d3701528092313f3efda041b Mon Sep 17 00:00:00 2001 From: Norbert Meszaros Date: Wed, 14 May 2025 14:54:46 +0200 Subject: [PATCH 4/5] PHOENIX-7600 - Test scope removed from parent pom --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index d891aeb..ef8b697 100644 --- a/pom.xml +++ b/pom.xml @@ -765,7 +765,6 @@ org.slf4j jcl-over-slf4j ${slf4j.version} - test org.apache.logging.log4j From 9733095b016563ac695d411b36607bbef297e22e Mon Sep 17 00:00:00 2001 From: Norbert Meszaros Date: Thu, 15 May 2025 10:13:42 +0200 Subject: [PATCH 5/5] PHOENIX-7600 - Added ignoreNonCompile to orchestrator dependency plugin --- phoenix-queryserver-orchestrator/pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/phoenix-queryserver-orchestrator/pom.xml b/phoenix-queryserver-orchestrator/pom.xml index d24430c..8431f50 100644 --- a/phoenix-queryserver-orchestrator/pom.xml +++ b/phoenix-queryserver-orchestrator/pom.xml @@ -49,6 +49,8 @@ org.apache.hbase:hbase-it + + true