Exclude META-INF/maven from shaded libraries (#13007)

laurit · web-flow · commit fa7e8b5fb877 · 2025-01-07T11:57:30.000-08:00
diff --git a/examples/distro/agent/build.gradle b/examples/distro/agent/build.gradle
@@ -46,6 +46,8 @@ CopySpec isolateClasses(Iterable<File> jars) {
         exclude("META-INF/INDEX.LIST")
         exclude("META-INF/*.DSA")
         exclude("META-INF/*.SF")
+        exclude("META-INF/maven/**")
+        exclude("META-INF/MANIFEST.MF")
       }
     }
   }
diff --git a/javaagent/build.gradle.kts b/javaagent/build.gradle.kts
@@ -383,6 +383,8 @@ fun CopySpec.isolateClasses(jar: Provider<RegularFile>) {
     exclude("META-INF/INDEX.LIST")
     exclude("META-INF/*.DSA")
     exclude("META-INF/*.SF")
+    exclude("META-INF/maven/**")
+    exclude("META-INF/MANIFEST.MF")
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,8 @@ CopySpec isolateClasses(Iterable<File> jars) {`
`46`	`46`	`exclude("META-INF/INDEX.LIST")`
`47`	`47`	`exclude("META-INF/*.DSA")`
`48`	`48`	`exclude("META-INF/*.SF")`
	`49`	`+ exclude("META-INF/maven/**")`
	`50`	`+ exclude("META-INF/MANIFEST.MF")`
`49`	`51`	`}`
`50`	`52`	`}`
`51`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -383,6 +383,8 @@ fun CopySpec.isolateClasses(jar: Provider<RegularFile>) {`
`383`	`383`	`exclude("META-INF/INDEX.LIST")`
`384`	`384`	`exclude("META-INF/*.DSA")`
`385`	`385`	`exclude("META-INF/*.SF")`
	`386`	`+ exclude("META-INF/maven/**")`
	`387`	`+ exclude("META-INF/MANIFEST.MF")`
`386`	`388`	`}`
`387`	`389`	`}`
`388`	`390`