Skip to content

Commit 5d4279e

Browse files
Copilotscholzj
andauthored
Bump log4j-layout-template-json to 2.25.4 in Strimzi manifests (#12625)
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: scholzj <5658439+scholzj@users.noreply.github.com>
1 parent 5b4acbd commit 5d4279e

File tree

3 files changed

+24
-4
lines changed

3 files changed

+24
-4
lines changed

docker-images/artifacts/kafka-thirdparty-libs/4.1.2/pom.xml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<!--
1212
Changes compared to 4.1.x:
13-
- Log4j2: 2.24.3 -> 2.25.3
13+
- Log4j2: 2.24.3 -> 2.25.4
1414
- Jackson (jackson-dataformat-yaml, jackson-datatype-jsr310): 2.19.0 -> 2.19.4
1515
-->
1616

@@ -32,7 +32,7 @@
3232
<opentelemetry-alpha.version>1.34.1-alpha</opentelemetry-alpha.version>
3333
<opentelemetry.instrumentation.version>1.32.0-alpha</opentelemetry.instrumentation.version>
3434
<grpc-netty-shaded.version>1.75.0</grpc-netty-shaded.version>
35-
<log4j.version>2.25.3</log4j.version>
35+
<log4j.version>2.25.4</log4j.version>
3636
</properties>
3737

3838
<repositories>
@@ -48,6 +48,16 @@
4848
<groupId>org.apache.logging.log4j</groupId>
4949
<artifactId>log4j-layout-template-json</artifactId>
5050
<version>${log4j.version}</version>
51+
<exclusions>
52+
<exclusion>
53+
<groupId>org.apache.logging.log4j</groupId>
54+
<artifactId>log4j-api</artifactId>
55+
</exclusion>
56+
<exclusion>
57+
<groupId>org.apache.logging.log4j</groupId>
58+
<artifactId>log4j-core</artifactId>
59+
</exclusion>
60+
</exclusions>
5161
</dependency>
5262

5363
<!-- Tracing -->

docker-images/artifacts/kafka-thirdparty-libs/4.2.x/pom.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<opentelemetry-alpha.version>1.34.1-alpha</opentelemetry-alpha.version>
2727
<opentelemetry.instrumentation.version>1.32.0-alpha</opentelemetry.instrumentation.version>
2828
<grpc-netty-shaded.version>1.75.0</grpc-netty-shaded.version>
29-
<log4j.version>2.25.3</log4j.version>
29+
<log4j.version>2.25.4</log4j.version>
3030
</properties>
3131

3232
<repositories>
@@ -42,6 +42,16 @@
4242
<groupId>org.apache.logging.log4j</groupId>
4343
<artifactId>log4j-layout-template-json</artifactId>
4444
<version>${log4j.version}</version>
45+
<exclusions>
46+
<exclusion>
47+
<groupId>org.apache.logging.log4j</groupId>
48+
<artifactId>log4j-api</artifactId>
49+
</exclusion>
50+
<exclusion>
51+
<groupId>org.apache.logging.log4j</groupId>
52+
<artifactId>log4j-core</artifactId>
53+
</exclusion>
54+
</exclusions>
4555
</dependency>
4656

4757
<!-- Tracing -->

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
<yammer-metrics.version>2.2.0</yammer-metrics.version>
8989
<snappy.version>1.1.10.5</snappy.version>
9090
<slf4j.version>2.0.17</slf4j.version>
91-
<log4j.version>2.25.3</log4j.version>
91+
<log4j.version>2.25.4</log4j.version>
9292
<quartz.version>2.5.0</quartz.version>
9393
<opentelemetry.version>1.34.1</opentelemetry.version>
9494
<opentelemetry-alpha.version>${opentelemetry.version}-alpha</opentelemetry-alpha.version>

0 commit comments

Comments
 (0)