diff --git a/.build/build-owasp.xml b/.build/build-owasp.xml index f3174999e8..a792730fb9 100644 --- a/.build/build-owasp.xml +++ b/.build/build-owasp.xml @@ -17,7 +17,7 @@ ~ limitations under the License. --> - + diff --git a/.build/dependency-check-suppressions.xml b/.build/dependency-check-suppressions.xml index bffab75a23..58b38b7e62 100644 --- a/.build/dependency-check-suppressions.xml +++ b/.build/dependency-check-suppressions.xml @@ -117,6 +117,14 @@ CVE-2018-11798 CVE-2019-0205 + + ^pkg:maven/com\.thinkaurelius\.thrift/thrift-server@.*$ + CVE-2015-3254 + CVE-2016-5397 + CVE-2018-1320 + CVE-2018-11798 + CVE-2019-0205 + @@ -124,6 +132,8 @@ CVE-2022-42003 CVE-2022-42004 CVE-2023-35116 + CVE-2022-42003 + CVE-2022-42004 diff --git a/CHANGES.txt b/CHANGES.txt index 2c8a444f55..33e4983986 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -6,6 +6,7 @@ * Add keyspace and table name to exception message during ColumnSubselection deserialization (CASSANDRA-18346) * Remove unnecessary String.format invocation in QueryProcessor when getting a prepared statement from cache (CASSANDRA-17202) Merged from 3.0: + * Upgrade OWASP to 8.3.1 (CASSANDRA-18650) * Suppress CVE-2023-34462 (CASSANDRA-18649) * Add support for AWS Ec2 IMDSv2 (CASSANDRA-16555) * Suppress CVE-2023-35116 (CASSANDRA-18630)