Skip to content

Commit b0a7077

Browse files
committed
Work around CVE-2025-48924 for Checkstyle as well
1 parent 2870b7d commit b0a7077

File tree

3 files changed

+20
-13
lines changed

3 files changed

+20
-13
lines changed

gradle/libs.versions.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ junit4 = "4.13.2"
1414
junit4Min = "4.12"
1515
ktlint = "1.7.0"
1616
log4j = "2.25.1"
17-
logback = "1.5.18"
1817
opentest4j = "1.3.0"
1918
openTestReporting = "0.2.4"
2019
snapshotTests = "1.11.0"
@@ -82,7 +81,6 @@ eclipse-platform = { module = "org.eclipse.platform:org.eclipse.platform", versi
8281
jacoco = { module = "org.jacoco:jacoco", version.ref = "jacoco" }
8382
junit4-latest = { module = "junit:junit", version.ref = "junit4" }
8483
junit4-bundle = { module = "org.apache.servicemix.bundles:org.apache.servicemix.bundles.junit", version = "4.13.2_1" }
85-
logback-core = { module = "ch.qos.logback:logback-core", version.ref = "logback" }
8684
ktlint-cli = { module = "com.pinterest.ktlint:ktlint-cli", version.ref = "ktlint" }
8785

8886
[bundles]

gradle/plugins/common/src/main/kotlin/junitbuild.checkstyle-conventions.gradle.kts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,17 @@ plugins {
55
checkstyle
66
}
77

8+
dependencies {
9+
constraints {
10+
checkstyle("org.apache.commons:commons-lang3") {
11+
version {
12+
require("3.18.0")
13+
}
14+
because("Workaround for CVE-2025-48924")
15+
}
16+
}
17+
}
18+
819
checkstyle {
920
toolVersion = requiredVersionFromLibs("checkstyle")
1021
configDirectory = rootProject.layout.projectDirectory.dir("gradle/config/checkstyle")

gradle/plugins/common/src/main/kotlin/junitbuild.checkstyle-nohttp.gradle.kts

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,17 @@ plugins {
77

88
dependencies {
99
checkstyle(dependencyFromLibs("nohttp-checkstyle"))
10-
}
11-
12-
configurations.checkstyle {
13-
resolutionStrategy {
14-
eachDependency {
15-
// Workaround for CVE-2024-12798 and CVE-2024-12801
16-
if (requested.group == "ch.qos.logback") {
17-
useVersion(requiredVersionFromLibs("logback"))
10+
constraints {
11+
checkstyle("com.puppycrawl.tools:checkstyle") {
12+
version {
13+
require(requiredVersionFromLibs("checkstyle"))
1814
}
19-
// Workaround for CVE-2025-48734
20-
if (requested.group == "commons-beanutils") {
21-
useVersion("1.11.0")
15+
}
16+
checkstyle("ch.qos.logback:logback-classic") {
17+
version {
18+
require("1.5.18")
2219
}
20+
because("Workaround for CVE-2024-12798 and CVE-2024-12801")
2321
}
2422
}
2523
}

0 commit comments

Comments
 (0)