Skip to content

Commit 8024f74

Browse files
Update log4j version to 2.25.0 and slf4j to 2.0.17 (#11629)
Signed-off-by: MichaelMorris <michael.morris@est.tech>
1 parent 20f5c85 commit 8024f74

File tree

10 files changed

+54
-46
lines changed

10 files changed

+54
-46
lines changed

api/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
</dependency>
8686
<dependency>
8787
<groupId>org.apache.logging.log4j</groupId>
88-
<artifactId>log4j-slf4j-impl</artifactId>
88+
<artifactId>log4j-slf4j2-impl</artifactId>
8989
<scope>test</scope>
9090
</dependency>
9191
<dependency>
@@ -278,7 +278,7 @@
278278
<!-- Needed for logging in tests -->
279279
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-core</ignoredUnusedDeclaredDependency>
280280
<!-- Needed for logging in tests using the Kubernetes Client (uses SLF4J) -->
281-
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-slf4j-impl</ignoredUnusedDeclaredDependency>
281+
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-slf4j2-impl</ignoredUnusedDeclaredDependency>
282282
</ignoredUnusedDeclaredDependencies>
283283
</configuration>
284284
</execution>

cluster-operator/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
</dependency>
137137
<dependency>
138138
<groupId>org.apache.logging.log4j</groupId>
139-
<artifactId>log4j-slf4j-impl</artifactId>
139+
<artifactId>log4j-slf4j2-impl</artifactId>
140140
</dependency>
141141
<dependency>
142142
<groupId>org.apache.logging.log4j</groupId>
@@ -326,7 +326,7 @@
326326
<!-- Needed for logging -->
327327
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-core</ignoredUnusedDeclaredDependency>
328328
<!-- Needed for logging using the Kubernetes Client (uses SLF4J) -->
329-
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-slf4j-impl</ignoredUnusedDeclaredDependency>
329+
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-slf4j2-impl</ignoredUnusedDeclaredDependency>
330330
<!-- Needed for adding new appender JsonTemplateLayout support for logging, it's a runtime dep -->
331331
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-layout-template-json</ignoredUnusedDeclaredDependency>
332332
<!-- Used to provide native epoll for Netty-->

kafka-init/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
</dependency>
6161
<dependency>
6262
<groupId>org.apache.logging.log4j</groupId>
63-
<artifactId>log4j-slf4j-impl</artifactId>
63+
<artifactId>log4j-slf4j2-impl</artifactId>
6464
</dependency>
6565
<dependency>
6666
<groupId>org.junit.jupiter</groupId>
@@ -120,7 +120,7 @@
120120
<!-- Needed for logging -->
121121
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-core</ignoredUnusedDeclaredDependency>
122122
<!-- Needed for logging using the Kubernetes Client (uses SLF4J) -->
123-
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-slf4j-impl</ignoredUnusedDeclaredDependency>
123+
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-slf4j2-impl</ignoredUnusedDeclaredDependency>
124124
</ignoredUnusedDeclaredDependencies>
125125
</configuration>
126126
</execution>

mockkube/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</dependency>
2828
<dependency>
2929
<groupId>org.apache.logging.log4j</groupId>
30-
<artifactId>log4j-slf4j-impl</artifactId>
30+
<artifactId>log4j-slf4j2-impl</artifactId>
3131
</dependency>
3232
<dependency>
3333
<groupId>io.fabric8</groupId>
@@ -122,7 +122,7 @@
122122
<!-- Needed for logging in tests -->
123123
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-core</ignoredUnusedDeclaredDependency>
124124
<!-- Needed for logging in tests using the Kubernetes Client (uses SLF4J) -->
125-
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-slf4j-impl</ignoredUnusedDeclaredDependency>
125+
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-slf4j2-impl</ignoredUnusedDeclaredDependency>
126126
<!-- JUnit dependency is needed at compile time because MockKube is instantiating the KindContainer in regular scope -->
127127
<ignoredUnusedDeclaredDependency>junit:junit</ignoredUnusedDeclaredDependency>
128128
</ignoredUnusedDeclaredDependencies>
@@ -133,4 +133,4 @@
133133
</plugins>
134134
</build>
135135

136-
</project>
136+
</project>

operator-common/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
</dependency>
111111
<dependency>
112112
<groupId>org.apache.logging.log4j</groupId>
113-
<artifactId>log4j-slf4j-impl</artifactId>
113+
<artifactId>log4j-slf4j2-impl</artifactId>
114114
</dependency>
115115
<dependency>
116116
<groupId>org.junit.jupiter</groupId>
@@ -176,12 +176,12 @@
176176
<!-- Needed for logging in tests -->
177177
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-core</ignoredUnusedDeclaredDependency>
178178
<!-- Needed for logging in tests using the Kubernetes Client (uses SLF4J) -->
179-
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-slf4j-impl</ignoredUnusedDeclaredDependency>
179+
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-slf4j2-impl</ignoredUnusedDeclaredDependency>
180180
</ignoredUnusedDeclaredDependencies>
181181
</configuration>
182182
</execution>
183183
</executions>
184184
</plugin>
185185
</plugins>
186186
</build>
187-
</project>
187+
</project>

pom.xml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,8 @@
104104
<kafka.version>4.1.0</kafka.version>
105105
<yammer-metrics.version>2.2.0</yammer-metrics.version>
106106
<snappy.version>1.1.10.5</snappy.version>
107-
<!-- Used for test-frame and the systemtests-->
108-
<slf4j2.version>2.0.16</slf4j2.version>
109-
<log4j2.version>2.24.1</log4j2.version>
110-
111-
<slf4j.version>1.7.36</slf4j.version>
112-
<log4j.version>2.17.2</log4j.version>
107+
<slf4j.version>2.0.17</slf4j.version>
108+
<log4j.version>2.25.0</log4j.version>
113109
<quartz.version>2.3.2</quartz.version>
114110
<opentelemetry.version>1.34.1</opentelemetry.version>
115111
<opentelemetry-alpha.version>${opentelemetry.version}-alpha</opentelemetry-alpha.version>
@@ -379,7 +375,7 @@
379375
</dependency>
380376
<dependency>
381377
<groupId>org.apache.logging.log4j</groupId>
382-
<artifactId>log4j-slf4j-impl</artifactId>
378+
<artifactId>log4j-slf4j2-impl</artifactId>
383379
<version>${log4j.version}</version>
384380
</dependency>
385381
<dependency>

systemtest/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,10 @@
4848
<dependency>
4949
<groupId>org.apache.logging.log4j</groupId>
5050
<artifactId>log4j-api</artifactId>
51-
<version>${log4j2.version}</version>
5251
</dependency>
5352
<dependency>
5453
<groupId>org.apache.logging.log4j</groupId>
5554
<artifactId>log4j-core</artifactId>
56-
<version>${log4j2.version}</version>
5755
</dependency>
5856
<dependency>
5957
<groupId>io.strimzi</groupId>
@@ -119,12 +117,10 @@
119117
<dependency>
120118
<groupId>org.slf4j</groupId>
121119
<artifactId>slf4j-api</artifactId>
122-
<version>${slf4j2.version}</version>
123120
</dependency>
124121
<dependency>
125122
<groupId>org.apache.logging.log4j</groupId>
126123
<artifactId>log4j-slf4j2-impl</artifactId>
127-
<version>${log4j2.version}</version>
128124
</dependency>
129125
<dependency>
130126
<groupId>io.fabric8</groupId>

systemtest/src/test/java/io/strimzi/systemtest/log/LogSettingST.java

Lines changed: 35 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -113,41 +113,57 @@ class LogSettingST extends AbstractST {
113113

114114
private static final Map<String, String> KAFKA_LOGGERS = new HashMap<>() {
115115
{
116-
put("kafka.root.logger.level", INFO);
117-
put("test.kafka.logger.level", INFO);
118-
put("log4j.logger.kafka", TRACE);
119-
put("log4j.logger.org.apache.kafka", DEBUG);
120-
put("log4j.logger.kafka.request.logger", FATAL);
121-
put("log4j.logger.kafka.network.Processor", OFF);
122-
123-
put("log4j.logger.kafka.server.KafkaApis", INFO);
124-
put("log4j.logger.kafka.network.RequestChannel$", ERROR);
125-
put("log4j.logger.kafka.controller", WARN);
126-
put("log4j.logger.kafka.log.LogCleaner", TRACE);
127-
put("log4j.logger.state.change.logger", DEBUG);
128-
put("log4j.logger.kafka.authorizer.logger", FATAL);
116+
put("rootLogger.level", INFO);
117+
put("logger.test.name", "test.kafka");
118+
put("logger.test.level", INFO);
119+
put("logger.kafka.name", "kafka");
120+
put("logger.kafka.level", TRACE);
121+
put("logger.orgapachekafka.name", "org.apache.kafka");
122+
put("logger.orgapachekafka.level", DEBUG);
123+
put("logger.request.name", "kafka.request.logger");
124+
put("logger.request.level", FATAL);
125+
put("logger.network.name", "network.Processor");
126+
put("logger.network.level", OFF);
127+
128+
put("logger.server.name", "kafka.server.KafkaApis");
129+
put("logger.server.level", INFO);
130+
put("logger.network.name", "kafka.network.RequestChannel$");
131+
put("logger.network.level", ERROR);
132+
put("logger.controller.name", "kafka.controller");
133+
put("logger.controller.level", WARN);
134+
put("logger.log.name", "kafka.log.LogCleaner");
135+
put("logger.log.level", TRACE);
136+
put("logger.state.name", "state.change");
137+
put("logger.state.level", DEBUG);
138+
put("logger.authorizer.name", "kafka.authorizer");
139+
put("logger.authorizer.level", FATAL);
140+
129141
}
130142
};
131143

132144
private static final Map<String, String> CONNECT_LOGGERS = new HashMap<>() {
133145
{
134-
put("connect.root.logger.level", INFO);
135-
put("test.connect.logger.level", DEBUG);
136-
put("log4j.logger.org.reflections", WARN);
146+
put("rootLogger.level", INFO);
147+
put("logger.test.name", "test.connect");
148+
put("logger.test.level", DEBUG);
149+
put("logger.reflections.name", "org.reflections");
150+
put("logger.reflections.level", WARN);
137151
}
138152
};
139153

140154
private static final Map<String, String> OPERATORS_LOGGERS = new HashMap<>() {
141155
{
142156
put("rootLogger.level", DEBUG);
143-
put("test.operator.logger.level", DEBUG);
157+
put("logger.operator.name", "io.strimzi.operator");
158+
put("logger.operator.level", DEBUG);
144159
}
145160
};
146161

147162
private static final Map<String, String> MIRROR_MAKER_2_LOGGERS = new HashMap<>() {
148163
{
149-
put("mirrormaker.root.logger", TRACE);
150-
put("test.mirrormaker.logger.level", TRACE);
164+
put("rootLogger.level", TRACE);
165+
put("logger.test.name", "test.mirrormaker");
166+
put("logger.test.level", TRACE);
151167
}
152168
};
153169

topic-operator/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
</dependency>
6161
<dependency>
6262
<groupId>org.apache.logging.log4j</groupId>
63-
<artifactId>log4j-slf4j-impl</artifactId>
63+
<artifactId>log4j-slf4j2-impl</artifactId>
6464
</dependency>
6565
<dependency>
6666
<groupId>org.apache.logging.log4j</groupId>
@@ -204,7 +204,7 @@
204204
<ignoredUnusedDeclaredDependencies>
205205
<ignoredUnusedDeclaredDependency>io.fabric8:kubernetes-client</ignoredUnusedDeclaredDependency>
206206
<ignoredUnusedDeclaredDependency>io.fabric8:kubernetes-httpclient-jdk</ignoredUnusedDeclaredDependency>
207-
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-slf4j-impl</ignoredUnusedDeclaredDependency>
207+
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-slf4j2-impl</ignoredUnusedDeclaredDependency>
208208
<ignoredUnusedDeclaredDependency>org.mockito:mockito-inline</ignoredUnusedDeclaredDependency>
209209
<!-- Needed for adding new appender JsonTemplateLayout support for logging, it's a runtime dep -->
210210
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-layout-template-json</ignoredUnusedDeclaredDependency>

user-operator/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
</dependency>
6464
<dependency>
6565
<groupId>org.apache.logging.log4j</groupId>
66-
<artifactId>log4j-slf4j-impl</artifactId>
66+
<artifactId>log4j-slf4j2-impl</artifactId>
6767
</dependency>
6868
<dependency>
6969
<groupId>org.apache.logging.log4j</groupId>
@@ -163,7 +163,7 @@
163163
<!-- Needed for adding new appender JsonTemplateLayout support for logging, it's a runtime dep -->
164164
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-layout-template-json</ignoredUnusedDeclaredDependency>
165165
<!-- Needed for logging using the Kubernetes Client (uses SLF4J) -->
166-
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-slf4j-impl</ignoredUnusedDeclaredDependency>
166+
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-slf4j2-impl</ignoredUnusedDeclaredDependency>
167167
</ignoredUnusedDeclaredDependencies>
168168
</configuration>
169169
</execution>

0 commit comments

Comments
 (0)