Merge 24.7 to 24.10

LabKey · Oct 1, 2024 · 2db5946 · 2db5946
2 parents 5197069 + 90b3133
commit 2db5946
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/dependencyCheckSuppression.xml b/dependencyCheckSuppression.xml
@@ -33,6 +33,15 @@
  <vulnerabilityName>CVE-2021-22569</vulnerabilityName>
  </suppress>
 
+ <suppress>
+ <notes><![CDATA[
+ file name: gwt-servlet-jakarta-2.11.0.jar (shaded: com.google.protobuf:protobuf-java:2.5.0)
+ ]]></notes>
+ <packageUrl regex="true">^pkg:maven/com\.google\.protobuf/protobuf\-java@.*$</packageUrl>
+ <cpe>cpe:/a:google:protobuf-java</cpe>
+ <vulnerabilityName>CVE-2024-7254</vulnerabilityName>
+ </suppress>
+
  <!-- Tangled CVEs. See https://github.com/jeremylong/DependencyCheck/issues/4614 and https://github.com/OSSIndex/vulns/issues/316 -->
  <suppress>
  <notes><![CDATA[

diff --git a/gradle.properties b/gradle.properties
@@ -156,7 +156,7 @@ googleAutoValueAnnotationsVersion=1.10.4
 googleErrorProneAnnotationsVersion=2.32.0
 googleHttpClientVersion=1.45.0
 googleOauthClientVersion=1.36.0
-googleProtocolBufVersion=3.25.3
+googleProtocolBufVersion=3.25.5
 
 graalVersion=24.1.0