Merge branch '1.3.x'

bclozel · bclozel · commit 530c37fee2f1 · 2025-04-17T15:13:05.000+02:00
diff --git a/platform/build.gradle b/platform/build.gradle
@@ -25,7 +25,7 @@ dependencies {
 
 	constraints {
 		api("com.graphql-java:graphql-java:${graphQlJavaVersion}")
-		api("io.micrometer:context-propagation:1.1.2")
+		api("io.micrometer:context-propagation:1.1.3")
 
 		api("jakarta.annotation:jakarta.annotation-api:2.1.1")
 		api("jakarta.servlet:jakarta.servlet-api:6.0.0")
diff --git a/spring-graphql/build.gradle b/spring-graphql/build.gradle
@@ -57,6 +57,7 @@ dependencies {
 	testImplementation 'org.springframework.data:spring-data-keyvalue'
 	testImplementation 'org.springframework.data:spring-data-jpa'
 	testImplementation("io.micrometer:micrometer-observation-test") {
+		// see https://github.com/micrometer-metrics/micrometer/issues/6012
 		exclude(group: "org.junit.jupiter")
 	}
 	testImplementation 'io.micrometer:micrometer-tracing-test'

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ dependencies {`
`57`	`57`	`testImplementation 'org.springframework.data:spring-data-keyvalue'`
`58`	`58`	`testImplementation 'org.springframework.data:spring-data-jpa'`
`59`	`59`	`testImplementation("io.micrometer:micrometer-observation-test") {`
	`60`	`+ // see https://github.com/micrometer-metrics/micrometer/issues/6012`
`60`	`61`	`exclude(group: "org.junit.jupiter")`
`61`	`62`	`}`
`62`	`63`	`testImplementation 'io.micrometer:micrometer-tracing-test'`