Merge pull request #6928 from thc202/spiderAjax/log-libs

spiderAjax: fix logging dependencies

Author: psiinon

addOns/spiderAjax/CHANGELOG.md

@@ -4,7 +4,8 @@ All notable changes to this add-on will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## Unreleased
-
+### Fixed
+- Correct bundled logging dependencies.
 
 ## [23.27.0] - 2025-11-04
 ### Added

addOns/spiderAjax/spiderAjax.gradle.kts

@@ -78,6 +78,7 @@ dependencies {
     compileOnly(libs.log4j.core)
 
     implementation(files("lib/crawljax-core-3.7.1.jar"))
+    implementation(libs.log4j.slf4j2)
     implementation(libs.spiderAjax.apache.commons.math)
     implementation(libs.spiderAjax.metricsCore)
     implementation(libs.spiderAjax.findBugsAnnotations)
@@ -87,12 +88,7 @@ dependencies {
     }
     implementation(libs.spiderAjax.jcipAnnotations)
     implementation(libs.spiderAjax.nekohtml)
-    implementation(libs.spiderAjax.jclOverSlf4j)
     implementation(libs.spiderAjax.julToSlf4j)
-    implementation(libs.spiderAjax.slf4j.log4j12) {
-        // Provided by ZAP.
-        exclude(group = "log4j", module = "log4j")
-    }
     implementation(libs.spiderAjax.xmlunit)
 
     testImplementation(libs.log4j.core)

gradle/libs.versions.toml

@@ -93,11 +93,9 @@ spiderAjax-apache-commons-math = "commons-math:commons-math:1.2"
 spiderAjax-findBugsAnnotations = "com.google.code.findbugs:jsr305:3.0.2"
 spiderAjax-guiceAssistedInject = "com.google.inject.extensions:guice-assistedinject:5.0.1"
 spiderAjax-jcipAnnotations = "net.jcip:jcip-annotations:1.0"
-spiderAjax-jclOverSlf4j = { module = "org.slf4j:jcl-over-slf4j", version.ref = "slf4j" }
 spiderAjax-julToSlf4j = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
 spiderAjax-metricsCore = "com.codahale.metrics:metrics-core:3.0.2"
 spiderAjax-nekohtml = "net.sourceforge.nekohtml:nekohtml:1.9.22"
-spiderAjax-slf4j-log4j12 = { module = "org.slf4j:slf4j-log4j12", version.ref = "slf4j" }
 spiderAjax-xmlunit = "xmlunit:xmlunit:1.6"
 sqliplugin-jdom = "org.jdom:jdom:2.0.2"
 test-hamcrest = "org.hamcrest:hamcrest-library:3.0"