Replace spring-jcl with vanilla commons-logging

See gh-45487

Co-authored-by: Phillip Webb <phil.webb@broadcom.com>
This commit is contained in:
Stéphane Nicoll
2025-05-07 11:47:52 -07:00
committed by Phillip Webb
parent 111e710576
commit 6fceab2c90
19 changed files with 70 additions and 145 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2024 the original author or authors.
* Copyright 2012-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ import org.gradle.api.tasks.TaskAction;
public abstract class CheckClasspathForProhibitedDependencies extends DefaultTask {
private static final Set<String> PROHIBITED_GROUPS = Set.of("org.codehaus.groovy", "org.eclipse.jetty.toolchain",
"commons-logging", "org.apache.geronimo.specs", "com.sun.activation");
"org.apache.geronimo.specs", "com.sun.activation");
private static final Set<String> PERMITTED_JAVAX_GROUPS = Set.of("javax.batch", "javax.cache", "javax.money");

View File

@@ -7,18 +7,14 @@ bom {
"activemq-broker",
"activemq-camel",
"activemq-client",
"activemq-console" {
exclude group: "commons-logging", module: "commons-logging"
},
"activemq-console",
"activemq-http",
"activemq-jaas",
"activemq-jdbc-store",
"activemq-jms-pool",
"activemq-kahadb-store",
"activemq-karaf",
"activemq-leveldb-store" {
exclude group: "commons-logging", module: "commons-logging"
},
"activemq-leveldb-store",
"activemq-log4j-appender",
"activemq-mqtt",
"activemq-openwire-generator",
@@ -30,9 +26,7 @@ bom {
"activemq-run",
"activemq-runtime-config",
"activemq-shiro",
"activemq-spring" {
exclude group: "commons-logging", module: "commons-logging"
},
"activemq-spring",
"activemq-stomp",
"activemq-web"
]