Skip to content

Commit fa774bd

Browse files
committed
chore: remove unnecessary upstreamed JCS logging configuration
dependency-check/DependencyCheck#8117 upstreams this configuration to dependency-check-core, so this is no longer necessary. It wasn't always working correctly/deterministically for some reason (possibly Gradle's internal use of slf4j?), so hopefully this addresses the situation more reliably for the Gradle plugin. Signed-off-by: Chad Wilson <[email protected]>
1 parent 93551e7 commit fa774bd

File tree

3 files changed

+0
-15
lines changed

3 files changed

+0
-15
lines changed

build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ dependencies {
3737
api(libs.owasp.dependencyCheck.utils)
3838
api(libs.openVuln.clients)
3939
api(libs.slack.webhook)
40-
implementation(libs.jcs3.slf4j)
4140

4241
testImplementation(gradleTestKit())
4342
testImplementation(libs.spock.core) {

gradle/libs.versions.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ owasp-dependencyCheck-core = { module = 'org.owasp:dependency-check-core', versi
88
owasp-dependencyCheck-utils = { module = 'org.owasp:dependency-check-utils', version.ref = 'odc' }
99
openVuln-clients = { module = 'io.github.jeremylong:open-vulnerability-clients', version = '6.1.7' }
1010
slack-webhook = { module = 'net.gpedro.integrations.slack:slack-webhook', version = '1.4.0' }
11-
jcs3-slf4j = { module = 'io.github.jeremylong:jcs3-slf4j', version = '1.0.5' }
1211

1312
junit-jupiter-api = { module = 'org.junit.jupiter:junit-jupiter-api', version.ref = 'junit' }
1413
junit-jupiter-params = { module = 'org.junit.jupiter:junit-jupiter-params', version.ref = 'junit' }

src/main/groovy/org/owasp/dependencycheck/gradle/DependencyCheckPlugin.groovy

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,31 +19,18 @@
1919
package org.owasp.dependencycheck.gradle
2020

2121
import groovy.transform.CompileStatic
22-
import io.github.jeremylong.jcs3.slf4j.Slf4jAdapter
2322
import org.gradle.api.GradleException
2423
import org.gradle.api.Plugin
2524
import org.gradle.api.Project
2625
import org.gradle.util.GradleVersion
2726
import org.owasp.dependencycheck.gradle.extension.DependencyCheckExtension
28-
import org.owasp.dependencycheck.gradle.tasks.AbstractAnalyze
2927
import org.owasp.dependencycheck.gradle.tasks.Aggregate
3028
import org.owasp.dependencycheck.gradle.tasks.Analyze
3129
import org.owasp.dependencycheck.gradle.tasks.Purge
3230
import org.owasp.dependencycheck.gradle.tasks.Update
33-
import org.slf4j.Logger
34-
import org.slf4j.LoggerFactory
3531

3632
@CompileStatic
3733
class DependencyCheckPlugin implements Plugin<Project> {
38-
private static final Logger LOGGER = LoggerFactory.getLogger(DependencyCheckPlugin.class);
39-
static {
40-
// Quiet noisy loggers
41-
System.setProperty("jcs.logSystem", "slf4j")
42-
if (!LOGGER.isDebugEnabled()) {
43-
Slf4jAdapter.muteLogging(true);
44-
}
45-
}
46-
4734
static final GradleVersion MINIMUM_GRADLE_VERSION = GradleVersion.version("4.0")
4835
static final GradleVersion REGISTER_TASK_GRADLE_VERSION = GradleVersion.version("4.9")
4936

0 commit comments

Comments
 (0)