Skip to content

Commit 105e2d0

Browse files
authored
Merge branch 'mhlidd/migrate_config-utils_tests' into mhlidd/config_inversion_base
2 parents d3b95c1 + 061b3c9 commit 105e2d0

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

dd-java-agent/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ def includeShadowJar(TaskProvider<ShadowJar> shadowJarTask, String jarname) {
133133

134134
from(zipTree(shadowJarTask.get().archiveFile)) {
135135
into jarname
136+
exclude 'datadog/trace/config/inversion/**' // hides large config inversion files
136137
rename '(^.*)\\.class$', '$1.classdata'
137138
// Rename LICENSE file since it clashes with license dir on non-case sensitive FSs (i.e. Mac)
138139
rename '^LICENSE$', 'LICENSE.renamed'
@@ -303,6 +304,9 @@ dependencies {
303304
sharedShadowInclude project(':remote-config:remote-config-core'), {
304305
transitive = false
305306
}
307+
308+
sharedShadowInclude project(':utils:config-utils'), { transitive = false }
309+
306310
sharedShadowInclude project(':utils:container-utils'), {
307311
transitive = false
308312
}

utils/config-utils/build.gradle.kts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,11 @@ dependencies {
5757
testImplementation(project(":utils:test-utils"))
5858
testImplementation("org.snakeyaml:snakeyaml-engine:2.9")
5959
}
60+
61+
tasks.named<ProcessResources>("processResources") {
62+
exclude("supported-configurations.json")
63+
}
64+
65+
tasks.named<Jar>("jar") {
66+
exclude("supported-configurations.json")
67+
}

0 commit comments

Comments
 (0)