Merge remote-tracking branch 'origin/develop' into fb_admin_csp_sources

dependencyCheckSuppression.xml

@@ -160,4 +160,29 @@
         <packageUrl regex="true">^pkg:maven/org\.apache\.tomcat/tomcat-catalina@.*$</packageUrl>
         <vulnerabilityName>CVE-2024-56337</vulnerabilityName>
     </suppress>
+
+    <!--
+    False positives: labkey-api-client.jar is getting tagged as an old version of LabKey Server
+    -->
+    <suppress>
+       <notes><![CDATA[
+   file name: labkey-client-api-6.2.0.jar
+   ]]></notes>
+       <packageUrl regex="true">^pkg:maven/org\.labkey\.api/labkey-client-api@.*$</packageUrl>
+       <cve>CVE-2019-3911</cve>
+    </suppress>
+    <suppress>
+        <notes><![CDATA[
+   file name: labkey-client-api-6.2.0.jar
+   ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.labkey\.api/labkey-client-api@.*$</packageUrl>
+        <cve>CVE-2019-3912</cve>
+    </suppress>
+    <suppress>
+        <notes><![CDATA[
+   file name: labkey-client-api-6.2.0.jar
+   ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.labkey\.api/labkey-client-api@.*$</packageUrl>
+        <cve>CVE-2019-3913</cve>
+    </suppress>
 </suppressions>

gradle.properties

@@ -60,7 +60,7 @@ windowsProteomicsBinariesVersion=1.0
 artifactoryPluginVersion=5.2.5
 gradleNodePluginVersion=7.1.0
 gradlePluginsVersion=6.1.0
-owaspDependencyCheckPluginVersion=11.1.0
+owaspDependencyCheckPluginVersion=12.1.0
 versioningPluginVersion=1.1.2
 
 # Versions of node and npm to use during the build. If set, these versions