Skip to content

Commit

Permalink
Upgrade to Spring Framework 6.0.0
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bclozel committed Nov 22, 2022
1 parent ab6dde2 commit 7894dd5
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {

ext {
moduleProjects = [project(":spring-graphql"), project(":spring-graphql-test")]
springFrameworkVersion = "6.0.0-RC1"
springFrameworkVersion = "6.0.0"
graphQlJavaVersion = "19.2"
bootVersion = "3.0.0-SNAPSHOT"
}
Expand Down
26 changes: 13 additions & 13 deletions platform/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ javaPlatform {

dependencies {
api(platform("org.springframework:spring-framework-bom:${springFrameworkVersion}"))
api(platform("com.fasterxml.jackson:jackson-bom:2.13.4.20221013"))
api(platform("com.fasterxml.jackson:jackson-bom:2.14.1"))
api(platform("io.projectreactor:reactor-bom:2022.0.0-RC1"))
api(platform("io.micrometer:micrometer-bom:1.10.0-RC1"))
api(platform("org.springframework.data:spring-data-bom:2022.0.0-RC1"))
Expand All @@ -17,19 +17,19 @@ dependencies {
api(platform("io.rsocket:rsocket-bom:1.1.3"))
api(platform("org.jetbrains.kotlin:kotlin-bom:1.7.10"))
api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4"))
api(platform("org.junit:junit-bom:5.9.0"))
api(platform("org.mockito:mockito-bom:4.8.0"))
api(platform("org.junit:junit-bom:5.9.1"))
api(platform("org.mockito:mockito-bom:4.8.1"))
api(platform("org.testcontainers:testcontainers-bom:1.17.3"))
api(platform("org.apache.logging.log4j:log4j-bom:2.19.0"))

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

api("jakarta.annotation:jakarta.annotation-api:2.0.0")
api("jakarta.servlet:jakarta.servlet-api:5.0.0")
api("jakarta.validation:jakarta.validation-api:3.0.1")
api("jakarta.persistence:jakarta.persistence-api:3.0.0")
api("jakarta.annotation:jakarta.annotation-api:2.1.1")
api("jakarta.servlet:jakarta.servlet-api:6.0.0")
api("jakarta.validation:jakarta.validation-api:3.0.2")
api("jakarta.persistence:jakarta.persistence-api:3.1.0")

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

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

api("com.h2database:h2:2.1.214")
api("org.hibernate:hibernate-core:6.1.4.Final")
api("org.hibernate.validator:hibernate-validator:7.0.5.Final")
api("org.mongodb:bson:4.7.1")
api("org.mongodb:mongodb-driver-core:4.7.1")
api("org.mongodb:mongodb-driver-reactivestreams:4.7.1")
api("org.mongodb:mongodb-driver-sync:4.7.1")
api("org.hibernate:hibernate-core:6.1.5.Final")
api("org.hibernate.validator:hibernate-validator:8.0.0.Final")
api("org.mongodb:bson:4.8.0")
api("org.mongodb:mongodb-driver-core:4.8.0")
api("org.mongodb:mongodb-driver-reactivestreams:4.8.0")
api("org.mongodb:mongodb-driver-sync:4.8.0")
}

}

0 comments on commit 7894dd5

Please sign in to comment.