Skip to content

Commit dad8cd5

Browse files
committed
extract shadow jar for spring and javaagent separately
1 parent 2ddaae5 commit dad8cd5

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

instrumentation/r2dbc-1.0/library-instrumentation-shaded/build.gradle.kts

+7
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,13 @@ tasks {
3030
val extractShadowJar by registering(Copy::class) {
3131
dependsOn(shadowJar)
3232
from(zipTree(shadowJar.get().archiveFile))
33+
exclude("META-INF/**")
3334
into("build/extracted/shadow")
3435
}
36+
37+
val extractShadowJarSpring by registering(Copy::class) {
38+
dependsOn(shadowJar)
39+
from(zipTree(shadowJar.get().archiveFile))
40+
into("build/extracted/shadow-spring")
41+
}
3542
}

instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ sourceSets {
1515
main {
1616
val shadedDep = project(":instrumentation:r2dbc-1.0:library-instrumentation-shaded")
1717
output.dir(
18-
shadedDep.file("build/extracted/shadow"),
19-
"builtBy" to ":instrumentation:r2dbc-1.0:library-instrumentation-shaded:extractShadowJar",
18+
shadedDep.file("build/extracted/shadow-spring"),
19+
"builtBy" to ":instrumentation:r2dbc-1.0:library-instrumentation-shaded:extractShadowJarSpring",
2020
)
2121
}
2222
}

0 commit comments

Comments
 (0)