Skip to content

Commit 7894dd5

Browse files
committed
Upgrade to Spring Framework 6.0.0
This change aligns with the Jakarta API requirements in Spring Framework. This commit also upgrades optional dependencies with the latest compatible versions. Closes gh-543
1 parent ab6dde2 commit 7894dd5

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44

55
ext {
66
moduleProjects = [project(":spring-graphql"), project(":spring-graphql-test")]
7-
springFrameworkVersion = "6.0.0-RC1"
7+
springFrameworkVersion = "6.0.0"
88
graphQlJavaVersion = "19.2"
99
bootVersion = "3.0.0-SNAPSHOT"
1010
}

platform/build.gradle

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ javaPlatform {
88

99
dependencies {
1010
api(platform("org.springframework:spring-framework-bom:${springFrameworkVersion}"))
11-
api(platform("com.fasterxml.jackson:jackson-bom:2.13.4.20221013"))
11+
api(platform("com.fasterxml.jackson:jackson-bom:2.14.1"))
1212
api(platform("io.projectreactor:reactor-bom:2022.0.0-RC1"))
1313
api(platform("io.micrometer:micrometer-bom:1.10.0-RC1"))
1414
api(platform("org.springframework.data:spring-data-bom:2022.0.0-RC1"))
@@ -17,19 +17,19 @@ dependencies {
1717
api(platform("io.rsocket:rsocket-bom:1.1.3"))
1818
api(platform("org.jetbrains.kotlin:kotlin-bom:1.7.10"))
1919
api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4"))
20-
api(platform("org.junit:junit-bom:5.9.0"))
21-
api(platform("org.mockito:mockito-bom:4.8.0"))
20+
api(platform("org.junit:junit-bom:5.9.1"))
21+
api(platform("org.mockito:mockito-bom:4.8.1"))
2222
api(platform("org.testcontainers:testcontainers-bom:1.17.3"))
2323
api(platform("org.apache.logging.log4j:log4j-bom:2.19.0"))
2424

2525
constraints {
2626
api("com.graphql-java:graphql-java:${graphQlJavaVersion}")
2727
api("io.micrometer:context-propagation:1.0.0-RC1")
2828

29-
api("jakarta.annotation:jakarta.annotation-api:2.0.0")
30-
api("jakarta.servlet:jakarta.servlet-api:5.0.0")
31-
api("jakarta.validation:jakarta.validation-api:3.0.1")
32-
api("jakarta.persistence:jakarta.persistence-api:3.0.0")
29+
api("jakarta.annotation:jakarta.annotation-api:2.1.1")
30+
api("jakarta.servlet:jakarta.servlet-api:6.0.0")
31+
api("jakarta.validation:jakarta.validation-api:3.0.2")
32+
api("jakarta.persistence:jakarta.persistence-api:3.1.0")
3333

3434
api("com.google.code.findbugs:jsr305:3.0.2")
3535

@@ -38,12 +38,12 @@ dependencies {
3838
api("org.skyscreamer:jsonassert:1.5.1")
3939

4040
api("com.h2database:h2:2.1.214")
41-
api("org.hibernate:hibernate-core:6.1.4.Final")
42-
api("org.hibernate.validator:hibernate-validator:7.0.5.Final")
43-
api("org.mongodb:bson:4.7.1")
44-
api("org.mongodb:mongodb-driver-core:4.7.1")
45-
api("org.mongodb:mongodb-driver-reactivestreams:4.7.1")
46-
api("org.mongodb:mongodb-driver-sync:4.7.1")
41+
api("org.hibernate:hibernate-core:6.1.5.Final")
42+
api("org.hibernate.validator:hibernate-validator:8.0.0.Final")
43+
api("org.mongodb:bson:4.8.0")
44+
api("org.mongodb:mongodb-driver-core:4.8.0")
45+
api("org.mongodb:mongodb-driver-reactivestreams:4.8.0")
46+
api("org.mongodb:mongodb-driver-sync:4.8.0")
4747
}
4848

4949
}

0 commit comments

Comments
 (0)