fix: mute jcs logging (#6130)

jeremylong · Nov 24, 2023 · 5a3cef7 · 5a3cef7
1 parent 8706c3e
commit 5a3cef7
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 3 deletions.
diff --git a/ant/src/main/java/org/owasp/dependencycheck/taskdefs/Purge.java b/ant/src/main/java/org/owasp/dependencycheck/taskdefs/Purge.java
@@ -164,6 +164,7 @@ public final void execute() throws BuildException {
     private void muteJCS() {
         if (System.getProperty("jcs.logSystem") == null) {
             System.setProperty("jcs.logSystem", "slf4j");
+            System.setProperty("jcs.logSystem.mute", "true");
         }
 
         final String[] noisyLoggers = {

diff --git a/cli/src/main/java/org/owasp/dependencycheck/App.java b/cli/src/main/java/org/owasp/dependencycheck/App.java
@@ -81,6 +81,7 @@ public class App {
     public static void main(String[] args) {
         if (System.getProperty("jcs.logSystem") == null) {
             System.setProperty("jcs.logSystem", "slf4j");
+            System.setProperty("jcs.logSystem.mute", Boolean.toString(!LOGGER.isDebugEnabled()));
         }
         final int exitCode;
         final App app = new App();

diff --git a/core/src/main/java/org/owasp/dependencycheck/Engine.java b/core/src/main/java/org/owasp/dependencycheck/Engine.java
@@ -19,7 +19,6 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.jcs3.JCS;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.owasp.dependencycheck.analyzer.AnalysisPhase;
@@ -219,7 +218,6 @@ public void close() {
         } else {
             System.clearProperty("javax.xml.accessExternalSchema");
         }
-        JCS.shutdown();
     }
 
     /**

diff --git a/core/src/test/java/org/owasp/dependencycheck/BaseTest.java b/core/src/test/java/org/owasp/dependencycheck/BaseTest.java
@@ -43,6 +43,7 @@ public abstract class BaseTest {
     public void setUp() throws Exception {
         if (System.getProperty("jcs.logSystem") == null) {
             System.setProperty("jcs.logSystem", "slf4j");
+            System.setProperty("jcs.logSystem.mute", "true");
         }
         settings = new Settings();
     }

diff --git a/maven/src/main/java/org/owasp/dependencycheck/maven/BaseDependencyCheckMojo.java b/maven/src/main/java/org/owasp/dependencycheck/maven/BaseDependencyCheckMojo.java
@@ -2489,6 +2489,8 @@ private String[] determineSuppressions() {
     private void muteJCS() {
         if (System.getProperty("jcs.logSystem") == null) {
             System.setProperty("jcs.logSystem", "slf4j");
+
+            System.setProperty("jcs.logSystem.mute",Boolean.toString(!getLog().isDebugEnabled()));
         }
 
         final String[] noisyLoggers = {

diff --git a/pom.xml b/pom.xml
@@ -1011,7 +1011,7 @@ Copyright (c) 2012 - Jeremy Long
             <dependency>
                 <groupId>io.github.jeremylong</groupId>
                 <artifactId>jcs3-slf4j</artifactId>
-                <version>1.0.1</version>
+                <version>1.0.3</version>
             </dependency>
             <dependency>
                 <groupId>commons-validator</groupId>