Merge branch '2.0.x'

docs/build.gradle

@@ -21,7 +21,6 @@ dependencies {
 	testImplementation(project(":spring-restdocs-mockmvc"))
 	testImplementation(project(":spring-restdocs-restassured"))
 	testImplementation(project(":spring-restdocs-webtestclient"))
-	testImplementation("io.rest-assured:rest-assured")
 	testImplementation("jakarta.validation:jakarta.validation-api")
 	testImplementation("junit:junit")
 	testImplementation("org.testng:testng:6.9.10")

spring-restdocs-asciidoctor/build.gradle

@@ -11,7 +11,9 @@ dependencies {
 	internal(platform(project(":spring-restdocs-platform")))
 
 	testImplementation("junit:junit")
-	testImplementation("org.apache.pdfbox:pdfbox")
+	testImplementation("org.apache.pdfbox:pdfbox") {
+		exclude group: "commons-logging", module: "commons-logging"
+	}
 	testImplementation("org.assertj:assertj-core")
 	testImplementation("org.springframework:spring-core")
 

spring-restdocs-mockmvc/build.gradle

@@ -22,6 +22,4 @@ dependencies {
 	testImplementation("org.hamcrest:hamcrest-library")
 	testImplementation("org.mockito:mockito-core")
 	testImplementation("org.springframework.hateoas:spring-hateoas")
-
-	testRuntimeOnly("commons-logging:commons-logging:1.2")
 }

spring-restdocs-restassured/build.gradle

@@ -7,8 +7,9 @@ description = "Spring REST Docs REST Assured"
 
 dependencies {
 	api(project(":spring-restdocs-core"))
-	api("io.rest-assured:rest-assured")
-
+	api("io.rest-assured:rest-assured") {
+		exclude group: "commons-logging", module: "commons-logging"
+	}
 	implementation("org.springframework:spring-web")
 
 	internal(platform(project(":spring-restdocs-platform")))