Merge branch '1.14.x' into 1.15.x

shakuzen · shakuzen · commit 25018fdd88b4 · 2025-07-09T14:08:42.000+09:00
diff --git a/build.gradle b/build.gradle
@@ -348,7 +348,7 @@ subprojects {
     }
 
     // Do not publish some modules
-    if (!['samples', 'benchmarks', 'micrometer-osgi-test', 'concurrency-tests', 'micrometer-test-aspectj-ctw', 'micrometer-test-aspectj-ltw'].find { project.name.contains(it) }) {
+    if (!['samples', 'benchmarks', 'micrometer-osgi-test', 'micrometer-osgi-test-slf4j2', 'concurrency-tests', 'micrometer-test-aspectj-ctw', 'micrometer-test-aspectj-ltw'].find { project.name.contains(it) }) {
         apply plugin: 'com.netflix.nebula.maven-publish'
         apply plugin: 'com.netflix.nebula.maven-manifest'
         apply plugin: 'com.netflix.nebula.maven-developer'

Original file line number	Diff line number	Diff line change
`@@ -348,7 +348,7 @@ subprojects {`
`348`	`348`	`}`
`349`	`349`
`350`	`350`	`// Do not publish some modules`
`351`		`- if (!['samples', 'benchmarks', 'micrometer-osgi-test', 'concurrency-tests', 'micrometer-test-aspectj-ctw', 'micrometer-test-aspectj-ltw'].find { project.name.contains(it) }) {`
	`351`	`+ if (!['samples', 'benchmarks', 'micrometer-osgi-test', 'micrometer-osgi-test-slf4j2', 'concurrency-tests', 'micrometer-test-aspectj-ctw', 'micrometer-test-aspectj-ltw'].find { project.name.contains(it) }) {`
`352`	`352`	`apply plugin: 'com.netflix.nebula.maven-publish'`
`353`	`353`	`apply plugin: 'com.netflix.nebula.maven-manifest'`
`354`	`354`	`apply plugin: 'com.netflix.nebula.maven-developer'`