diff --git a/buildSrc/src/main/kotlin/elastic-otel.agent-packaging-conventions.gradle.kts b/buildSrc/src/main/kotlin/elastic-otel.agent-packaging-conventions.gradle.kts index 65abd387..7c3da716 100644 --- a/buildSrc/src/main/kotlin/elastic-otel.agent-packaging-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/elastic-otel.agent-packaging-conventions.gradle.kts @@ -210,15 +210,14 @@ tasks { archiveClassifier.set("") - duplicatesStrategy = DuplicatesStrategy.INCLUDE - failOnDuplicateEntries = true + duplicatesStrategy = DuplicatesStrategy.EXCLUDE mergeServiceFiles{ include("inst/META-INF/services/**") path = "inst/META-INF/services" } - filesNotMatching("inst/META-INF/services/**") { - duplicatesStrategy = DuplicatesStrategy.EXCLUDE + filesMatching("inst/META-INF/services/**") { + duplicatesStrategy = DuplicatesStrategy.INCLUDE } relocatePackages(this) transform(injectSpanValueFieldTransformer) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 760fa524..1ce12f66 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -shadow = "9.1.0" +shadow = "9.2.2" jib = "3.4.5" spotless = "8.0.0" junit = "5.13.4"