Skip to content

Commit bba22a3

Browse files
authored
Merge branch 'mhlidd/supported_configurations' into mhlidd/config_inversion_plugins
2 parents 833207d + 1c780b3 commit bba22a3

File tree

2 files changed

+0
-10
lines changed

2 files changed

+0
-10
lines changed

dd-java-agent/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,6 @@ ext.generalShadowJarConfig = {
9393
exclude '**/io/airlift/compress/snappy/**'
9494
relocate 'io.airlift', 'datadog.io.airlift'
9595

96-
exclude '**/supported-configurations.json'
97-
9896
final String projectName = "${project.name}"
9997

10098
// Prevents conflict with other instances, but doesn't relocate instrumentation

utils/config-utils/build.gradle.kts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,3 @@ dependencies {
1313

1414
testImplementation(project(":utils:test-utils"))
1515
}
16-
17-
tasks.named<ProcessResources>("processResources") {
18-
exclude("supported-configurations.json")
19-
}
20-
21-
tasks.named<Jar>("jar") {
22-
exclude("supported-configurations.json")
23-
}

0 commit comments

Comments
 (0)