Skip to content

Commit 242169c

Browse files
authored
Fix alignment of commons-beanutils version in Cruise Control (strimzi#12285)
Signed-off-by: Jakub Scholz <www@scholzj.com>
1 parent a043ab6 commit 242169c

1 file changed

Lines changed: 19 additions & 0 deletions

File tree

  • docker-images/artifacts/kafka-thirdparty-libs/cc

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<properties>
1919
<cruise-control.version>2.5.146</cruise-control.version>
2020
<log4j.version>2.17.2</log4j.version>
21+
<commons-beanutils.version>1.11.0</commons-beanutils.version>
2122
</properties>
2223

2324
<repositories>
@@ -40,5 +41,23 @@
4041
<version>${log4j.version}</version>
4142
<scope>runtime</scope>
4243
</dependency>
44+
<!-- Cruise Control overrides the Beanutils dependency to 1.11.0 to avoid CVE-2025-48734 in its Gradle build.
45+
But this change is incorrectly propagated into the Maven pom.xml. So we have to workaround it here and add
46+
commons-beanutils as a direct dependency.
47+
48+
This PR fixes this alignment and uses the same 1.11.0 version as Cruise Control 2.5.146 does. While we, in
49+
general, do not override Cruise Control dependencies as we are unable to fully test it, in this case,
50+
Cruise Control is actually released with commons-beanutils 1.11.0. But it is not properly added to its
51+
pom.xml file. So in this case, we are just aligning properly with Cruise Control rather than changing its
52+
dependencies.
53+
54+
More details can be found in https://github.com/strimzi/strimzi-kafka-operator/issues/12284.
55+
-->
56+
<dependency>
57+
<groupId>commons-beanutils</groupId>
58+
<artifactId>commons-beanutils</artifactId>
59+
<version>${commons-beanutils.version}</version>
60+
<scope>runtime</scope>
61+
</dependency>
4362
</dependencies>
4463
</project>

0 commit comments

Comments
 (0)