Skip to content

Commit ab407ad

Browse files
committed
WIP, tomcat messages not logged during integration test.
1 parent 65a4205 commit ab407ad

File tree

5 files changed

+32
-28
lines changed

5 files changed

+32
-28
lines changed

cwms-data-api/build.gradle

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,15 @@ configurations {
2121
}
2222

2323
configurations.implementation {
24-
exclude group: 'com.oracle.database.jdbc'
24+
exclude group: 'com.oracle.database.jdbc'
2525
}
2626

2727
configurations.all {
2828
exclude group: 'dom4j'
2929
exclude group: 'org.apache.xmlbeans'
3030
exclude group: 'org.apache.poi'
3131
exclude group: 'org.bouncycastle'
32+
exclude group: 'org.apache.tomcat', module: 'tomcat-juli'
3233
}
3334

3435
dependencies {
@@ -64,7 +65,7 @@ dependencies {
6465
}
6566
implementation(files("$buildDir/libs/${project.name}-${project.version}-codegen-shadow.jar"))
6667

67-
implementation(libs.slf4j)
68+
compileOnly(libs.slf4j)
6869

6970
implementation(libs.monolith) {
7071
//exclude group: "org.python", module: "jython-standalone"
@@ -77,8 +78,9 @@ dependencies {
7778
implementation(libs.google.errorProne)
7879
implementation(project(":flogger-cda-context"))
7980
runtimeOnly(libs.google.flogger.system.backend)
80-
runtimeOnly(libs.google.flogger.slf4j.backend)
81-
runtimeOnly(libs.ch.qos.logback)
81+
runtimeOnly(libs.google.flogger.slf4j.backend) {
82+
exclude group: "org.slf4j"
83+
}
8284

8385
implementation(libs.nucleus.data) {
8486
exclude group: "org.jdom"
@@ -156,10 +158,16 @@ dependencies {
156158

157159
tomcatLibs(libs.bundles.tomcat.embedded)
158160
tomcatLibs(libs.bundles.tomcat.support)
161+
162+
implementation(libs.slf4j)
163+
testImplementation(libs.slf4j.jul)
159164
tomcatLibs(libs.google.flogger.api)
160165
tomcatLibs(libs.google.flogger.system.backend)
161-
tomcatLibs(libs.google.flogger.slf4j.backend)
162-
tomcatLibs(libs.ch.qos.logback)
166+
tomcatLibs(libs.google.flogger.slf4j.backend) {
167+
exclude group: "org.slf4j"
168+
}
169+
//./gr testRuntimeOnly(libs.slf4j)
170+
baseLibs(libs.ch.qos.logback)
163171

164172
testImplementation(libs.bundles.testcontainers)
165173

@@ -189,7 +197,10 @@ task extractWebJars(type: Copy) {
189197
war {
190198
dependsOn extractWebJars
191199
from "$buildDir/extra"
192-
from "src/resources/"
200+
from "src/resources/"
201+
// classpath = classpath.filter { file ->
202+
// !file.name.contains("slf4j-api")
203+
// }
193204

194205
manifest {
195206
attributes "build-version": project.version

cwms-data-api/src/main/webapp/WEB-INF/classes/logback.xml

Lines changed: 0 additions & 17 deletions
This file was deleted.

cwms-data-api/src/test/java/fixtures/CwmsDataApiSetupCallback.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import java.time.Duration;
1010
import java.util.ArrayList;
1111
import java.util.List;
12+
import java.util.logging.LogManager;
1213

1314
import org.apache.catalina.Manager;
1415
import org.apache.commons.io.IOUtils;
@@ -21,6 +22,7 @@
2122
import org.junit.jupiter.api.extension.BeforeAllCallback;
2223
import org.junit.jupiter.api.extension.ExtendWith;
2324
import org.junit.jupiter.api.extension.ExtensionContext;
25+
import org.slf4j.bridge.SLF4JBridgeHandler;
2426

2527
import com.google.common.flogger.FluentLogger;
2628

@@ -74,6 +76,12 @@ public class CwmsDataApiSetupCallback implements BeforeAllCallback,AfterAllCallb
7476
VERSION_INT = versionInt();
7577
}
7678

79+
static {
80+
//LogManager.getLogManager().reset();
81+
SLF4JBridgeHandler.removeHandlersForRootLogger();
82+
SLF4JBridgeHandler.install();
83+
}
84+
7785
private static String schemaVersion()
7886
{
7987
String ret;

cwms-data-api/src/test/java/fixtures/TomcatServer.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ public class TomcatServer {
3030
private Tomcat tomcatInstance = null;
3131
private Manager sessionManager = null;
3232
private SingleSignOnWrapper ssoValve = new SingleSignOnWrapper();
33+
3334
/**
3435
* Setups the baseline for tomcat to run.
3536
* @param baseDir set to the CATALINA_BASE directory the build has setup

gradle/libs.versions.toml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ jaxb-impl = "3.0.2"
44
jooq-codegen = "26.02.17-RC01-oracle19c"
55
jooq-codegen-shadow = "24.12.04-2025.01.21"
66
jooq = "3.18.7-jdk11"
7-
slf4j = "2.0.9"
7+
slf4j = "2.0.17"
88
hec-monolith = "3.3.20"
99
hec-nucleus = "2.0.1"
1010
flogger = "0.9"
11-
logback = "1.4.14"
11+
logback = "1.5.32"
1212
google-findbugs = "3.0.2"
1313
error_prone_annotations = "2.15.0"
1414
cwms-ratings = "4.2.3"
@@ -57,6 +57,7 @@ cwms-db-jooq-codegen = { module = "mil.army.usace.hec:cwms-db-jooq-codegen_java1
5757
cwms-db-jooq-codegen-shadow = { module = "mil.army.usace.hec:cwms-db-jooq-codegen_java8", version.ref = "jooq-codegen-shadow" }
5858
jooq = { module = "org.jooq.pro-java-11:jooq", version.ref ="jooq" }
5959
slf4j = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
60+
slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
6061
monolith = { module = "mil.army.usace.hec:hec-monolith", version.ref = "hec-monolith" }
6162
google-flogger-api = { module = "com.google.flogger:flogger", version.ref = "flogger" }
6263
google-flogger-system-backend = { module = "com.google.flogger:flogger-system-backend", version.ref = "flogger" }
@@ -131,7 +132,7 @@ javaparser-symbol-solver-core = { module = "com.github.javaparser:javaparser-sym
131132

132133
tomcat-embedded-core = { module = "org.apache.tomcat.embed:tomcat-embed-core", version.ref = "tomcat" }
133134
tomcat-embedded-jasper = { module = "org.apache.tomcat.embed:tomcat-embed-jasper", version.ref = "tomcat" }
134-
tomcat-juli = { module = "org.apache.tomcat:tomcat-juli", version.ref = "tomcat" }
135+
# tomcat-juli = { module = "org.apache.tomcat:tomcat-juli", version.ref = "tomcat" }
135136
tomcat-jdbc = { module = "org.apache.tomcat:tomcat-jdbc", version.ref = "tomcat" }
136137

137138

@@ -146,7 +147,7 @@ com-google-auto-service = { module = "com.google.auto.service:auto-service", ver
146147
[bundles]
147148
junit = ["junit-jupiter-api", "junit-jupiter-params", "junit-jupiter-engine", "junit-platform-launcher"]
148149
tomcat-embedded = [ "tomcat-embedded-core", "tomcat-embedded-jasper" ]
149-
tomcat-support = [ "tomcat-juli", "tomcat-jdbc" ]
150+
tomcat-support = [ "tomcat-jdbc" ]
150151
testcontainers = [ "testcontainers-base", "testcontainers-database-commons", "testcontainers-jdbc",
151152
"testcontainers-junit-jupiter", "testcontainers-cwms", "testcontainers-minio" ]
152153
metrics = ["metrics-core", "metrics-servlets", "metrics-prometheus-client", "metrics-prometheus-servlets" ]

0 commit comments

Comments
 (0)