Merge branch '3.0.x'

Author: wilkinsona

.github/workflows/ci.yml

@@ -22,11 +22,9 @@ jobs:
           - version: 17
             toolchain: false
           - version: 21
-            toolchain: true
-          - version: 22
-            toolchain: true
-          - version: 23
-            toolchain: true
+            toolchain: false
+          - version: 24
+            toolchain: false
         exclude:
           - os:
               name: Linux

spring-restdocs-webtestclient/build.gradle

@@ -10,8 +10,12 @@ dependencies {
 	api("org.springframework:spring-test")
 	api("org.springframework:spring-webflux")
 
+	compileOnly("org.hamcrest:hamcrest-core")
+
 	internal(platform(project(":spring-restdocs-platform")))
 
+	testCompileOnly("org.hamcrest:hamcrest-core")
+
 	testImplementation(testFixtures(project(":spring-restdocs-core")))
 
 	testRuntimeOnly("org.springframework:spring-context")