From 68a981388a75d4b7c1c10025e39c13aa8a642cd6 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 18 Nov 2021 14:47:35 +0000 Subject: [PATCH] Exclude unwanted commons-logging dependencies Closes gh-757 --- docs/build.gradle | 1 - spring-restdocs-asciidoctor/build.gradle | 4 +++- spring-restdocs-mockmvc/build.gradle | 2 -- spring-restdocs-restassured/build.gradle | 4 +++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/build.gradle b/docs/build.gradle index 152468dd..992964a5 100644 --- a/docs/build.gradle +++ b/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("javax.validation:validation-api") testImplementation("junit:junit") testImplementation("org.testng:testng:6.9.10") diff --git a/spring-restdocs-asciidoctor/build.gradle b/spring-restdocs-asciidoctor/build.gradle index 1a6d429b..18ae6483 100644 --- a/spring-restdocs-asciidoctor/build.gradle +++ b/spring-restdocs-asciidoctor/build.gradle @@ -19,7 +19,9 @@ dependencies { merge project(":spring-restdocs-asciidoctor-2.x") testImplementation("junit:junit") - testImplementation("org.apache.pdfbox:pdfbox") + testImplementation("org.apache.pdfbox:pdfbox") { + exclude group: "commons-logging", module: "commons-logging" + } testImplementation("org.asciidoctor:asciidoctorj:1.5.8.1") testImplementation("org.assertj:assertj-core") testImplementation("org.springframework:spring-core") diff --git a/spring-restdocs-mockmvc/build.gradle b/spring-restdocs-mockmvc/build.gradle index e6c1f35d..e5468fb7 100644 --- a/spring-restdocs-mockmvc/build.gradle +++ b/spring-restdocs-mockmvc/build.gradle @@ -22,8 +22,6 @@ dependencies { testImplementation("org.hamcrest:hamcrest-library") testImplementation("org.mockito:mockito-core") testImplementation("org.springframework.hateoas:spring-hateoas") - - testRuntimeOnly("commons-logging:commons-logging:1.2") } compatibilityTest { diff --git a/spring-restdocs-restassured/build.gradle b/spring-restdocs-restassured/build.gradle index 6b3546d1..9e660ec6 100644 --- a/spring-restdocs-restassured/build.gradle +++ b/spring-restdocs-restassured/build.gradle @@ -8,7 +8,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")