Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: mute jcs logging #6130

Merged
merged 1 commit into from
Nov 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
1 change: 1 addition & 0 deletions cli/src/main/java/org/owasp/dependencycheck/App.java
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 0 additions & 2 deletions core/src/main/java/org/owasp/dependencycheck/Engine.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -219,7 +218,6 @@ public void close() {
} else {
System.clearProperty("javax.xml.accessExternalSchema");
}
JCS.shutdown();
}

/**
Expand Down
1 change: 1 addition & 0 deletions core/src/test/java/org/owasp/dependencycheck/BaseTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
2 changes: 1 addition & 1 deletion maven/src/it/1512-transitive-test/invoker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# Copyright (c) 2014 Jeremy Long. All Rights Reserved.
#

invoker.goals = -DnvdApiKey=${NVD_API_KEY} --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check -Dformat=XML -Dcve.startyear=2018
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://jeremylong.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check -Dformat=XML -Dcve.startyear=2018
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
# Copyright (c) 2014 Jeremy Long. All Rights Reserved.
#

invoker.goals.1 = install -DnvdApiKey=${NVD_API_KEY} --no-transfer-progress --batch-mode -Dcve.startyear=2018 -Danalyzer.ossindex.enabled=false -f old/pom.xml
invoker.goals.2 = verify -DnvdApiKey=${NVD_API_KEY} --no-transfer-progress --batch-mode -Dcve.startyear=2018 -Danalyzer.ossindex.enabled=false -f new/pom.xml
invoker.goals.1 = install -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://jeremylong.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Dcve.startyear=2018 -Danalyzer.ossindex.enabled=false -f old/pom.xml
invoker.goals.2 = verify -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://jeremylong.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Dcve.startyear=2018 -Danalyzer.ossindex.enabled=false -f new/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# Copyright (c) 2014 Jeremy Long. All Rights Reserved.
#

invoker.goals = -DnvdApiKey=${NVD_API_KEY} --no-transfer-progress --batch-mode -Dcve.startyear=2018 -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check -Dformat=XML -DskipDependencyManagement=false
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://jeremylong.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Dcve.startyear=2018 -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check -Dformat=XML -DskipDependencyManagement=false
2 changes: 1 addition & 1 deletion maven/src/it/1677-dependency-management/invoker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# Copyright (c) 2014 Jeremy Long. All Rights Reserved.
#

invoker.goals = -DnvdApiKey=${NVD_API_KEY} --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check -Dformat=XML -DskipDependencyManagement=false -Dcve.startyear=2018
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://jeremylong.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check -Dformat=XML -DskipDependencyManagement=false -Dcve.startyear=2018
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# Copyright (c) 2014 Jeremy Long. All Rights Reserved.
#

invoker.goals = -DnvdApiKey=${NVD_API_KEY} verify --no-transfer-progress --batch-mode -Dcve.startyear=2018 -Danalyzer.ossindex.enabled=false -X
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://jeremylong.github.io/DependencyCheck/hb_nvd/ verify --no-transfer-progress --batch-mode -Dcve.startyear=2018 -Danalyzer.ossindex.enabled=false -X
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# Copyright (c) 2014 Jeremy Long. All Rights Reserved.
#

invoker.goals = -DnvdApiKey=${NVD_API_KEY} --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:aggregate -Dformat=JSON -Dcve.startyear=2018
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://jeremylong.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:aggregate -Dformat=JSON -Dcve.startyear=2018
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# Copyright (c) 2014 Jeremy Long. All Rights Reserved.
#

invoker.goals = -DnvdApiKey=${NVD_API_KEY} --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check -Dformat=XML -Dcve.startyear=2018
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://jeremylong.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check -Dformat=XML -Dcve.startyear=2018
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
#

# NOTE needs a -U as maven invoker builds otherwise cannot resolve RELEASE/SNAPSHOT meta-versions
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -U --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:aggregate -Dformat=XML -Dcve.startyear=2018
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://jeremylong.github.io/DependencyCheck/hb_nvd/ -U --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:aggregate -Dformat=XML -Dcve.startyear=2018
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# Copyright (c) 2014 Jeremy Long. All Rights Reserved.
#

invoker.goals = -DnvdApiKey=${NVD_API_KEY} --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:aggregate -Dformat=XML -Dcve.startyear=2018
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://jeremylong.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:aggregate -Dformat=XML -Dcve.startyear=2018
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# Copyright (c) 2014 Jeremy Long. All Rights Reserved.
#

invoker.goals = -DnvdApiKey=${NVD_API_KEY} --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:aggregate -Dformat=XML -Dcve.startyear=2018
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://jeremylong.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:aggregate -Dformat=XML -Dcve.startyear=2018
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
# Copyright (c) 2023 Hans Aikema. All Rights Reserved.
#
# Note: the first goals needs the -U in order to properly resolve the RELEASE / LATEST meta-versions
invoker.goals.1 = install -DnvdApiKey=${NVD_API_KEY} --no-transfer-progress --batch-mode -f dep/pom.xml -U
invoker.goals.2 = verify -DnvdApiKey=${NVD_API_KEY} --no-transfer-progress --batch-mode -Dcve.startyear=2018 -Danalyzer.ossindex.enabled=false -f main/pom.xml
invoker.goals.1 = install -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://jeremylong.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -f dep/pom.xml -U
invoker.goals.2 = verify -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://jeremylong.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Dcve.startyear=2018 -Danalyzer.ossindex.enabled=false -f main/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# Copyright (c) 2014 Jeremy Long. All Rights Reserved.
#

invoker.goals = -DnvdApiKey=${NVD_API_KEY} install --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check -Dcve.startyear=2018
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://jeremylong.github.io/DependencyCheck/hb_nvd/ install --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check -Dcve.startyear=2018
2 changes: 1 addition & 1 deletion maven/src/it/618-aggregator-update-only/invoker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# Copyright (c) 2014 Jeremy Long. All Rights Reserved.
#

invoker.goals = -DnvdApiKey=${NVD_API_KEY} --no-transfer-progress --batch-mode -Danalyzer.central.enabled=false -Danalyzer.ossindex.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:update-only -Dcve.startyear=2018
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://jeremylong.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Danalyzer.central.enabled=false -Danalyzer.ossindex.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:update-only -Dcve.startyear=2018
2 changes: 1 addition & 1 deletion maven/src/it/629-jackson-dataformat/invoker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# Copyright (c) 2014 Jeremy Long. All Rights Reserved.
#

invoker.goals = -DnvdApiKey=${NVD_API_KEY} --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check -Dformat=XML -Dcve.startyear=2018
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://jeremylong.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check -Dformat=XML -Dcve.startyear=2018
2 changes: 1 addition & 1 deletion maven/src/it/690-threadsafety/invoker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# Copyright (c) 2014 Jeremy Long. All Rights Reserved.
#

invoker.goals = -DnvdApiKey=${NVD_API_KEY} --no-transfer-progress --batch-mode -Dcve.startyear=2018 -Dformat=JSON -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check -T 8 -X
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://jeremylong.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Dcve.startyear=2018 -Dformat=JSON -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check -T 8 -X
2 changes: 1 addition & 1 deletion maven/src/it/710-pom-parse-error/invoker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# Copyright (c) 2014 Jeremy Long. All Rights Reserved.
#

invoker.goals = -DnvdApiKey=${NVD_API_KEY} --no-transfer-progress --batch-mode -Dcve.startyear=2018 -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check -Dformat=JSON
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://jeremylong.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Dcve.startyear=2018 -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check -Dformat=JSON
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
#
# Copyright (c) 2017 The OWASP Foundation. All Rights Reserved.
#
invoker.goals = -DnvdApiKey=${NVD_API_KEY} --no-transfer-progress --batch-mode -Dformat=JSON -Dcve.startyear=2018 -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://jeremylong.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Dformat=JSON -Dcve.startyear=2018 -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check
2 changes: 1 addition & 1 deletion maven/src/it/740-aggregate/invoker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# Copyright (c) 2014 Jeremy Long. All Rights Reserved.
#

invoker.goals = verify -DnvdApiKey=${NVD_API_KEY} --no-transfer-progress --batch-mode -Dcve.startyear=2018 -Danalyzer.ossindex.enabled=false -X -T 1C
invoker.goals = verify -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://jeremylong.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Dcve.startyear=2018 -Danalyzer.ossindex.enabled=false -X -T 1C
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# Copyright (c) 2017 The OWASP Foundation. All Rights Reserved.
#
invoker.buildResult = failure
invoker.goals = -DnvdApiKey=${NVD_API_KEY} --no-transfer-progress --batch-mode -Dformat=JSON -Dcve.startyear=2018 -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:aggregate
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://jeremylong.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Dformat=JSON -Dcve.startyear=2018 -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:aggregate
2 changes: 1 addition & 1 deletion maven/src/it/846-site-plugin/invoker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
#
# Copyright (c) 2017 The OWASP Foundation. All Rights Reserved.
#
invoker.goals = -DnvdApiKey=${NVD_API_KEY} site --no-transfer-progress --batch-mode -Dcve.startyear=2018 -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false -Dodcversion=${project.version}
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://jeremylong.github.io/DependencyCheck/hb_nvd/ site --no-transfer-progress --batch-mode -Dcve.startyear=2018 -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false -Dodcversion=${project.version}
2 changes: 1 addition & 1 deletion maven/src/it/artifactory-analyzer/invoker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
#
# Copyright (c) 2017 The OWASP Foundation. All Rights Reserved.
#
invoker.goals = -DnvdApiKey=${NVD_API_KEY} --no-transfer-progress --batch-mode -Dformat=XML -Dcve.startyear=2018 -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false -Danalyzer.artifactory.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check
invoker.goals = -DnvdApiKey=${NVD_API_KEY} -DnvdDatafeedUrl=https://jeremylong.github.io/DependencyCheck/hb_nvd/ --no-transfer-progress --batch-mode -Dformat=XML -Dcve.startyear=2018 -Danalyzer.ossindex.enabled=false -Danalyzer.central.enabled=false -Danalyzer.artifactory.enabled=false ${project.groupId}:${project.artifactId}:${project.version}:check
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down