Fixed log dependencies of javax.servlet Jetty tests (Jetty logs weren't visible)
diff --git a/build.gradle.kts b/build.gradle.kts
index 82f8917..e34574c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -602,9 +602,11 @@
val tagLibsVersion = "1.2.5"
val jakartaJettyVersion = "11.0.19"
-val jakartaSlf4jVersion = "2.0.9"
val jakartaSpringVersion = "6.1.2"
+val jettySlf4jVersion = "2.0.9"
+val jettyLogbackClassicVersion = "1.3.14"
+
configurations {
compileOnly {
exclude(group = "xml-apis", module = "xml-apis")
@@ -668,7 +670,14 @@
"javaxServletTestImplementation"("org.springframework:spring-web:${springVersion}") {
exclude(group = "commons-logging", module = "commons-logging")
}
- "javaxServletTestImplementation"("com.github.hazendaz:displaytag:2.5.3")
+ "javaxServletTestImplementation"("com.github.hazendaz:displaytag:2.5.3") {
+ exclude(group = "org.slf4j", module = "slf4j-api")
+ }
+
+ "javaxServletTestRuntimeOnly"("org.slf4j:slf4j-api:${jettySlf4jVersion}")
+ "javaxServletTestRuntimeOnly"("org.slf4j:log4j-over-slf4j:${jettySlf4jVersion}")
+ "javaxServletTestRuntimeOnly"("org.slf4j:jcl-over-slf4j:${jettySlf4jVersion}")
+ "javaxServletTestRuntimeOnly"("ch.qos.logback:logback-classic:${jettyLogbackClassicVersion}")
"jakartaServletTestImplementation"("org.eclipse.jetty:jetty-server:${jakartaJettyVersion}")
"jakartaServletTestImplementation"("org.eclipse.jetty:jetty-annotations:${jakartaJettyVersion}")
@@ -681,7 +690,6 @@
"jakartaServletTestImplementation"("jakarta.servlet.jsp:jakarta.servlet.jsp-api:3.0.0")
"jakartaServletTestImplementation"("jakarta.el:jakarta.el-api:4.0.0")
- // JSP JSTL (not included in Jetty):
"jakartaServletTestImplementation"("com.github.hazendaz:displaytag:3.0.0-M2")
"jakartaServletTestImplementation"("org.springframework:spring-core:${jakartaSpringVersion}") {
@@ -694,10 +702,10 @@
exclude(group = "commons-logging", module = "commons-logging")
}
- "jakartaServletTestRuntimeOnly"("org.slf4j:slf4j-api:${jakartaSlf4jVersion}")
- "jakartaServletTestRuntimeOnly"("org.slf4j:log4j-over-slf4j:${jakartaSlf4jVersion}")
- "jakartaServletTestRuntimeOnly"("org.slf4j:jcl-over-slf4j:${jakartaSlf4jVersion}")
- "jakartaServletTestRuntimeOnly"("ch.qos.logback:logback-classic:1.3.14")
+ "jakartaServletTestRuntimeOnly"("org.slf4j:slf4j-api:${jettySlf4jVersion}")
+ "jakartaServletTestRuntimeOnly"("org.slf4j:log4j-over-slf4j:${jettySlf4jVersion}")
+ "jakartaServletTestRuntimeOnly"("org.slf4j:jcl-over-slf4j:${jettySlf4jVersion}")
+ "jakartaServletTestRuntimeOnly"("ch.qos.logback:logback-classic:${jettyLogbackClassicVersion}")
"jython20CompileOnly"("jython:jython:2.1")
