Merge 23.11 to develop

LabKey · Nov 8, 2023 · 8e7c4bf · 8e7c4bf
2 parents 022c170 + ee3ada8
commit 8e7c4bf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -63,7 +63,7 @@ windowsProteomicsBinariesVersion=1.0
 artifactoryPluginVersion=4.31.9
 gradleNodePluginVersion=3.5.1
 gradlePluginsVersion=1.42.2
-owaspDependencyCheckPluginVersion=8.3.1
+owaspDependencyCheckPluginVersion=8.4.2
 versioningPluginVersion=1.1.2
 
 # Versions of node and npm to use during the build. If set, these versions
@@ -238,9 +238,9 @@ lombokVersion=1.18.24
 
 luceneVersion=9.8.0
 
-mssqlJdbcVersion=12.4.1.jre11
+mysqlDriverVersion=8.2.0
 
-mysqlDriverVersion=8.1.0
+mssqlJdbcVersion=12.4.1.jre11
 
 # forced compatibility between docker and UserReg-
 # update version in modules/UserReg-WS/gradle.properties as well