Skip to content

PHOENIX-7600 - Replace commons-logging with slf4j #179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 15, 2025
Merged

PHOENIX-7600 - Replace commons-logging with slf4j #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0396589
PHOENIX-7600 - Replace commons-logging with slf4j
meszinorbi May 7, 2025
1e1c1b5
PHOENIX-7600 - Added jcl-over-slf4j to the python files and to the as…
meszinorbi May 12, 2025
59ec057
PHOENIX-7600 - Forgotten dependency added
meszinorbi May 14, 2025
88e65da
PHOENIX-7600 - Test scope removed from parent pom
meszinorbi May 14, 2025
9733095
PHOENIX-7600 - Added ignoreNonCompile to orchestrator dependency plugin
meszinorbi May 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions bin/phoenix_queryserver_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 == "":
Expand Down Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions bin/queryserver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" + \
Expand Down
4 changes: 4 additions & 0 deletions phoenix-queryserver-assembly/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
</dependencies>

<build>
Expand Down
1 change: 1 addition & 0 deletions phoenix-queryserver-assembly/src/assembly/cluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
<include>org.apache.logging.log4j:log4j-api</include>
<include>org.apache.logging.log4j:log4j-core</include>
<include>org.apache.logging.log4j:log4j-1.2-api</include>
<include>org.slf4j:jcl-over-slf4j</include>
</includes>
</dependencySet>
<dependencySet>
Expand Down
5 changes: 5 additions & 0 deletions phoenix-queryserver-it/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,11 @@
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
Expand Down
7 changes: 7 additions & 0 deletions phoenix-queryserver-orchestrator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@
org.apache.hbase:hbase-it
</ignoredUnusedDeclaredDependency>
</ignoredUnusedDeclaredDependencies>
<!-- dependency:analyze is quite useless for hadoop test dependencies -->
<ignoreNonCompile>true</ignoreNonCompile>
</configuration>
</plugin>
</plugins>
Expand All @@ -59,6 +61,11 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.sourceforge.argparse4j</groupId>
<artifactId>argparse4j</artifactId>
Expand Down
9 changes: 9 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,6 +761,11 @@
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
Expand Down Expand Up @@ -809,6 +814,10 @@
<groupId>org.jruby</groupId>
<artifactId>jruby-complete</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down