Merge branch '1.3.x'

This commit is contained in:
Brian Clozel
2025-04-17 15:13:05 +02:00
2 changed files with 2 additions and 1 deletions

View File

@@ -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")

View File

@@ -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'