From c03ba16fed1f31512fee2c7762564119f0379a28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Mon, 13 Jan 2025 09:41:07 +0100 Subject: [PATCH] Upgrade to Spring Boot 3.4.x MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit upgrades to Spring Boot 3.4.x, Spring Framework 6.2.x, and third party dependency versions used by the project. Signed-off-by: Stéphane Nicoll --- build.gradle | 4 +- platform/build.gradle | 38 +++++++++---------- .../test/tester/DefaultGraphQlTester.java | 6 +-- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/build.gradle b/build.gradle index 13bbdaac0..89d3f4b34 100644 --- a/build.gradle +++ b/build.gradle @@ -2,9 +2,9 @@ description = "Spring for GraphQL" ext { moduleProjects = [project(":spring-graphql"), project(":spring-graphql-test")] - springFrameworkVersion = "6.1.14" + springFrameworkVersion = "6.2.1" graphQlJavaVersion = "22.3" - springBootVersion = "3.3.0" + springBootVersion = "3.4.0" } subprojects { diff --git a/platform/build.gradle b/platform/build.gradle index 2f014b53a..d46809c8f 100644 --- a/platform/build.gradle +++ b/platform/build.gradle @@ -8,20 +8,20 @@ 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.11")) - api(platform("io.micrometer:micrometer-bom:1.13.6")) - api(platform("io.micrometer:micrometer-tracing-bom:1.3.5")) - api(platform("org.springframework.data:spring-data-bom:2024.0.5")) - api(platform("org.springframework.security:spring-security-bom:6.3.4")) + api(platform("com.fasterxml.jackson:jackson-bom:2.18.1")) + api(platform("io.projectreactor:reactor-bom:2024.0.0")) + api(platform("io.micrometer:micrometer-bom:1.14.1")) + api(platform("io.micrometer:micrometer-tracing-bom:1.4.0")) + api(platform("org.springframework.data:spring-data-bom:2024.1.0")) + api(platform("org.springframework.security:spring-security-bom:6.4.1")) api(platform("com.querydsl:querydsl-bom:5.1.0")) api(platform("io.rsocket:rsocket-bom:1.1.4")) api(platform("org.jetbrains.kotlin:kotlin-bom:${kotlinVersion}")) api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.1")) - api(platform("org.junit:junit-bom:5.10.5")) - api(platform("org.mockito:mockito-bom:5.11.0")) - api(platform("org.testcontainers:testcontainers-bom:1.19.8")) - api(platform("org.apache.logging.log4j:log4j-bom:2.23.1")) + api(platform("org.junit:junit-bom:5.11.3")) + api(platform("org.mockito:mockito-bom:5.14.2")) + api(platform("org.testcontainers:testcontainers-bom:1.20.4")) + api(platform("org.apache.logging.log4j:log4j-bom:2.24.1")) constraints { api("com.graphql-java:graphql-java:${graphQlJavaVersion}") @@ -37,19 +37,19 @@ dependencies { api("com.google.code.findbugs:jsr305:3.0.2") - api("org.assertj:assertj-core:3.25.3") + api("org.assertj:assertj-core:3.26.3") api("com.jayway.jsonpath:json-path:2.9.0") - api("org.skyscreamer:jsonassert:1.5.1") - api("org.awaitility:awaitility:4.2.1") + api("org.skyscreamer:jsonassert:1.5.3") + api("org.awaitility:awaitility:4.2.2") api("com.squareup.okhttp3:mockwebserver:4.12.0") - api("com.h2database:h2:2.2.224") - api("org.hibernate:hibernate-core:6.5.0.CR1") + api("com.h2database:h2:2.3.232") + api("org.hibernate:hibernate-core:6.6.2.Final") api("org.hibernate.validator:hibernate-validator:8.0.1.Final") - api("org.mongodb:bson:5.0.1") - api("org.mongodb:mongodb-driver-core:5.0.1") - api("org.mongodb:mongodb-driver-reactivestreams:5.0.1") - api("org.mongodb:mongodb-driver-sync:5.0.1") + api("org.mongodb:bson:5.2.1") + api("org.mongodb:mongodb-driver-core:5.2.1") + api("org.mongodb:mongodb-driver-reactivestreams:5.2.1") + api("org.mongodb:mongodb-driver-sync:5.2.1") } } diff --git a/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultGraphQlTester.java b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultGraphQlTester.java index 1c58a5efa..75c5f6004 100644 --- a/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultGraphQlTester.java +++ b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultGraphQlTester.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2024 the original author or authors. + * Copyright 2002-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,6 +31,7 @@ import com.jayway.jsonpath.DocumentContext; import com.jayway.jsonpath.JsonPath; import com.jayway.jsonpath.TypeRef; +import org.skyscreamer.jsonassert.JSONAssert; import org.springframework.core.ParameterizedTypeReference; import org.springframework.core.ResolvableType; @@ -42,7 +43,6 @@ import org.springframework.graphql.support.DocumentSource; import org.springframework.lang.Nullable; import org.springframework.test.util.AssertionErrors; -import org.springframework.test.util.JsonExpectationsHelper; import org.springframework.test.util.JsonPathExpectationsHelper; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; @@ -469,7 +469,7 @@ private void matchesJson(String expected, boolean strict) { this.delegate.doAssert(() -> { String actual = this.delegate.jsonContent(this.jsonPath); try { - new JsonExpectationsHelper().assertJsonEqual(expected, actual, strict); + JSONAssert.assertEquals(expected, actual, strict); } catch (AssertionError ex) { throw new AssertionError(ex.getMessage() + "\n\n" + "Expected JSON content:\n'" + expected + "'\n\n"