From 5902b46e9bd87fa5df4b1fc1ff35f784496a2d23 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Wed, 19 Jan 2022 15:32:01 -0600 Subject: [PATCH] Remove jcl-over-slf4j Issue gh-10499 # Conflicts: # dependencies/spring-security-dependencies.gradle --- config/spring-security-config.gradle | 1 - core/spring-security-core.gradle | 1 - dependencies/spring-security-dependencies.gradle | 1 - ldap/spring-security-ldap.gradle | 1 - messaging/spring-security-messaging.gradle | 1 - 5 files changed, 5 deletions(-) diff --git a/config/spring-security-config.gradle b/config/spring-security-config.gradle index 72763d2091e..2635702e7eb 100644 --- a/config/spring-security-config.gradle +++ b/config/spring-security-config.gradle @@ -90,7 +90,6 @@ dependencies { exclude group: 'commons-logging', module: 'commons-logging' exclude group: 'io.netty', module: 'netty' } - testImplementation 'org.slf4j:jcl-over-slf4j' testImplementation 'org.springframework.ldap:spring-ldap-core' testImplementation 'org.springframework:spring-expression' testImplementation 'org.springframework:spring-jdbc' diff --git a/core/spring-security-core.gradle b/core/spring-security-core.gradle index 213f24f92c5..06b9700e14d 100644 --- a/core/spring-security-core.gradle +++ b/core/spring-security-core.gradle @@ -31,7 +31,6 @@ dependencies { testImplementation "org.mockito:mockito-junit-jupiter" testImplementation "org.springframework:spring-test" testImplementation 'org.skyscreamer:jsonassert' - testImplementation 'org.slf4j:jcl-over-slf4j' testImplementation 'org.springframework:spring-test' testRuntimeOnly 'org.hsqldb:hsqldb' diff --git a/dependencies/spring-security-dependencies.gradle b/dependencies/spring-security-dependencies.gradle index fcd735faffb..af5286d581b 100644 --- a/dependencies/spring-security-dependencies.gradle +++ b/dependencies/spring-security-dependencies.gradle @@ -67,7 +67,6 @@ dependencies { api "org.seleniumhq.selenium:selenium-java:3.141.59" api "org.seleniumhq.selenium:selenium-support:3.141.59" api "org.skyscreamer:jsonassert:1.5.0" - api "org.slf4j:jcl-over-slf4j:1.7.32" api "org.slf4j:log4j-over-slf4j:1.7.32" api "org.slf4j:slf4j-api:1.7.32" api "org.springframework.ldap:spring-ldap-core:2.3.5.RELEASE" diff --git a/ldap/spring-security-ldap.gradle b/ldap/spring-security-ldap.gradle index e16802ea452..690b37e7f0a 100644 --- a/ldap/spring-security-ldap.gradle +++ b/ldap/spring-security-ldap.gradle @@ -25,7 +25,6 @@ dependencies { } testImplementation project(':spring-security-test') - testImplementation 'org.slf4j:jcl-over-slf4j' testImplementation 'org.slf4j:slf4j-api' testImplementation "org.assertj:assertj-core" testImplementation "org.junit.jupiter:junit-jupiter-api" diff --git a/messaging/spring-security-messaging.gradle b/messaging/spring-security-messaging.gradle index 6556c0e6b00..f1c7c16e7d4 100644 --- a/messaging/spring-security-messaging.gradle +++ b/messaging/spring-security-messaging.gradle @@ -24,7 +24,6 @@ dependencies { testImplementation "org.mockito:mockito-junit-jupiter" testImplementation "org.springframework:spring-test" testImplementation "org.slf4j:slf4j-api" - testImplementation "org.slf4j:jcl-over-slf4j" testImplementation "org.slf4j:log4j-over-slf4j" testImplementation "ch.qos.logback:logback-classic"