From 7553bc8efa15c0ea2fd67c196cbf15799d9233bc Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 22 Jan 2025 09:17:58 -0800 Subject: [PATCH 1/2] Exclude META-INF/maven from shaded libraries --- agent/agent-for-testing/build.gradle.kts | 1 + agent/agent/build.gradle.kts | 1 + 2 files changed, 2 insertions(+) diff --git a/agent/agent-for-testing/build.gradle.kts b/agent/agent-for-testing/build.gradle.kts index 61c4c854db7..afc5b822549 100644 --- a/agent/agent-for-testing/build.gradle.kts +++ b/agent/agent-for-testing/build.gradle.kts @@ -86,6 +86,7 @@ fun CopySpec.isolateClasses(jars: Iterable) { from(zipTree(it)) { into("inst") rename("^(.*)\\.class\$", "\$1.classdata") + exclude("META-INF/maven/**") } } } diff --git a/agent/agent/build.gradle.kts b/agent/agent/build.gradle.kts index 03fbcaad9d9..cb12162243d 100644 --- a/agent/agent/build.gradle.kts +++ b/agent/agent/build.gradle.kts @@ -207,6 +207,7 @@ fun CopySpec.isolateClasses(jars: Iterable) { rename("^(.*)\\.class\$", "\$1.classdata") // Rename LICENSE file since it clashes with license dir on non-case sensitive FSs (i.e. Mac) rename("""^LICENSE$""", "LICENSE.renamed") + exclude("META-INF/maven/**") } } from("${rootProject.projectDir}/LICENSE") { From 99c6b67256966471000db7f0d0ca315d45a8e2f6 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 22 Jan 2025 09:52:18 -0800 Subject: [PATCH 2/2] up --- agent/agent-for-testing/build.gradle.kts | 1 - agent/agent/build.gradle.kts | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/agent/agent-for-testing/build.gradle.kts b/agent/agent-for-testing/build.gradle.kts index afc5b822549..61c4c854db7 100644 --- a/agent/agent-for-testing/build.gradle.kts +++ b/agent/agent-for-testing/build.gradle.kts @@ -86,7 +86,6 @@ fun CopySpec.isolateClasses(jars: Iterable) { from(zipTree(it)) { into("inst") rename("^(.*)\\.class\$", "\$1.classdata") - exclude("META-INF/maven/**") } } } diff --git a/agent/agent/build.gradle.kts b/agent/agent/build.gradle.kts index cb12162243d..7e0b8a0927c 100644 --- a/agent/agent/build.gradle.kts +++ b/agent/agent/build.gradle.kts @@ -207,6 +207,8 @@ fun CopySpec.isolateClasses(jars: Iterable) { rename("^(.*)\\.class\$", "\$1.classdata") // Rename LICENSE file since it clashes with license dir on non-case sensitive FSs (i.e. Mac) rename("""^LICENSE$""", "LICENSE.renamed") + // excluding pom.xml files that are embedded in several dependencies + // in order to avoid false positives from security scanners exclude("META-INF/maven/**") } }