From 65513d9eaa71ffb2e6a8159de8679e86d1d06f62 Mon Sep 17 00:00:00 2001 From: ReaJason Date: Sun, 16 Nov 2025 12:03:28 +0800 Subject: [PATCH] build: simplify dependencies move --- vul/vul-webapp-deserialize/build.gradle.kts | 50 +++++++++------------ 1 file changed, 20 insertions(+), 30 deletions(-) diff --git a/vul/vul-webapp-deserialize/build.gradle.kts b/vul/vul-webapp-deserialize/build.gradle.kts index 94e27cf9..e350c81a 100644 --- a/vul/vul-webapp-deserialize/build.gradle.kts +++ b/vul/vul-webapp-deserialize/build.gradle.kts @@ -10,53 +10,43 @@ java { targetCompatibility = JavaVersion.VERSION_1_8 } -configurations { - create("cb110") - create("cb194") - create("cb183") - create("cb170") - create("cb161") - create("cc321") - create("cc40") -} +val dependencyCoordinates = listOf( + "commons-beanutils:commons-beanutils:1.10.0", + "commons-beanutils:commons-beanutils:1.9.4", + "commons-beanutils:commons-beanutils:1.8.3", + "commons-beanutils:commons-beanutils:1.7.0", + "commons-beanutils:commons-beanutils:1.6.1", + "commons-collections:commons-collections:3.2.1", + "org.apache.commons:commons-collections4:4.0" +) + +val filesToCopy = objects.fileCollection().from( + dependencyCoordinates.map { coordinate -> + configurations.detachedConfiguration(dependencies.create(coordinate)).apply {} + } +) dependencies { - "cb110"("commons-beanutils:commons-beanutils:1.10.0") - "cb194"("commons-beanutils:commons-beanutils:1.9.4") - "cb183"("commons-beanutils:commons-beanutils:1.8.3") - "cb170"("commons-beanutils:commons-beanutils:1.7.0") - "cb161"("commons-beanutils:commons-beanutils:1.6.1") - "cc321"("commons-collections:commons-collections:3.2.1") - "cc40"("org.apache.commons:commons-collections4:4.0") - implementation("com.caucho:hessian:4.0.66") providedCompile("javax.servlet:javax.servlet-api:3.1.0") testImplementation(libs.junit.jupiter) testRuntimeOnly(libs.junit.platform.launcher) } +val depDir = file("src/main/webapp/WEB-INF/dep") + tasks.war { duplicatesStrategy = DuplicatesStrategy.EXCLUDE - doFirst { - delete("src/main/webapp/WEB-INF/dep") copy { - from( - configurations["cb110"], - configurations["cb194"], - configurations["cb183"], - configurations["cb170"], - configurations["cb161"], - configurations["cc321"], - configurations["cc40"] - ) - into("src/main/webapp/WEB-INF/dep") + from(filesToCopy) + into(depDir) } } } tasks.clean { - delete("src/main/webapp/WEB-INF/dep") + delete(depDir) } tasks.test {