From 16e54ad2a63e6773a77424b2e7e7fc1d796427b0 Mon Sep 17 00:00:00 2001
From: Will Mooreston <97046018+labkey-willm@users.noreply.github.com>
Date: Wed, 1 Nov 2023 08:26:23 -0700
Subject: [PATCH 1/2] bump owasp plugin to 8.4.2 and disable failing retirejs
 analyzer (#614)

---
 build.gradle      | 3 +++
 gradle.properties | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index ecdf7f5ec5..473f918aea 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,6 +30,9 @@ allprojects {
                 nodeAudit {
                     enabled = false
                 }
+                retirejs {
+                    enabled = false
+                }
             }
             formats = ['HTML', 'JUNIT']
             skipConfigurations = ['dedupe', 'gwtCompileClasspath', 'gwtRuntimeClasspath', 'developmentOnly']
diff --git a/gradle.properties b/gradle.properties
index cb7a048be2..f0496e1163 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -63,7 +63,7 @@ windowsProteomicsBinariesVersion=1.0
 artifactoryPluginVersion=4.31.9
 gradleNodePluginVersion=3.5.1
 gradlePluginsVersion=1.41.1
-owaspDependencyCheckPluginVersion=8.2.1
+owaspDependencyCheckPluginVersion=8.4.2
 versioningPluginVersion=1.1.2
 
 # Versions of node and npm to use during the build. If set, these versions

From 3c582999d8343f2c94e5bc24479241ba293a2429 Mon Sep 17 00:00:00 2001
From: Susan Hert <susanh@labkey.com>
Date: Thu, 2 Nov 2023 13:41:22 -0700
Subject: [PATCH 2/2] mySqlDriver version 8.2.0 for CVE-2023-22102 (#616)

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index f0496e1163..5a5ae298e0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -232,7 +232,7 @@ lombokVersion=1.18.24
 
 luceneVersion=9.7.0
 
-mysqlDriverVersion=8.0.33
+mysqlDriverVersion=8.2.0
 
 mssqlJdbcVersion=12.2.0.jre11