diff --git a/build.gradle b/build.gradle index 8c7c36b0ed..92e9976b6d 100644 --- a/build.gradle +++ b/build.gradle @@ -248,6 +248,8 @@ allprojects { // force version for cloud, docker, fileTransfer, googledrive, tcrb, wnprc_ehr force "org.apache.httpcomponents:httpcore:${httpcoreVersion}" force "org.apache.httpcomponents.core5:httpcore5:${httpcore5Version}" + // align httpcore5-h2 with httpcore5; the transitive 5.3.6 is exposed to CVE-2026-54399/CVE-2026-54428 (fixed in 5.4.3) + force "org.apache.httpcomponents.core5:httpcore5-h2:${httpcore5Version}" // force version for cloud, docker, fileTransfer, googledrive, tcrb, wnprc_ehr force "org.apache.httpcomponents:httpclient:${httpclientVersion}" force "org.apache.httpcomponents.client5:httpclient5:${httpclient5Version}" diff --git a/dependencyCheckSuppression.xml b/dependencyCheckSuppression.xml index 14751ab133..86150a3244 100644 --- a/dependencyCheckSuppression.xml +++ b/dependencyCheckSuppression.xml @@ -449,5 +449,24 @@ ^pkg:maven/org\.jetbrains\.kotlin/.*@.*$ CVE-2026-53914 - + + + + ^pkg:maven/org\.apache\.httpcomponents/httpcore@.*$ + CVE-2026-54399 + CVE-2026-54428 + + + + + ^pkg:maven/org\.jetbrains\.kotlin/.*@.*$ + CVE-2026-53914 + diff --git a/gradle.properties b/gradle.properties index 20b3c9b1f0..e5a7177533 100644 --- a/gradle.properties +++ b/gradle.properties @@ -98,7 +98,7 @@ apacheDirectoryVersion=2.1.8 apacheMinaVersion=2.2.9 # Usually matches the version specified as a Spring Boot dependency (see springBootVersion below) -apacheTomcatVersion=11.0.22 +apacheTomcatVersion=11.0.23 # (mothership) -> json-path -> json-smart -> accessor-smart # (core) -> graalvm @@ -195,9 +195,9 @@ httpcoreVersion=4.4.16 intellijKotlinVersion=2.3.10 # Update the three Jackson dependency versions below in tandem, unless one gets a patch release out-of-sync with the others -jacksonVersion=2.21.4 -jacksonDatabindVersion=2.21.4 -jacksonJaxrsBaseVersion=2.21.4 +jacksonVersion=2.21.5 +jacksonDatabindVersion=2.21.5 +jacksonJaxrsBaseVersion=2.21.5 # Note the inconsistent version numbering for "annotations"... it no longer matches the above jacksonAnnotationsVersion=2.21