From 0fd56e2983960cb989fd535a78e54fe0188cd670 Mon Sep 17 00:00:00 2001
From: Susan Hert <susanh@labkey.com>
Date: Wed, 24 Sep 2025 17:13:19 -0700
Subject: [PATCH] Update to latest version of owaspDependencyChecker and add
 properties for oss authentication (#1188)

---
 build.gradle      | 10 +++++++++-
 gradle.properties |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7b67e31e77..52d835983e 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 65af6ccaf5..6c06d15eb3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -60,7 +60,7 @@ windowsProteomicsBinariesVersion=1.0
 artifactoryPluginVersion=5.2.5
 gradleNodePluginVersion=7.1.0
 gradlePluginsVersion=6.3.0
-owaspDependencyCheckPluginVersion=12.1.3
+owaspDependencyCheckPluginVersion=12.1.6
 versioningPluginVersion=1.1.2
 
 # Versions of node and npm to use during the build. If set, these versions