From 5a3cef7b8f57e7aece4d04bf67704698f02b1336 Mon Sep 17 00:00:00 2001
From: Jeremy Long <jeremy.long@gmail.com>
Date: Fri, 24 Nov 2023 09:15:10 -0500
Subject: [PATCH] fix: mute jcs logging (#6130)

---
 ant/src/main/java/org/owasp/dependencycheck/taskdefs/Purge.java | 1 +
 cli/src/main/java/org/owasp/dependencycheck/App.java            | 1 +
 core/src/main/java/org/owasp/dependencycheck/Engine.java        | 2 --
 core/src/test/java/org/owasp/dependencycheck/BaseTest.java      | 1 +
 .../owasp/dependencycheck/maven/BaseDependencyCheckMojo.java    | 2 ++
 pom.xml                                                         | 2 +-
 6 files changed, 6 insertions(+), 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
index 152b883e078..8adeef5dc46 100644
--- 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
index 7011a077c86..6505b372d4b 100644
--- 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
index e0b829a48aa..6f4039dbb56 100644
--- 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
index 4b2213c4b93..10ebb3c0c19 100644
--- 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
index b7c7a1bcefe..a86c35cba21 100644
--- 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
index bc36ca9aedf..3bdfd2ee451 100644
--- 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>