Skip to content

Commit 3db1b94

Browse files
committed
Replace spring-jcl with regular Apache Commons Logging 1.3
Closes gh-32459
1 parent c5eefaa commit 3db1b94

File tree

19 files changed

+6
-1404
lines changed

19 files changed

+6
-1404
lines changed

build.gradle

-3
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,6 @@ configure([rootProject] + javaProjects) { project ->
7979
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
8080
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
8181
testRuntimeOnly("org.junit.platform:junit-platform-suite-engine")
82-
testRuntimeOnly("org.apache.logging.log4j:log4j-core")
83-
testRuntimeOnly("org.apache.logging.log4j:log4j-jul")
84-
testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j2-impl")
8582
// JSR-305 only used for non-required meta-annotations
8683
compileOnly("com.google.code.findbugs:jsr305")
8784
testCompileOnly("com.google.code.findbugs:jsr305")

framework-docs/modules/ROOT/nav.adoc

-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@
101101
*** xref:core/aop-api/extensibility.adoc[]
102102
** xref:core/null-safety.adoc[]
103103
** xref:core/databuffer-codec.adoc[]
104-
** xref:core/spring-jcl.adoc[]
105104
** xref:core/aot.adoc[]
106105
** xref:core/appendix.adoc[]
107106
*** xref:core/appendix/xsd-schemas.adoc[]

framework-docs/modules/ROOT/pages/core/spring-jcl.adoc

-47
This file was deleted.

framework-platform/framework-platform.gradle

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ dependencies {
1414
api(platform("io.projectreactor:reactor-bom:2024.0.1"))
1515
api(platform("io.rsocket:rsocket-bom:1.1.4"))
1616
api(platform("org.apache.groovy:groovy-bom:4.0.24"))
17-
api(platform("org.apache.logging.log4j:log4j-bom:2.21.1"))
1817
api(platform("org.assertj:assertj-bom:3.26.3"))
1918
api(platform("org.eclipse.jetty:jetty-bom:12.0.15"))
2019
api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.15"))
@@ -45,6 +44,7 @@ dependencies {
4544
api("com.thoughtworks.qdox:qdox:2.1.0")
4645
api("com.thoughtworks.xstream:xstream:1.4.21")
4746
api("commons-io:commons-io:2.15.0")
47+
api("commons-logging:commons-logging:1.3.4")
4848
api("de.bechte.junit:junit-hierarchicalcontextrunner:4.12.2")
4949
api("io.micrometer:context-propagation:1.1.1")
5050
api("io.mockk:mockk:1.13.4")
@@ -138,7 +138,6 @@ dependencies {
138138
api("org.seleniumhq.selenium:htmlunit3-driver:4.26.0")
139139
api("org.seleniumhq.selenium:selenium-java:4.26.0")
140140
api("org.skyscreamer:jsonassert:1.5.3")
141-
api("org.slf4j:slf4j-api:2.0.16")
142141
api("org.testng:testng:7.10.2")
143142
api("org.webjars:underscorejs:1.8.3")
144143
api("org.webjars:webjars-locator-lite:1.0.0")

settings.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ include "spring-core"
1414
include "spring-core-test"
1515
include "spring-expression"
1616
include "spring-instrument"
17-
include "spring-jcl"
1817
include "spring-jdbc"
1918
include "spring-jms"
2019
include "spring-messaging"

spring-core/spring-core.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ dependencies {
7070
objenesis("org.objenesis:objenesis:${objenesisVersion}@jar")
7171
api(files(javapoetRepackJar))
7272
api(files(objenesisRepackJar))
73-
api(project(":spring-jcl"))
73+
api("commons-logging:commons-logging")
7474
compileOnly("io.projectreactor.tools:blockhound")
7575
compileOnly("org.graalvm.sdk:graal-sdk")
7676
optional("io.micrometer:context-propagation")

spring-core/src/main/java/org/springframework/core/log/LogDelegateFactory.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2021 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -26,9 +26,7 @@
2626
/**
2727
* Factory for common {@link Log} delegates with Spring's logging conventions.
2828
*
29-
* <p>Mainly for internal use within the framework with Apache Commons Logging,
30-
* typically in the form of the {@code spring-jcl} bridge but also compatible
31-
* with other Commons Logging bridges.
29+
* <p>Mainly for internal use within the framework with Apache Commons Logging.
3230
*
3331
* @author Rossen Stoyanchev
3432
* @author Juergen Hoeller

spring-core/src/main/java/org/springframework/core/log/LogFormatUtils.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2023 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -28,9 +28,7 @@
2828
/**
2929
* Utility methods for formatting and logging messages.
3030
*
31-
* <p>Mainly for internal use within the framework with Apache Commons Logging,
32-
* typically in the form of the {@code spring-jcl} bridge but also compatible
33-
* with other Commons Logging bridges.
31+
* <p>Mainly for internal use within the framework with Apache Commons Logging.
3432
*
3533
* @author Rossen Stoyanchev
3634
* @author Juergen Hoeller

spring-jcl/spring-jcl.gradle

-6
This file was deleted.

spring-jcl/src/main/java/org/apache/commons/logging/Log.java

-196
This file was deleted.

0 commit comments

Comments
 (0)