Merge 23.11 to develop

labkey-teamcity · labkey-teamcity · commit 8e7c4bf85dc0 · 2023-11-08T09:06:36.000Z
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

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,9 @@ allprojects {`
`30`	`30`	`nodeAudit {`
`31`	`31`	`enabled = false`
`32`	`32`	`}`
	`33`	`+ retirejs {`
	`34`	`+ enabled = false`
	`35`	`+ }`
`33`	`36`	`}`
`34`	`37`	`formats = ['HTML', 'JUNIT']`
`35`	`38`	`skipConfigurations = ['dedupe', 'gwtCompileClasspath', 'gwtRuntimeClasspath', 'developmentOnly']`