Skip to content

Commit 12da6fe

Browse files
authored
Remove top-level maven pom.properties of vendored packages as they could trigger unwanted framework checks (#8760)
Also remove some empty 'META-INF/versions' directories leftover from vendoring SnakeYaml
1 parent 5a04e8c commit 12da6fe

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

dd-java-agent/build.gradle

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,18 @@ ext.generalShadowJarConfig = {
3535

3636
// Remove some cruft from the final jar.
3737
// These patterns should NOT include **/META-INF/maven/**/pom.properties, which is
38-
// used to report our own dependencies.
38+
// used to report our own dependencies, but we should remove the top-level metadata
39+
// of vendored packages because those could trigger unwanted framework checks.
40+
exclude '/META-INF/maven/org.slf4j/**'
41+
exclude '/META-INF/maven/org.yaml/**'
3942
exclude '**/META-INF/maven/**/pom.xml'
4043
exclude '**/META-INF/proguard/'
4144
exclude '**/META-INF/*.kotlin_module'
4245
exclude '**/module-info.class'
4346
exclude '**/liblz4-java.so'
4447
exclude '**/liblz4-java.dylib'
4548
exclude '**/inst/META-INF/versions/**'
49+
exclude '**/META-INF/versions/*/org/yaml/**'
4650

4751
// Replaced by 'instrumenter.index', no need to include original service file
4852
exclude '**/META-INF/services/datadog.trace.agent.tooling.InstrumenterModule'

0 commit comments

Comments
 (0)