Merge branch '1.8.x' into 1.9.x

shakuzen · shakuzen · commit 662e0efb33da · 2022-07-06T16:48:20.000+09:00
diff --git a/implementations/micrometer-registry-statsd/build.gradle b/implementations/micrometer-registry-statsd/build.gradle
@@ -42,6 +42,7 @@ shadowJar {
         from "$rootDir/LICENSE"
         from "$rootDir/NOTICE"
     }
+    mergeServiceFiles()
 }
 
 // The Nebula Publishing plugin automatically configures the publication of the shadow jar but

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ shadowJar {`
`42`	`42`	`from "$rootDir/LICENSE"`
`43`	`43`	`from "$rootDir/NOTICE"`
`44`	`44`	`}`
	`45`	`+ mergeServiceFiles()`
`45`	`46`	`}`
`46`	`47`
`47`	`48`	`// The Nebula Publishing plugin automatically configures the publication of the shadow jar but`