Upgrade to Spring Framework 6.0.0-M2

Closes gh-775

Author: wilkinsona

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/",

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'

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"
 

samples/rest-notes-spring-data-rest/pom.xml

@@ -15,6 +15,18 @@
 		<restdocs.version>3.0.0-SNAPSHOT</restdocs.version>
 	</properties>
 
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-framework-bom</artifactId>
+				<version>6.0.0-M2</version>
+				<scope>import</scope>
+				<type>pom</type>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
 	<dependencies>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
@@ -39,7 +51,6 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.data</groupId>

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"
 

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"

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"
 }