Merge branch '1.1.x' into 1.2.x

jonatan-ivanov · jonatan-ivanov · commit 2aec916c9e1d · 2024-03-11T16:33:58.000-07:00
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -67,7 +67,7 @@ subprojects {
 		dependencies {
 			constraints {
 				rootProject.subprojects
-					.findAll { !it.name.contains('micrometer-tracing-bom') }
+					.findAll { !it.name.contains('micrometer-tracing-bom') && !it.name.contains('benchmarks') }
 					.each { api(group: it.group, name: it.name, version: it.version.toString()) }
 			}
 			javaPlatform.allowDependencies()

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ subprojects {`
`67`	`67`	`dependencies {`
`68`	`68`	`constraints {`
`69`	`69`	`rootProject.subprojects`
`70`		`- .findAll { !it.name.contains('micrometer-tracing-bom') }`
	`70`	`+ .findAll { !it.name.contains('micrometer-tracing-bom') && !it.name.contains('benchmarks') }`
`71`	`71`	`.each { api(group: it.group, name: it.name, version: it.version.toString()) }`
`72`	`72`	`}`
`73`	`73`	`javaPlatform.allowDependencies()`