File tree Expand file tree Collapse file tree 7 files changed +36
-103
lines changed
sentry-samples-netflix-dgs
sentry-samples-spring-boot-opentelemetry-noagent
sentry-samples-spring-boot-opentelemetry
sentry-samples-spring-boot-webflux
sentry-samples-spring-boot Expand file tree Collapse file tree 7 files changed +36
-103
lines changed Original file line number Diff line number Diff line change @@ -12,6 +12,17 @@ class MergeSpringMetadataAction(
1212 private val runtimeClasspath : FileCollection ,
1313 private val springMetadataFiles : List <String >,
1414) : Action<Task> {
15+ companion object {
16+ val DEFAULT_SPRING_METADATA_FILES =
17+ listOf (
18+ " META-INF/spring.factories" ,
19+ " META-INF/spring.handlers" ,
20+ " META-INF/spring.schemas" ,
21+ " META-INF/spring-autoconfigure-metadata.properties" ,
22+ " META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports" ,
23+ " META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports" ,
24+ )
25+ }
1526
1627 override fun execute (task : Task ) {
1728 val archiveTask = task as AbstractArchiveTask
Original file line number Diff line number Diff line change @@ -43,17 +43,12 @@ tasks.shadowJar {
4343 manifest { attributes[" Main-Class" ] = " io.sentry.samples.netflix.dgs.NetlixDgsApplication" }
4444 archiveClassifier.set(" " )
4545
46- val springMetadataFiles =
47- listOf (
48- " META-INF/spring.factories" ,
49- " META-INF/spring.handlers" ,
50- " META-INF/spring.schemas" ,
51- " META-INF/spring-autoconfigure-metadata.properties" ,
52- " META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports" ,
53- " META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports" ,
46+ doLast(
47+ MergeSpringMetadataAction (
48+ runtimeClasspath.get(),
49+ MergeSpringMetadataAction .DEFAULT_SPRING_METADATA_FILES ,
5450 )
55-
56- doLast(MergeSpringMetadataAction (runtimeClasspath.get(), springMetadataFiles))
51+ )
5752}
5853
5954tasks.jar {
Original file line number Diff line number Diff line change @@ -84,17 +84,12 @@ tasks.shadowJar {
8484 manifest { attributes[" Main-Class" ] = " io.sentry.samples.spring.boot.SentryDemoApplication" }
8585 archiveClassifier.set(" " )
8686
87- val springMetadataFiles =
88- listOf (
89- " META-INF/spring.factories" ,
90- " META-INF/spring.handlers" ,
91- " META-INF/spring.schemas" ,
92- " META-INF/spring-autoconfigure-metadata.properties" ,
93- " META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports" ,
94- " META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports" ,
87+ doLast(
88+ MergeSpringMetadataAction (
89+ runtimeClasspath.get(),
90+ MergeSpringMetadataAction .DEFAULT_SPRING_METADATA_FILES ,
9591 )
96-
97- doLast(MergeSpringMetadataAction (runtimeClasspath.get(), springMetadataFiles))
92+ )
9893}
9994
10095tasks.jar {
Original file line number Diff line number Diff line change @@ -80,17 +80,12 @@ tasks.shadowJar {
8080 manifest { attributes[" Main-Class" ] = " io.sentry.samples.spring.boot.SentryDemoApplication" }
8181 archiveClassifier.set(" " )
8282
83- val springMetadataFiles =
84- listOf (
85- " META-INF/spring.factories" ,
86- " META-INF/spring.handlers" ,
87- " META-INF/spring.schemas" ,
88- " META-INF/spring-autoconfigure-metadata.properties" ,
89- " META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports" ,
90- " META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports" ,
83+ doLast(
84+ MergeSpringMetadataAction (
85+ runtimeClasspath.get(),
86+ MergeSpringMetadataAction .DEFAULT_SPRING_METADATA_FILES ,
9187 )
92-
93- doLast(MergeSpringMetadataAction (runtimeClasspath.get(), springMetadataFiles))
88+ )
9489}
9590
9691tasks.jar {
Original file line number Diff line number Diff line change @@ -53,17 +53,12 @@ tasks.shadowJar {
5353 manifest { attributes[" Main-Class" ] = " io.sentry.samples.spring.boot.SentryDemoApplication" }
5454 archiveClassifier.set(" " )
5555
56- val springMetadataFiles =
57- listOf (
58- " META-INF/spring.factories" ,
59- " META-INF/spring.handlers" ,
60- " META-INF/spring.schemas" ,
61- " META-INF/spring-autoconfigure-metadata.properties" ,
62- " META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports" ,
63- " META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports" ,
56+ doLast(
57+ MergeSpringMetadataAction (
58+ runtimeClasspath.get(),
59+ MergeSpringMetadataAction .DEFAULT_SPRING_METADATA_FILES ,
6460 )
65-
66- doLast(MergeSpringMetadataAction (runtimeClasspath.get(), springMetadataFiles))
61+ )
6762}
6863
6964tasks.jar {
Original file line number Diff line number Diff line change @@ -83,17 +83,12 @@ tasks.shadowJar {
8383 // Shadow 9.x enforces DuplicatesStrategy before transformers run, so `append`
8484 // only sees one copy of each file. We merge Spring metadata from the runtime
8585 // classpath and patch the built JAR in doLast.
86- val springMetadataFiles =
87- listOf (
88- " META-INF/spring.factories" ,
89- " META-INF/spring.handlers" ,
90- " META-INF/spring.schemas" ,
91- " META-INF/spring-autoconfigure-metadata.properties" ,
92- " META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports" ,
93- " META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports" ,
86+ doLast(
87+ MergeSpringMetadataAction (
88+ runtimeClasspath.get(),
89+ MergeSpringMetadataAction .DEFAULT_SPRING_METADATA_FILES ,
9490 )
95-
96- doLast(MergeSpringMetadataAction (runtimeClasspath.get(), springMetadataFiles))
91+ )
9792}
9893
9994tasks.jar {
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments