diff --git a/.build/build-resolver.xml b/.build/build-resolver.xml index 5b95addb0d..c95dc1eb78 100644 --- a/.build/build-resolver.xml +++ b/.build/build-resolver.xml @@ -264,6 +264,9 @@ + + + diff --git a/.build/cassandra-deps-template.xml b/.build/cassandra-deps-template.xml index 19ccac30be..ec36e5f09e 100644 --- a/.build/cassandra-deps-template.xml +++ b/.build/cassandra-deps-template.xml @@ -17,12 +17,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - cassandra-parent org.apache.cassandra + cassandra-parent @version@ @final.name@-parent.pom - org.apache.cassandra cassandra-all @version@ Apache Cassandra @@ -172,12 +171,7 @@ org.bouncycastle - bcpkix-jdk15on - - - io.netty - netty-bom - pom + bcpkix-jdk18on io.netty @@ -192,6 +186,15 @@ netty-transport-native-epoll linux-x86_64 + + io.netty + netty-transport-native-epoll + linux-aarch_64 + + + io.netty + netty-tcnative-boringssl-static + @@ -321,10 +324,6 @@ org.psjava psjava - - io.netty - netty-tcnative-boringssl-static - javax.inject javax.inject diff --git a/.build/parent-pom-template.xml b/.build/parent-pom-template.xml index 30f518afe5..a7eb86664e 100644 --- a/.build/parent-pom-template.xml +++ b/.build/parent-pom-template.xml @@ -722,17 +722,76 @@ - - io.netty - netty-bom - 4.1.96.Final - pom - provided - io.netty netty-all 4.1.96.Final + + + io.netty + netty-codec-dns + + + io.netty + netty-codec-haproxy + + + io.netty + netty-codec-http2 + + + io.netty + netty-codec-http + + + io.netty + netty-codec-memcache + + + io.netty + netty-codec-mqtt + + + io.netty + netty-codec-redis + + + io.netty + netty-codec-smtp + + + io.netty + netty-codec-socks + + + io.netty + netty-codec-stomp + + + io.netty + netty-codec-xml + + + io.netty + netty-transport-udt + + + io.netty + netty-transport-sctp + + + io.netty + netty-transport-rxtx + + + io.netty + netty-resolver-dns + + + io.netty + netty-resolver-dns-classes-macos + + io.netty @@ -741,20 +800,26 @@ org.bouncycastle - bcpkix-jdk15on - 1.70 + bcpkix-jdk18on + 1.76 io.netty netty-transport-native-epoll - 4.1.94.Final + 4.1.96.Final io.netty netty-transport-native-epoll - 4.1.94.Final + 4.1.96.Final linux-x86_64 + + io.netty + netty-transport-native-epoll + 4.1.96.Final + linux-aarch_64 + diff --git a/CHANGES.txt b/CHANGES.txt index 2a5335ecf8..adf6371512 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 5.0-alpha1 + * Remove unnecessary Netty dependencies after upgrade to version 4.1.96 (CASSANDRA-18729) * Prevent InaccessibleObjectException when the Leak Detector is traversing objects (CASSANDRA-18708) * Remove legacy command line options from cassandra-stress (CASSANDRA-18529) * Remove commitlog_sync_batch_window_in_ms (CASSANDRA-17161) diff --git a/src/java/org/apache/cassandra/utils/SigarLibrary.java b/src/java/org/apache/cassandra/utils/SigarLibrary.java index 32987d83f7..830f7cab8e 100644 --- a/src/java/org/apache/cassandra/utils/SigarLibrary.java +++ b/src/java/org/apache/cassandra/utils/SigarLibrary.java @@ -23,6 +23,7 @@ import org.slf4j.Logger; import org.apache.cassandra.config.CassandraRelevantProperties; +@Shared public class SigarLibrary { private Logger logger = LoggerFactory.getLogger(SigarLibrary.class); diff --git a/test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java b/test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java index 79120a2fed..785742afc4 100644 --- a/test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java +++ b/test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java @@ -191,6 +191,7 @@ public abstract class AbstractCluster implements ICluster factory)