From 3c641dee754bd1cb6a2c8ad6358a3e6089911de4 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Fri, 14 Jan 2022 16:35:12 -0600 Subject: [PATCH] Remove commons-logging Closes gh-10499 --- config/spring-security-config.gradle | 1 + dependencies/spring-security-dependencies.gradle | 1 - openid/spring-security-openid.gradle | 5 ++++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/config/spring-security-config.gradle b/config/spring-security-config.gradle index 9274704bb4..556a64dbbe 100644 --- a/config/spring-security-config.gradle +++ b/config/spring-security-config.gradle @@ -82,6 +82,7 @@ dependencies { testImplementation "org.mockito:mockito-inline" testImplementation ('org.openid4java:openid4java-nodeps') { exclude group: 'com.google.code.guice', module: 'guice' + exclude group: 'commons-logging', module: 'commons-logging' } testImplementation('org.seleniumhq.selenium:htmlunit-driver') { exclude group: 'commons-logging', module: 'commons-logging' diff --git a/dependencies/spring-security-dependencies.gradle b/dependencies/spring-security-dependencies.gradle index 7f5b1cf4cc..d619f5f6a7 100644 --- a/dependencies/spring-security-dependencies.gradle +++ b/dependencies/spring-security-dependencies.gradle @@ -25,7 +25,6 @@ dependencies { api "com.unboundid:unboundid-ldapsdk:4.0.14" api "commons-codec:commons-codec:1.15" api "commons-collections:commons-collections:3.2.2" - api "commons-logging:commons-logging:1.2" api "io.mockk:mockk:1.12.2" api "io.projectreactor.tools:blockhound:1.0.6.RELEASE" api "javax.annotation:jsr250-api:1.0" diff --git a/openid/spring-security-openid.gradle b/openid/spring-security-openid.gradle index 0725b0d0a8..7120a61371 100644 --- a/openid/spring-security-openid.gradle +++ b/openid/spring-security-openid.gradle @@ -16,6 +16,7 @@ dependencies { // We use the maven central version here instead. api('org.openid4java:openid4java-nodeps') { exclude group: 'com.google.code.guice', module: 'guice' + exclude group: 'commons-logging', module: 'commons-logging' } api 'org.springframework:spring-aop' api 'org.springframework:spring-beans' @@ -26,7 +27,9 @@ dependencies { provided 'javax.servlet:javax.servlet-api' runtimeOnly 'net.sourceforge.nekohtml:nekohtml' - runtimeOnly 'org.apache.httpcomponents:httpclient' + runtimeOnly('org.apache.httpcomponents:httpclient') { + exclude group: 'commons-logging', module: 'commons-logging' + } testImplementation "org.assertj:assertj-core" testImplementation "org.junit.jupiter:junit-jupiter-api"