From 740feb08110019b39ba1a9fabf8448d25c6db107 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 13 Jan 2022 13:01:52 +0000 Subject: [PATCH] Upgrade to Spring Framework 6.0.0-M2 Closes gh-775 --- build.gradle | 3 ++- samples/junit5/build.gradle | 3 ++- samples/rest-notes-slate/build.gradle | 3 ++- samples/rest-notes-spring-data-rest/pom.xml | 13 ++++++++++++- samples/rest-notes-spring-hateoas/build.gradle | 3 ++- samples/testng/build.gradle | 3 ++- samples/web-test-client/build.gradle | 6 +++--- 7 files changed, 25 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 4e7302ad..f5b97c91 100644 --- a/build.gradle +++ b/build.gradle @@ -9,6 +9,7 @@ allprojects { repositories { mavenLocal() mavenCentral() + maven { url "https://repo.spring.io/milestone" } maven { url "https://repo.spring.io/snapshot" } } } @@ -25,7 +26,7 @@ nohttp { } ext { - springFrameworkVersion = "6.0.0-SNAPSHOT" + springFrameworkVersion = "6.0.0-M2" javadocLinks = [ "https://docs.oracle.com/javase/8/docs/api/", "https://docs.spring.io/spring-framework/docs/$springFrameworkVersion/javadoc-api/", diff --git a/samples/junit5/build.gradle b/samples/junit5/build.gradle index 78c4d4db..c9fd2aef 100644 --- a/samples/junit5/build.gradle +++ b/samples/junit5/build.gradle @@ -28,7 +28,8 @@ configurations { dependencies { asciidoctorExtensions "org.springframework.restdocs:spring-restdocs-asciidoctor:$restdocsVersion" - implementation 'org.springframework:spring-webmvc:6.0.0-M1' + implementation platform("org.springframework:spring-framework-bom:6.0.0-M2") + implementation 'org.springframework:spring-webmvc' testImplementation "org.springframework.restdocs:spring-restdocs-mockmvc:$restdocsVersion" testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.0' diff --git a/samples/rest-notes-slate/build.gradle b/samples/rest-notes-slate/build.gradle index 41882377..84cba536 100644 --- a/samples/rest-notes-slate/build.gradle +++ b/samples/rest-notes-slate/build.gradle @@ -22,11 +22,12 @@ ext { ext['spring-restdocs.version'] = '3.0.0-SNAPSHOT' dependencies { + implementation platform("org.springframework:spring-framework-bom:6.0.0-M2") implementation "com.fasterxml.jackson.core:jackson-databind:2.13.1" implementation "jakarta.servlet:jakarta.servlet-api:5.0.0" implementation "org.hibernate.validator:hibernate-validator:7.0.0.Final" implementation "org.hibernate:hibernate-core-jakarta:5.5.7.Final" - implementation "org.springframework:spring-webmvc:6.0.0-SNAPSHOT" + implementation "org.springframework:spring-webmvc" implementation "org.springframework.data:spring-data-jpa:3.0.0-SNAPSHOT" implementation "org.springframework.data:spring-data-rest-webmvc:4.0.0-SNAPSHOT" diff --git a/samples/rest-notes-spring-data-rest/pom.xml b/samples/rest-notes-spring-data-rest/pom.xml index 8bb5ed4f..81d487df 100644 --- a/samples/rest-notes-spring-data-rest/pom.xml +++ b/samples/rest-notes-spring-data-rest/pom.xml @@ -15,6 +15,18 @@ 3.0.0-SNAPSHOT + + + + org.springframework + spring-framework-bom + 6.0.0-M2 + import + pom + + + + com.fasterxml.jackson.core @@ -39,7 +51,6 @@ org.springframework spring-webmvc - 6.0.0-SNAPSHOT org.springframework.data diff --git a/samples/rest-notes-spring-hateoas/build.gradle b/samples/rest-notes-spring-hateoas/build.gradle index b69c8bc4..725b04ba 100644 --- a/samples/rest-notes-spring-hateoas/build.gradle +++ b/samples/rest-notes-spring-hateoas/build.gradle @@ -27,11 +27,12 @@ configurations { dependencies { asciidoctorExtensions "org.springframework.restdocs:spring-restdocs-asciidoctor:$restdocsVersion" + implementation platform("org.springframework:spring-framework-bom:6.0.0-M2") implementation "com.fasterxml.jackson.core:jackson-databind:2.13.1" implementation "jakarta.servlet:jakarta.servlet-api:5.0.0" implementation "org.hibernate.validator:hibernate-validator:7.0.0.Final" implementation "org.hibernate:hibernate-core-jakarta:5.5.7.Final" - implementation "org.springframework:spring-webmvc:6.0.0-SNAPSHOT" + implementation "org.springframework:spring-webmvc" implementation "org.springframework.data:spring-data-jpa:3.0.0-SNAPSHOT" implementation "org.springframework.hateoas:spring-hateoas:2.0.0-SNAPSHOT" diff --git a/samples/testng/build.gradle b/samples/testng/build.gradle index 2b4219c5..c0509fe6 100644 --- a/samples/testng/build.gradle +++ b/samples/testng/build.gradle @@ -28,7 +28,8 @@ configurations { dependencies { asciidoctorExtensions "org.springframework.restdocs:spring-restdocs-asciidoctor:$restdocsVersion" - implementation "org.springframework:spring-webmvc:6.0.0-M1" + implementation platform("org.springframework:spring-framework-bom:6.0.0-M2") + implementation "org.springframework:spring-webmvc" testImplementation "org.springframework.restdocs:spring-restdocs-mockmvc:$restdocsVersion" testImplementation "org.testng:testng:6.9.10" diff --git a/samples/web-test-client/build.gradle b/samples/web-test-client/build.gradle index d0025c19..94205f01 100644 --- a/samples/web-test-client/build.gradle +++ b/samples/web-test-client/build.gradle @@ -29,11 +29,11 @@ configurations { dependencies { asciidoctorExtensions "org.springframework.restdocs:spring-restdocs-asciidoctor:$restdocsVersion" - implementation 'org.springframework:spring-context:6.0.0-M1' - implementation 'org.springframework:spring-webflux:6.0.0-M1' + implementation platform("org.springframework:spring-framework-bom:6.0.0-M2") + implementation 'org.springframework:spring-context' + implementation 'org.springframework:spring-webflux' testImplementation 'junit:junit:4.13.1' - testImplementation 'org.springframework:spring-test:6.0.0-M1' testImplementation "org.springframework.restdocs:spring-restdocs-webtestclient:$restdocsVersion" }