From 8261ac162859ccc388b75aabb05ba68b6a4bbf49 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Tue, 23 Sep 2025 11:29:25 -0700 Subject: [PATCH 1/2] Update owaspDependencyPlugin version and add properties for ossIndex authentication --- build.gradle | 10 +++++++++- gradle.properties | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 342d1b266e..1a2a850d66 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,6 @@ plugins { allprojects { if (project.hasProperty('enableOwaspDependencyCheck')) { - // Comment in to enable the tasks for owasp dependency checking apply plugin: 'org.owasp.dependencycheck' dependencyCheck { outputDirectory = project.rootProject.layout.buildDirectory.file("reports/dependencyCheck/${project.path.replaceAll(':', '_').substring(1)}").get().asFile @@ -32,6 +31,15 @@ allprojects { enabled = false } } + if (project.hasProperty('ossIndexUsername') && project.hasProperty('ossIndexPassword')) + { + analyzers.ossIndex.username = project.property('ossIndexUsername') + analyzers.ossIndex.password = project.property('ossIndexPassword'); + } + else + { + analyzers.ossIndex.enabled = false + } formats = ['HTML', 'JUNIT'] skipConfigurations = ['dedupe', 'gwtCompileClasspath', 'gwtRuntimeClasspath', 'developmentOnly'] skipProjects = [':server:testAutomation'] diff --git a/gradle.properties b/gradle.properties index 0e6988d0dd..15a6d3a903 100644 --- a/gradle.properties +++ b/gradle.properties @@ -60,7 +60,7 @@ windowsProteomicsBinariesVersion=1.0 artifactoryPluginVersion=5.2.5 gradleNodePluginVersion=7.1.0 gradlePluginsVersion=7.0.0 -owaspDependencyCheckPluginVersion=12.1.3 +owaspDependencyCheckPluginVersion=12.1.5 versioningPluginVersion=1.1.2 # Versions of node and npm to use during the build. If set, these versions From 75e0790cbcde0bd3838fb000276a385acb94a201 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Wed, 24 Sep 2025 10:08:16 -0700 Subject: [PATCH 2/2] v12.1.6 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 15a6d3a903..2d5d27b217 100644 --- a/gradle.properties +++ b/gradle.properties @@ -60,7 +60,7 @@ windowsProteomicsBinariesVersion=1.0 artifactoryPluginVersion=5.2.5 gradleNodePluginVersion=7.1.0 gradlePluginsVersion=7.0.0 -owaspDependencyCheckPluginVersion=12.1.5 +owaspDependencyCheckPluginVersion=12.1.6 versioningPluginVersion=1.1.2 # Versions of node and npm to use during the build. If set, these versions