Skip to content

Commit cef7cd1

Browse files
Simplify code, fixed dep CVE
1 parent 7f11715 commit cef7cd1

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

build.gradle

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import com.github.stickerifier.stickerify.JlinkJavaLauncher
22
import com.github.stickerifier.stickerify.JlinkTask
3-
import org.gradle.api.plugins.jvm.JvmTestSuite
4-
import org.gradle.buildconfiguration.tasks.UpdateDaemonJvm
53

64
plugins {
75
id 'application'
@@ -30,8 +28,11 @@ dependencies {
3028
implementation libs.tika
3129

3230
constraints {
33-
implementation(libs.okio) {
34-
because 'CVE-2023-3635: Okio Signed to Unsigned Conversion Error vulnerability'
31+
implementation('org.apache.commons:commons-lang3') {
32+
version {
33+
strictly('[3.18.0, 4[')
34+
}
35+
because 'CVE-2025-48924: Apache Commons Lang is vulnerable to Uncontrolled Recursion when processing long inputs'
3536
}
3637
}
3738
}
@@ -45,7 +46,7 @@ java.toolchain {
4546
vendor = JvmVendorSpec.AZUL
4647
}
4748

48-
tasks.named('updateDaemonJvm', UpdateDaemonJvm) {
49+
updateDaemonJvm {
4950
languageVersion = JavaLanguageVersion.of(24)
5051
vendor = JvmVendorSpec.AZUL
5152
}
@@ -60,7 +61,7 @@ def jlink = tasks.register('jlink', JlinkTask) {
6061

6162
testing {
6263
suites {
63-
named('test', JvmTestSuite) {
64+
test {
6465
useJUnitJupiter(libs.versions.junit)
6566

6667
dependencies {
@@ -69,7 +70,7 @@ testing {
6970
}
7071

7172
targets {
72-
configureEach {
73+
all {
7374
testTask.configure { Test test ->
7475
test.inputs.dir jlink.get().outputDirectory
7576
test.javaLauncher = new JlinkJavaLauncher(jlink.get())

gradle/libs.versions.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ jave = "ws.schild:jave-core:3.5.0"
1414
logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
1515
logback-core = { module = "ch.qos.logback:logback-core", version.ref = "logback" }
1616
mockwebserver = "com.squareup.okhttp3:mockwebserver3-junit5:5.1.0"
17-
okio = "com.squareup.okio:okio:3.16.0"
1817
scrimage-core = { module = "com.sksamuel.scrimage:scrimage-core", version.ref = "scrimage" }
1918
scrimage-formats-extra = { module = "com.sksamuel.scrimage:scrimage-formats-extra", version.ref = "scrimage" }
2019
scrimage-webp = { module = "com.sksamuel.scrimage:scrimage-webp", version.ref = "scrimage" }

0 commit comments

Comments
 (0)