diff --git a/.build/cassandra-build-deps-template.xml b/.build/cassandra-build-deps-template.xml index 9f9a70000f..4ec59cdf2d 100644 --- a/.build/cassandra-build-deps-template.xml +++ b/.build/cassandra-build-deps-template.xml @@ -143,5 +143,17 @@ com.carrotsearch.randomizedtesting randomizedtesting-runner + + org.bouncycastle + bcpkix-jdk18on + + + org.bouncycastle + bcprov-jdk18on + + + org.bouncycastle + bcutil-jdk18on + diff --git a/.build/cassandra-deps-template.xml b/.build/cassandra-deps-template.xml index 437c0c31b5..f0b0a5defc 100644 --- a/.build/cassandra-deps-template.xml +++ b/.build/cassandra-deps-template.xml @@ -157,10 +157,6 @@ com.github.jbellis jamm - - org.bouncycastle - bcpkix-jdk18on - io.netty netty-all diff --git a/.build/parent-pom-template.xml b/.build/parent-pom-template.xml index 0c0e5d4ccc..455a0adac8 100644 --- a/.build/parent-pom-template.xml +++ b/.build/parent-pom-template.xml @@ -804,7 +804,20 @@ org.bouncycastle bcpkix-jdk18on - 1.76 + 1.78 + test + + + org.bouncycastle + bcprov-jdk18on + 1.78 + test + + + org.bouncycastle + bcutil-jdk18on + 1.78 + test io.netty diff --git a/CHANGES.txt b/CHANGES.txt index fd8561af1a..0011fbd995 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -50,6 +50,7 @@ * Add the ability to disable bulk loading of SSTables (CASSANDRA-18781) * Clean up obsolete functions and simplify cql_version handling in cqlsh (CASSANDRA-18787) Merged from 5.0: + * Move bcpkix-jdk18on to build dependencies, update to 1.78 and explicitly enumerate transitive dependencies (CASSANDRA-19739) * Avoid streams in the common case for UpdateTransaction creation (CASSANDRA-19675) * Only wait until native_transport_timeout for dispatcher to finish (CASSANDRA-19697) * Disable chronicle analytics (CASSANDRA-19656)