From ec0a9c37c4a0f76b376bdab08f188e31498c12f2 Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Thu, 17 Apr 2025 15:09:13 +0200 Subject: [PATCH 1/4] Upgrade to Spring Framework 6.1.19 Closes gh-1191 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1e131646..ae869386 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ description = "Spring for GraphQL" ext { moduleProjects = [project(":spring-graphql"), project(":spring-graphql-test")] - springFrameworkVersion = "6.1.17" + springFrameworkVersion = "6.1.19" graphQlJavaVersion = "22.3" springBootVersion = "3.3.8" } From 680534e6ef5707835175cba6aff6888e008adb0e Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Thu, 17 Apr 2025 15:09:58 +0200 Subject: [PATCH 2/4] Upgrade to Reactor 2023.0.17 Closes gh-1192 --- platform/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/build.gradle b/platform/build.gradle index 156ad082..2202019c 100644 --- a/platform/build.gradle +++ b/platform/build.gradle @@ -9,7 +9,7 @@ javaPlatform { dependencies { api(platform("org.springframework:spring-framework-bom:${springFrameworkVersion}")) api(platform("com.fasterxml.jackson:jackson-bom:2.17.2")) - api(platform("io.projectreactor:reactor-bom:2023.0.15")) + api(platform("io.projectreactor:reactor-bom:2023.0.17")) api(platform("io.micrometer:micrometer-bom:1.13.11")) api(platform("io.micrometer:micrometer-tracing-bom:1.3.9")) api(platform("org.springframework.data:spring-data-bom:2024.0.9")) From 756b0c13ace33823a72e2b3242d84cb80f91c25f Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Thu, 17 Apr 2025 15:10:26 +0200 Subject: [PATCH 3/4] Upgrade to Micrometer 1.13.13 Closes gh-1193 --- platform/build.gradle | 4 ++-- spring-graphql/build.gradle | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/platform/build.gradle b/platform/build.gradle index 2202019c..37f3a502 100644 --- a/platform/build.gradle +++ b/platform/build.gradle @@ -10,8 +10,8 @@ dependencies { api(platform("org.springframework:spring-framework-bom:${springFrameworkVersion}")) api(platform("com.fasterxml.jackson:jackson-bom:2.17.2")) api(platform("io.projectreactor:reactor-bom:2023.0.17")) - api(platform("io.micrometer:micrometer-bom:1.13.11")) - api(platform("io.micrometer:micrometer-tracing-bom:1.3.9")) + api(platform("io.micrometer:micrometer-bom:1.13.13")) + api(platform("io.micrometer:micrometer-tracing-bom:1.3.11")) api(platform("org.springframework.data:spring-data-bom:2024.0.9")) api(platform("org.springframework.security:spring-security-bom:6.3.6")) api(platform("com.querydsl:querydsl-bom:5.1.0")) diff --git a/spring-graphql/build.gradle b/spring-graphql/build.gradle index 2718c7d8..772fa47f 100644 --- a/spring-graphql/build.gradle +++ b/spring-graphql/build.gradle @@ -56,7 +56,10 @@ dependencies { testImplementation 'org.springframework.data:spring-data-commons' testImplementation 'org.springframework.data:spring-data-keyvalue' testImplementation 'org.springframework.data:spring-data-jpa' - testImplementation 'io.micrometer:micrometer-observation-test' + 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' testImplementation 'com.h2database:h2' testImplementation 'org.hibernate:hibernate-core' From c9a52cfb891662a456556e7b74feab474499e9ae Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Thu, 17 Apr 2025 15:10:47 +0200 Subject: [PATCH 4/4] Upgrade to Context Propagation 1.1.3 Closes gh-1194 --- platform/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/build.gradle b/platform/build.gradle index 37f3a502..67ed4d22 100644 --- 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")