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

Author: labkey-adam

dependencyCheckSuppression.xml

@@ -369,5 +369,14 @@
     </suppress>
     <!-- end of glassfish false positive suppressions -->
 
+    <!-- False positive. Only 5.3.0 - 5.3.41 are affected:
+     https://spring.io/security/cve-2024-38828 -->
+    <suppress>
+        <notes><![CDATA[
+   file name: spring-web-6.1.14.jar
+   ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.springframework/spring-web@.*$</packageUrl>
+        <vulnerabilityName>CVE-2024-38828</vulnerabilityName>
+    </suppress>
 </suppressions>
 

gradle.properties

@@ -246,7 +246,7 @@ mssqlJdbcVersion=12.8.1.jre11
 mysqlDriverVersion=9.1.0
 
 # forced compatibility between docker and UserReg-WS
-nettyVersion=4.1.114.Final
+nettyVersion=4.1.115.Final
 
 objenesisVersion=1.0
 

server/embedded/src/org/labkey/embedded/LabKeyServer.java

@@ -62,7 +62,7 @@ public static void main(String[] args)
         if (System.getProperty(JARS_TO_SKIP) == null && System.getProperty(JARS_TO_SCAN) == null)
         {
             System.setProperty(JARS_TO_SKIP, "*");
-            System.setProperty(JARS_TO_SCAN, "rstudio-??.?*.jar,cas-??.?*.jar,core-??.?*.jar,connectors-??.?*.jar,devtools-??.?*.jar");
+            System.setProperty(JARS_TO_SCAN, "rstudio-??.?*.jar,cas-??.?*.jar,core-??.?*.jar,connectors-??.?*.jar,devtools-??.?*.jar,labbook-??.?*.jar");
         }
 
         SpringApplication application = new SpringApplication(LabKeyServer.class);