Skip to content

Commit f1e387e

Browse files
committed
PHOENIX-7680 Update slf4j in Phoenix related repos
1 parent 20e1f62 commit f1e387e

File tree

7 files changed

+12
-12
lines changed

7 files changed

+12
-12
lines changed

bin/phoenix_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def setPath():
9393
PHOENIX_TRACESERVER_JAR_PATTERN = "phoenix-tracing-webapp-*-runnable.jar"
9494
PHOENIX_TESTS_JAR_PATTERN = "phoenix-core-*-tests*.jar"
9595
PHOENIX_PHERF_JAR_PATTERN = "phoenix-pherf-*[!s].jar"
96-
SLF4J_BACKEND_JAR_PATTERN = "log4j-slf4j*.jar"
96+
SLF4J_BACKEND_JAR_PATTERN = "log4j-slf4j2*.jar"
9797
LOGGING_JAR_PATTERN = "log4j-core*.jar"
9898
LOGGING_JAR_PATTERN2 = "log4j-api*.jar"
9999
LOGGING_JAR_PATTERN3 = "log4j-1.2-api*.jar"

phoenix-assembly/src/build/components/all-common-dependencies.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<include>sqlline:sqlline:jar:jar-with-dependencies</include>
2727
<include>org.slf4j:jul-to-slf4j</include>
2828
<include>org.slf4j:jcl-over-slf4j</include>
29-
<include>org.apache.logging.log4j:log4j-slf4j-impl</include>
29+
<include>org.apache.logging.log4j:log4j-slf4j2-impl</include>
3030
<include>org.apache.logging.log4j:log4j-api</include>
3131
<include>org.apache.logging.log4j:log4j-core</include>
3232
<include>org.apache.logging.log4j:log4j-1.2-api</include>

phoenix-core-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@
391391
</artifactItem>
392392
<artifactItem>
393393
<groupId>org.apache.logging.log4j</groupId>
394-
<artifactId>log4j-slf4j-impl</artifactId>
394+
<artifactId>log4j-slf4j2-impl</artifactId>
395395
</artifactItem>
396396
<artifactItem>
397397
<groupId>org.apache.logging.log4j</groupId>

phoenix-core/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@
381381
</dependency>
382382
<dependency>
383383
<groupId>org.apache.logging.log4j</groupId>
384-
<artifactId>log4j-slf4j-impl</artifactId>
384+
<artifactId>log4j-slf4j2-impl</artifactId>
385385
<scope>test</scope>
386386
</dependency>
387387
<dependency>
@@ -442,7 +442,7 @@
442442
<ignoredUnusedDeclaredDependency>org.apache.phoenix:phoenix-hbase-compat-${hbase.compat.version}</ignoredUnusedDeclaredDependency>
443443
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-api</ignoredUnusedDeclaredDependency>
444444
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-core</ignoredUnusedDeclaredDependency>
445-
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-slf4j-impl</ignoredUnusedDeclaredDependency>
445+
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-slf4j2-impl</ignoredUnusedDeclaredDependency>
446446
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-1.2-api</ignoredUnusedDeclaredDependency>
447447
<ignoredUnusedDeclaredDependency>org.slf4j:jul-to-slf4j</ignoredUnusedDeclaredDependency>
448448
<ignoredUnusedDeclaredDependency>org.slf4j:jcl-over-slf4j</ignoredUnusedDeclaredDependency>

phoenix-pherf/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@
181181
</dependency>
182182
<dependency>
183183
<groupId>org.apache.logging.log4j</groupId>
184-
<artifactId>log4j-slf4j-impl</artifactId>
184+
<artifactId>log4j-slf4j2-impl</artifactId>
185185
<scope>test</scope>
186186
</dependency>
187187
<dependency>
@@ -295,7 +295,7 @@
295295
<ignoredUnusedDeclaredDependency>org.apache.hbase:hbase-testing-util</ignoredUnusedDeclaredDependency>
296296
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-api</ignoredUnusedDeclaredDependency>
297297
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-core</ignoredUnusedDeclaredDependency>
298-
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-slf4j-impl</ignoredUnusedDeclaredDependency>
298+
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-slf4j2-impl</ignoredUnusedDeclaredDependency>
299299
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-1.2-api</ignoredUnusedDeclaredDependency>
300300
<ignoredUnusedDeclaredDependency>org.slf4j:jul-to-slf4j</ignoredUnusedDeclaredDependency>
301301
<ignoredUnusedDeclaredDependency>org.slf4j:jcl-over-slf4j</ignoredUnusedDeclaredDependency>

phoenix-tracing-webapp/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
</dependency>
6969
<dependency>
7070
<groupId>org.apache.logging.log4j</groupId>
71-
<artifactId>log4j-slf4j-impl</artifactId>
71+
<artifactId>log4j-slf4j2-impl</artifactId>
7272
</dependency>
7373
<dependency>
7474
<groupId>org.apache.logging.log4j</groupId>

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@
9898
<antlr.version>3.5.2</antlr.version>
9999
<!-- Only used for tests with HBase 2.1-2.4 -->
100100
<reload4j.version>1.2.19</reload4j.version>
101-
<log4j2.version>2.18.0</log4j2.version>
101+
<log4j2.version>2.25.1</log4j2.version>
102102
<disruptor.version>3.3.6</disruptor.version>
103-
<slf4j.version>1.7.36</slf4j.version>
103+
<slf4j.version>2.0.17</slf4j.version>
104104
<!-- com.google repo will be used except on Aarch64 platform. -->
105105
<protobuf.group>com.google.protobuf</protobuf.group>
106106
<protobuf-java.version>2.5.0</protobuf-java.version>
@@ -1398,7 +1398,7 @@
13981398
</dependency>
13991399
<dependency>
14001400
<groupId>org.apache.logging.log4j</groupId>
1401-
<artifactId>log4j-slf4j-impl</artifactId>
1401+
<artifactId>log4j-slf4j2-impl</artifactId>
14021402
<version>${log4j2.version}</version>
14031403
</dependency>
14041404
<dependency>
@@ -1609,7 +1609,7 @@
16091609
<ignoredUnusedDeclaredDependency>org.apache.hbase:hbase-testing-util</ignoredUnusedDeclaredDependency>
16101610
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-api</ignoredUnusedDeclaredDependency>
16111611
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-core</ignoredUnusedDeclaredDependency>
1612-
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-slf4j-impl</ignoredUnusedDeclaredDependency>
1612+
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-slf4j2-impl</ignoredUnusedDeclaredDependency>
16131613
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-1.2-api</ignoredUnusedDeclaredDependency>
16141614
</ignoredUnusedDeclaredDependencies>
16151615
<ignoredUsedUndeclaredDependencies>

0 commit comments

Comments
 (0)