Merge 24.11 to develop

LabKey · Nov 19, 2024 · ef0535c · ef0535c
2 parents 0409773 + aec0270
commit ef0535c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/dependencyCheckSuppression.xml b/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>
 
diff --git a/gradle.properties b/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