Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion bin/phoenix_queryserver_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def setPath():
PHOENIX_QUERYSERVER_JAR_PATTERN = "phoenix-queryserver-[!c]*.jar"
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"
SLF4J_BACKEND_JAR_PATTERN = "log4j-slf4j2*.jar"
JCL_OVER_SLF4J_PATTERN = "jcl-over-slf4j*.jar"
LOGGING_JAR_PATTERN = "log4j-core*.jar"
LOGGING_JAR_PATTERN2 = "log4j-api*.jar"
Expand Down
2 changes: 1 addition & 1 deletion phoenix-queryserver-assembly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<artifactId>log4j-slf4j2-impl</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
Expand Down
2 changes: 1 addition & 1 deletion phoenix-queryserver-assembly/src/assembly/cluster.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<outputDirectory>phoenix-queryserver-${project.parent.version}/lib</outputDirectory>
<includes>
<include>sqlline:sqlline:jar:jar-with-dependencies</include>
<include>org.apache.logging.log4j:log4j-slf4j-impl</include>
<include>org.apache.logging.log4j:log4j-slf4j2-impl</include>
<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>
Expand Down
7 changes: 6 additions & 1 deletion phoenix-queryserver-it/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<artifactId>log4j-slf4j2-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -218,5 +218,10 @@
<artifactId>log4j-1.2-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,11 @@
<netty-bom.version>4.1.119.Final</netty-bom.version>
<commons-io.version>2.18.0</commons-io.version>
<sqlline.version>1.9.0</sqlline.version>
<slf4j.version>1.7.36</slf4j.version>
<slf4j.version>2.0.17</slf4j.version>
<avatica.version>1.27.0</avatica.version>
<servlet.api.version>3.1.0</servlet.api.version>
<jsr305.version>3.0.0</jsr305.version>
<log4j2.version>2.20.0</log4j2.version>
<log4j2.version>2.25.1</log4j2.version>

<!-- Test Dependency versions -->
<testng.version>6.10</testng.version>
Expand Down Expand Up @@ -778,7 +778,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<artifactId>log4j-slf4j2-impl</artifactId>
<version>${log4j2.version}</version>
</dependency>
<dependency>
Expand Down