diff --git a/databases/cassandra4/Makefile b/databases/cassandra4/Makefile
index 16a0cc54cd93..f2d96da853c0 100644
--- a/databases/cassandra4/Makefile
+++ b/databases/cassandra4/Makefile
@@ -1,198 +1,199 @@
 PORTNAME=	cassandra
-DISTVERSION=	4.0.8
-PORTREVISION=	3
+DISTVERSION=	4.1.11
 CATEGORIES=	databases java
 MASTER_SITES=	https://archive.apache.org/dist/${PORTNAME}/${DISTVERSION}/:apache \
-		https://repo1.maven.org/maven2/com/github/luben/zstd-jni/1.5.0-4/:maven
+		https://repo1.maven.org/maven2/com/github/luben/zstd-jni/1.5.6-7/:maven
 PKGNAMESUFFIX=	4
 DISTNAME=	apache-${PORTNAME}-${DISTVERSION}-src
 DISTFILES=	${DISTNAME}.tar.gz:apache \
 		${ZSTD_DISTFILE} \
 		${MAVEN_CACHE_FILE}:prefetch
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}.tar.gz \
 		${MAVEN_CACHE_FILE}
 
 MAINTAINER=	language.devel@gmail.com
 COMMENT=	Highly scalable distributed database
 WWW=		https://cassandra.apache.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 FETCH_DEPENDS=	${JAVA}:${JAVA_PORT} \
 		ant:devel/apache-ant
 RUN_DEPENDS=	snappyjava>=0:archivers/snappy-java \
 		netty>0:java/netty
 
 USES=		cpe java:ant python shebangfix
 USE_RC_SUBR=	cassandra
 SHEBANG_FILES=	bin/cqlsh.py pylib/setup.py
 TEST_TARGET=	test
 CPE_VENDOR=	apache
 
-CONFLICTS=	cassandra3
+CONFLICTS=	cassandra[35]
 
 JAVA_VERSION=	8 11
 JAVA_VENDOR=	openjdk
 
 FETCH_ENV+=	JAVA_HOME=${JAVA_HOME}
 SUB_LIST=	JAVA_HOME=${JAVA_HOME}
 
 USERS=		cassandra
 GROUPS=		cassandra
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 BUILD_DIST_DIR=	${WRKSRC}/build/dist
 REPO_DIR=	${WRKDIR}/repository
 
 CONFIG_FILES=	cassandra-env.sh \
 		cassandra-jaas.config \
 		cassandra-rackdc.properties \
-		cassandra-topology.properties \
 		cassandra.yaml \
 		commitlog_archiving.properties \
 		hotspot_compiler \
-		logback-tools.xml \
-		logback.xml \
 		jvm8-clients.options \
 		jvm8-server.options \
 		jvm11-clients.options \
 		jvm11-server.options \
 		jvm-clients.options \
-		jvm-server.options
+		jvm-server.options \
+		logback-tools.xml \
+		logback.xml
 
 SCRIPT_FILES=	cassandra \
 		nodetool \
 		sstableloader \
 		sstablescrub \
 		sstableupgrade \
 		sstableutil \
 		sstableverify
 
 ZSTDJNI_VERSION=	${MASTER_SITES:M*\:maven:H:T}
 PLIST_SUB=	DISTVERSION=${DISTVERSION} ZSTDJNI_VERSION=${ZSTDJNI_VERSION}
 
 OPTIONS_DEFINE=		SIGAR DOCS
 OPTIONS_DEFAULT=	SIGAR
 OPTIONS_SUB=		yes
 
 SIGAR_DESC=		Use SIGAR to collect system information
 SIGAR_RUN_DEPENDS=	java-sigar>=1.6.4:java/sigar
 
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR}
 
 PORTDOCS=		*
 
 MAVEN_CACHE_FILE=	apache-${PORTNAME}-${DISTVERSION}-repo.tar.xz
 
-.if !exists(${DISTDIR}/${DIST_SUBDIR}/${MAVEN_CACHE_FILE})
-pre-fetch:
-	${MKDIR} ${DISTDIR}/${DIST_SUBDIR}
-	${MKDIR} ${WRKSRC}/.build
-	${MKDIR} ${WRKSRC}/src/java
-	${CP} ${FILESDIR}/maven/build.* ${WRKSRC}
-	${CP} ${FILESDIR}/maven/build-* ${WRKSRC}/.build
-	cd ${WRKSRC} && ${FETCH_ENV} ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} ${USEJDK11} resolver-dist-lib
-	cd ${REPO_DIR} && ${FIND} . -type f -name "*.repositories" -a -exec ${SED} -i '' -e '2s,.*,Mon Aug 08 20:40:04 CEST 2022,' {} +
-	cd ${WRKDIR} && ${MTREE_CMD} -cbnSp repository | ${MTREE_CMD} -C | ${SED} \
-		-e 's:time=[0-9.]*:time=0.000000000:' \
-		-e 's:\([gu]id\)=[0-9]*:\1=0:g' \
-		-e 's:flags=.*:flags=none:' \
-		-e 's:^\.:./repository:' \
-		> maven-offline-cache.mtree
-	cd ${WRKDIR} && ${TAR} cJf ${DISTDIR}/${DIST_SUBDIR}/${MAVEN_CACHE_FILE} \
-		@maven-offline-cache.mtree
-	${SHA256} ${WRKDIR}/maven-offline-cache.mtree ${DISTDIR}/${DIST_SUBDIR}/${MAVEN_CACHE_FILE}
-.endif
+post-patch:
+	@${REINPLACE_CMD} -e 's|for interpreter in |for interpreter in ${PYTHON_CMD} |' ${WRKSRC}/bin/cqlsh
+
+post-patch-DOCS-on:
+	@${REINPLACE_CMD} -e 's|python3|${PYTHON_CMD}|' ${WRKSRC}/doc/Makefile
 
 do-build:
 	@${DO_NADA} # Do nothing: Prevent USE_ANT from running a default build target.
 
 do-build-DOCS-on:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} CASSANDRA_LOG_DIR=${WRKDIR}/gen-doc-log ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} ${USEJDK11} -Dpycmd=${PYTHON_CMD} -Dpyver=${PYTHON_VER} freebsd-stage-doc
 
 do-build-DOCS-off:
 	cd ${WRKSRC} && ${MAKE_ENV} ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} ${USEJDK11} freebsd-stage
 
 post-build:
 .for f in ${SCRIPT_FILES}
 	@${REINPLACE_CMD} -e 's|/usr/share/cassandra|${DATADIR}/bin|' ${BUILD_DIST_DIR}/bin/${f}
 .endfor
 	@${REINPLACE_CMD} -e 's|`dirname "$$0"`/..|${DATADIR}|' ${BUILD_DIST_DIR}/bin/cassandra.in.sh
 	@${REINPLACE_CMD} -e 's|$$CASSANDRA_HOME/lib/sigar-bin|${JAVAJARDIR}|' ${BUILD_DIST_DIR}/bin/cassandra.in.sh
 	@${REINPLACE_CMD} -e 's|$$CASSANDRA_HOME/lib/sigar-bin|${JAVAJARDIR}|' ${BUILD_DIST_DIR}/conf/cassandra-env.sh
 	@${REINPLACE_CMD} -e 's|$$CASSANDRA_HOME/conf|${ETCDIR}|' ${BUILD_DIST_DIR}/bin/cassandra.in.sh
 .for f in ${CONFIG_FILES}
 	@${MV} ${BUILD_DIST_DIR}/conf/${f} ${BUILD_DIST_DIR}/conf/${f}.sample
 .endfor
+	@${MV} ${BUILD_DIST_DIR}/conf/cassandra-topology.properties.example ${BUILD_DIST_DIR}/conf/cassandra-topology.properties.sample
+	@${MV} ${BUILD_DIST_DIR}/conf/metrics-reporter-config-sample.yaml ${BUILD_DIST_DIR}/conf/metrics-reporter-config.yaml.sample
 	@${RM} ${BUILD_DIST_DIR}/lib/licenses/sigar*
 	@${RMDIR} ${BUILD_DIST_DIR}/lib/sigar-bin
 	@${RM} ${BUILD_DIST_DIR}/lib/zstd-jni*
 	@${RM} ${BUILD_DIST_DIR}/lib/licenses/zstd-jni*
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 .for f in CHANGES LICENSE NEWS NOTICE
 	cd ${BUILD_DIST_DIR} && ${INSTALL_DATA} ${f}.txt ${STAGEDIR}${DATADIR}/
 .endfor
 .for d in lib pylib tools
 	cd ${BUILD_DIST_DIR} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR}/ "! -path '*/bin/*'"
 .endfor
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	cd ${BUILD_DIST_DIR}/conf && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR}/
 	cd ${BUILD_DIST_DIR} && ${COPYTREE_BIN} bin ${STAGEDIR}${DATADIR}
 	cd ${BUILD_DIST_DIR} && ${INSTALL_DATA} bin/cassandra.in.sh ${STAGEDIR}${DATADIR}/bin/
 	cd ${BUILD_DIST_DIR} && ${COPYTREE_BIN} tools/bin ${STAGEDIR}${DATADIR}/
 	cd ${BUILD_DIST_DIR} && ${INSTALL_DATA} tools/bin/cassandra.in.sh ${STAGEDIR}${DATADIR}/tools/bin/
 	cd ${BUILD_DIST_DIR} && ${INSTALL_DATA} tools/lib/fqltool.jar ${STAGEDIR}${DATADIR}/tools/lib/
 	cd ${BUILD_DIST_DIR} && ${INSTALL_DATA} tools/lib/stress.jar ${STAGEDIR}${DATADIR}/tools/lib/
 .for f in ${SCRIPT_FILES}
 	${RLN} ${STAGEDIR}${DATADIR}/bin/${f} ${STAGEDIR}${PREFIX}/bin/${f}
 .endfor
 	${RLN} ${STAGEDIR}${DATADIR}/bin/cqlsh ${STAGEDIR}${PREFIX}/bin/cqlsh
 	${LN} -s ${JAVAJARDIR}/snappy-java.jar ${STAGEDIR}${DATADIR}/lib/snappy-java.jar
 
 do-test:
 	@cd ${WRKSRC} && ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} ${USEJDK11} -Dstagedlib=${STAGEDIR}${DATADIR}/lib test
 
 .include <bsd.port.pre.mk>
 
+pre-fetch:
+.if !exists(${DISTDIR}/${DIST_SUBDIR}/${MAVEN_CACHE_FILE})
+	${MKDIR} ${DISTDIR}/${DIST_SUBDIR}
+	${MKDIR} ${WRKSRC}/.build
+	${MKDIR} ${WRKSRC}/src/java
+	${CP} ${FILESDIR}/maven/build.* ${WRKSRC}
+	${CP} ${FILESDIR}/maven/build-* ${WRKSRC}/.build
+	cd ${WRKSRC} && ${FETCH_ENV} ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} ${USEJDK11} resolver-dist-lib
+	cd ${REPO_DIR} && ${FIND} . -type f -name "*.repositories" -a -exec ${SED} -i '' -e '2s,.*,Mon Aug 08 20:40:04 CEST 2022,' {} +
+	cd ${WRKDIR} && ${MTREE_CMD} -cbnSp repository | ${MTREE_CMD} -C | ${SED} \
+		-e 's:time=[0-9.]*:time=0.000000000:' \
+		-e 's:\([gu]id\)=[0-9]*:\1=0:g' \
+		-e 's:flags=.*:flags=none:' \
+		-e 's:^\.:./repository:' \
+		> maven-offline-cache.mtree
+	cd ${WRKDIR} && ${TAR} cJf ${DISTDIR}/${DIST_SUBDIR}/${MAVEN_CACHE_FILE} \
+		@maven-offline-cache.mtree
+	${SHA256} ${WRKDIR}/maven-offline-cache.mtree ${DISTDIR}/${DIST_SUBDIR}/${MAVEN_CACHE_FILE}
+.endif
+
 .if ${JAVA_PORT_VERSION} == 11
 USEJDK11=	-Duse.jdk11=true -Drat.skip=true
 .endif
 
 .if ${ARCH} == amd64
 PLIST_SUB+=		AMD64ONLY=""
-PLIST_SUB+=		I386ONLY="@comment "
-.elif ${ARCH} == i386
-PLIST_SUB+=		AMD64ONLY="@comment "
-PLIST_SUB+=		I386ONLY=""
 .else
 PLIST_SUB+=		AMD64ONLY="@comment "
-PLIST_SUB+=		I386ONLY="@comment "
 .endif
 
-.if ${ARCH} == amd64 || ${ARCH} == i386
+.if ${ARCH} == amd64
 ZSTD_DISTFILE=	zstd-jni-${MASTER_SITES:M*\:maven:H:T}-freebsd_${ARCH}.jar:maven
 .else
 ZSTD_DISTFILE=
 .endif
 
 post-install:
 	${LN} -s ${JAVAJARDIR}/netty.jar ${STAGEDIR}${DATADIR}/lib/netty.jar
-.if ${ARCH} == amd64 || ${ARCH} == i386
+.if ${ARCH} == amd64
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/zstd-jni-${ZSTDJNI_VERSION}-freebsd_${ARCH}.jar ${STAGEDIR}${DATADIR}/lib/
 .endif
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for d in doc javadoc
 	cd ${BUILD_DIST_DIR} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DOCSDIR}/
 .endfor
 
 post-install-SIGAR-on:
 	${LN} -s ${JAVAJARDIR}/sigar.jar ${STAGEDIR}${DATADIR}/lib/sigar.jar
 
 .include <bsd.port.post.mk>
diff --git a/databases/cassandra4/distinfo b/databases/cassandra4/distinfo
index 976d31650bd9..487cd6bcbaa7 100644
--- a/databases/cassandra4/distinfo
+++ b/databases/cassandra4/distinfo
@@ -1,9 +1,7 @@
-TIMESTAMP = 1679924890
-SHA256 (cassandra/apache-cassandra-4.0.8-src.tar.gz) = 98da97d7fe850a0a24eb2aef212e982f73205cbd63955d2915b4ad02e28dae9c
-SIZE (cassandra/apache-cassandra-4.0.8-src.tar.gz) = 12953548
-SHA256 (cassandra/zstd-jni-1.5.0-4-freebsd_amd64.jar) = b653460b6ff374db2c01f39a7b7cdb44008c9efd55dc96ae5f869abe9f58d180
-SIZE (cassandra/zstd-jni-1.5.0-4-freebsd_amd64.jar) = 670993
-SHA256 (cassandra/zstd-jni-1.5.0-4-freebsd_i386.jar) = 1bcb75c5837e42d10ec0193ba9df099874792f0829b0ce8dd3412303c6454595
-SIZE (cassandra/zstd-jni-1.5.0-4-freebsd_i386.jar) = 604557
-SHA256 (cassandra/apache-cassandra-4.0.8-repo.tar.xz) = 807a108e3639f247dafa3ce4ebc4744b93668cf463915edf7b654d317d1abaff
-SIZE (cassandra/apache-cassandra-4.0.8-repo.tar.xz) = 78148020
+TIMESTAMP = 1776308889
+SHA256 (cassandra/apache-cassandra-4.1.11-src.tar.gz) = 48aabd61a390d8c17d74d6cca244ec14b96f04c6fd0cde7a6b0099d4ccc9b274
+SIZE (cassandra/apache-cassandra-4.1.11-src.tar.gz) = 14938415
+SHA256 (cassandra/zstd-jni-1.5.6-7-freebsd_amd64.jar) = b50239f5e525d62ebc50398ed42a1473c83c3128f34c76755c3b59912123b9ef
+SIZE (cassandra/zstd-jni-1.5.6-7-freebsd_amd64.jar) = 492759
+SHA256 (cassandra/apache-cassandra-4.1.11-repo.tar.xz) = 893316f254029601aeff16d265c49680527d891f0bc567db05c36eafaf453426
+SIZE (cassandra/apache-cassandra-4.1.11-repo.tar.xz) = 95341344
diff --git a/databases/cassandra4/files/maven/build-bench.xml b/databases/cassandra4/files/maven/build-bench.xml
new file mode 100644
index 000000000000..c030cecb9a7e
--- /dev/null
+++ b/databases/cassandra4/files/maven/build-bench.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<project basedir="." name="apache-cassandra-bench"
+         xmlns:if="ant:if" xmlns:unless="ant:unless">
+
+    <property name="async-profiler.version" value="2.9"/>
+    <condition property="async-profiler.suffix" value="linux-arm64">
+        <and>
+            <os arch="aarch64"/>
+            <isset property="isLinux"/>
+        </and>
+    </condition>
+    <condition property="async-profiler.suffix" value="linux-x64">
+        <and>
+            <os arch="amd64"/>
+            <isset property="isLinux"/>
+        </and>
+    </condition>
+    <condition property="async-profiler.suffix" value="macos">
+        <isset property="isMac"/>
+    </condition>
+    <property name="async-profiler.name" value="async-profiler-${async-profiler.version}-${async-profiler.suffix}"/>
+    <property name="async-profiler.base" value="${build.dir}/async-profiler"/>
+
+    <property name="test.profiler.opts.default" value="event=cpu;threads=true;output=flamegraph;simple=true;ann=true"/>
+    <property name="test.profiler.output" value="${build.test.dir}/profiler"/>
+
+    <target name="-microbench">
+        <jmh/>
+    </target>
+
+    <target name="-microbench-with-profiler" depends="-fetch-async-profiler">
+        <condition property="test.profiler.opts" value="${test.profiler.opts.default}" else="${profiler.opts}">
+            <or>
+                <not>
+                    <isset property="profiler.opts"/>
+                </not>
+                <equals arg1="${profiler.opts}" arg2=""/>
+            </or>
+        </condition>
+
+        <property name="async-profiler.lib.path" value="${async-profiler.base}/build/libasyncProfiler.so"/>
+
+        <mkdir dir="${test.profiler.output}"/>
+
+        <jmh>
+            <extra-args>
+                <arg value="-prof"/>
+                <arg value="async:libPath=${async-profiler.lib.path};dir=${test.profiler.output};${test.profiler.opts}"/>
+            </extra-args>
+        </jmh>
+    </target>
+
+    <macrodef name="jmh">
+        <element name="extra-args" optional="true"/>
+        <sequential>
+            <java classname="org.openjdk.jmh.Main" fork="true" failonerror="true" >
+                <classpath>
+                    <path refid="cassandra.classpath.test"/>
+                    <pathelement location="${test.classes}"/>
+                    <pathelement location="${test.conf}"/>
+                    <pathelement location="${async-profiler.base}/lib/async-profiler.jar"/>
+                    <pathelement location="${async-profiler.base}/lib/converter.jar"/>
+                </classpath>
+
+                <jvmarg line="${java11-jvmargs}"/>
+                <jvmarg line="${_std-test-jvmargs}"/>
+                <jvmarg line="${test.jvm.args}"/>
+
+                <arg value="-foe"/>
+                <arg value="true"/>
+                <arg value="-rf"/>
+                <arg value="json"/>
+                <arg value="-rff"/>
+                <arg value="${build.test.dir}/jmh-result.json"/>
+                <arg value="-v"/>
+                <arg value="EXTRA"/>
+
+                <arg line="${jmh.args}"/>
+
+                <extra-args/>
+
+                <!-- TODO https://issues.apache.org/jira/browse/CASSANDRA-18873 -->
+                <arg value="-e" if:blank="${benchmark.name}"/>
+                <arg value="ZeroCopyStreamingBench|MutationBench|FastThreadLocalBench" if:blank="${benchmark.name}"/>
+
+                <arg value=".*microbench.*${benchmark.name}"/>
+            </java>
+        </sequential>
+    </macrodef>
+
+    <target name="-fetch-async-profiler">
+        <mkdir dir="${tmp.dir}"/>
+        <mkdir dir="${async-profiler.base}"/>
+
+        <antcall target="-fetch-async-profiler-mac" if:true="${isMac}" inheritrefs="true"/>
+        <antcall target="-fetch-async-profiler-linux" if:true="${isLinux}" inheritrefs="true"/>
+
+        <move todir="${async-profiler.base}">
+            <fileset dir="${async-profiler.base}/${async-profiler.name}">
+                <include name="**"/>
+            </fileset>
+        </move>
+        <delete dir="${async-profiler.base}/${async-profiler.name}" includeemptydirs="true"/>
+    </target>
+
+    <target name="-fetch-async-profiler-linux">
+        <get src="https://github.com/async-profiler/async-profiler/releases/download/v${async-profiler.version}/${async-profiler.name}.tar.gz"
+             dest="${tmp.dir}/${async-profiler.name}.tar.gz" retries="3" httpusecaches="true" skipexisting="true"/>
+        <gunzip src="${tmp.dir}/${async-profiler.name}.tar.gz" dest="${tmp.dir}/"/>
+        <untar src="${tmp.dir}/${async-profiler.name}.tar" dest="${async-profiler.base}/"/>
+        <delete file="${tmp.dir}/${async-profiler.name}.tar"/>
+    </target>
+
+    <target name="-fetch-async-profiler-mac">
+        <get src="https://github.com/async-profiler/async-profiler/releases/download/v${async-profiler.version}/${async-profiler.name}.zip"
+             dest="${tmp.dir}/${async-profiler.name}.zip" retries="3" httpusecaches="true" skipexisting="true"/>
+        <unzip src="${tmp.dir}/${async-profiler.name}.zip" dest="${async-profiler.base}/"/>
+    </target>
+
+</project>
diff --git a/databases/cassandra4/files/maven/build-cqlsh.xml b/databases/cassandra4/files/maven/build-cqlsh.xml
new file mode 100644
index 000000000000..45e0e46a494d
--- /dev/null
+++ b/databases/cassandra4/files/maven/build-cqlsh.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<project basedir="." name="apache-cassandra-cqlsh-tasks"
+         xmlns:if="ant:if">
+    <target name="set-cqlsh-version">
+        <echo file="pylib/cqlshlib/serverversion.py" append="false">version = "${base.version}"${line.separator}</echo>
+    </target>
+</project>
diff --git a/databases/cassandra4/files/maven/build-owasp.xml b/databases/cassandra4/files/maven/build-owasp.xml
index f3174999e8d4..7067c911274a 100644
--- a/databases/cassandra4/files/maven/build-owasp.xml
+++ b/databases/cassandra4/files/maven/build-owasp.xml
@@ -1,86 +1,119 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   ~ Licensed to the Apache Software Foundation (ASF) under one
   ~ or more contributor license agreements.  See the NOTICE file
   ~ distributed with this work for additional information
   ~ regarding copyright ownership.  The ASF licenses this file
   ~ to you under the Apache License, Version 2.0 (the
   ~ "License"); you may not use this file except in compliance
   ~ with the License.  You may obtain a copy of the License at
   ~
   ~     http://www.apache.org/licenses/LICENSE-2.0
   ~
   ~ Unless required by applicable law or agreed to in writing, software
   ~ distributed under the License is distributed on an "AS IS" BASIS,
   ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project basedir="." name="apache-cassandra-owasp-tasks">
-    <property name="dependency-check.version" value="6.3.2"/>
-    <property name="dependency-check.home" value="${build.dir}/dependency-check-ant-${dependency-check.version}"/>
+<project basedir="." name="apache-cassandra-owasp-tasks"
+         xmlns:unless="ant:unless"
+         xmlns:if="ant:if">
+    <property name="dependency-check.version" value="12.1.6"/>
+    <property name="dependency-check.home" value="${tmp.dir}/dependency-check-ant-${dependency-check.version}"/>
+    <property name="dependency-check.archive.dir" value="${local.repository}/org/owasp/dependency-check-ant/${dependency-check.version}"/>
+    <property name="dependency-check.archive.name" value="dependency-check-ant-${dependency-check.version}-release.zip"/>
+    <property name="dependency-check.report.dir" value="${build.dir}/owasp"/>
 
-    <condition property="is.dependency.check.jar">
-        <available file="${dependency-check.home}/dependency-check-ant/dependency-check-ant.jar" type="file" />
+    <condition property="dependency-check-ant.archive.present">
+        <available file="${dependency-check.archive.dir}/${dependency-check.archive.name}" type="file" />
     </condition>
 
-    <target name="dependency-check-download"
-            depends="build"
+    <target name="-dependency-check-download"
             description="Fetch OWASP Dependency checker"
-            unless="is.dependency.check.jar">
+            unless="dependency-check-ant.archive.present">
 
-        <echo>Downloading OWASP Dependency checks ...</echo>
+        <mkdir dir="${dependency-check.archive.dir}"/>
+        <get src="https://github.com/dependency-check/DependencyCheck/releases/download/v${dependency-check.version}/${dependency-check.archive.name}"
+             dest="${dependency-check.archive.dir}/${dependency-check.archive.name}" retries="3"/>
+    </target>
 
+    <target name="-dependency-check-init" depends="-dependency-check-download">
+        <delete dir="${dependency-check.home}" includeemptydirs="true" failonerror="false"/>
         <mkdir dir="${dependency-check.home}"/>
+        <unzip src="${dependency-check.archive.dir}/${dependency-check.archive.name}" dest="${dependency-check.home}"/>
+    </target>
 
-        <get src="https://github.com/jeremylong/DependencyCheck/releases/download/v${dependency-check.version}/dependency-check-ant-${dependency-check.version}-release.zip"
-             dest="${dependency-check.home}/dependency-check-ant-${dependency-check.version}-release.zip"/>
+    <target name="-run-owasp-scan" description="Dependency-Check Analysis"
+            depends="-dependency-check-init,resolver-dist-lib">
+        <property name="nvd.api.key" value="dummy" if:set="env.NVD_DATAFEED_URL" />
+        <fail unless:set="nvd.api.key">
+            Please set the nvd.api.key property to your NVD API key. It is recommended to put that property into your
+            ~/.ant/build.properties file. You can get your API key from https://nvd.nist.gov/developers/request-an-api-key
+        </fail>
 
-        <unzip src="${dependency-check.home}/dependency-check-ant-${dependency-check.version}-release.zip" dest="${dependency-check.home}"/>
-    </target>
+        <echo unless:set="nvd.data.dir">
+            Since the NVD database is pretty large, you should consider storing it in some persistent location to reuse
+            it between builds. You can do that by setting the nvd.data.dir property to a directory of your choice,
+            such as ~/.cache/ant/owasp/database for Linux or ~/Library/Caches/Ant/owasp/database for MacOS.
+            Putting that property into your ~/.ant/build.properties file is recommended.
+        </echo>
 
-    <target name="dependency-check" description="Dependency-Check Analysis" depends="dependency-check-download,resolver-dist-lib">
+        <property name="nvd.data.dir" value="${tmp.dir}/owasp/database"/>
+        <property name="nvd.validity.hours" value="4"/>
 
         <path id="dependency-check.path">
             <fileset dir="${dependency-check.home}/dependency-check-ant/lib">
                 <include name="*.jar"/>
             </fileset>
         </path>
 
         <taskdef resource="dependency-check-taskdefs.properties">
             <classpath refid="dependency-check.path" />
         </taskdef>
 
         <!--
-            default value for cveValidForHours is 4 after which sync is done again
-
-            skipping using two specific caches at the end is solving (1)
+            default value for nvdValidForHours is 4 after which sync is done again
 
             failBuildOnCVSS is by default 11 so build would never fail,
-            the table categorising vulnerabilities is here (2), so by setting
+            the table categorising vulnerabilities is here (1), so by setting
             "failBuildOnCVSS" to 1, we will fail the build on any CVE found
             if it is not suppressed already dependency-check-suppressions.xml
 
             If a vendor provides no details about a vulnerability,
             NVD will score that vulnerability as 10.0 (the highest rating translating to critical).
 
-            (1) https://github.com/jeremylong/DependencyCheck/issues/2166
-            (2) https://nvd.nist.gov/vuln-metrics/cvss
+            (1) https://nvd.nist.gov/vuln-metrics/cvss
         -->
+        <condition property="nvdDatafeedUrl" value="${env.NVD_DATAFEED_URL}" else="">
+            <isset property="env.NVD_DATAFEED_URL" />
+        </condition>
         <dependency-check projectname="Apache Cassandra"
-                          reportoutputdirectory="${basedir}/build"
-                          reportformat="HTML"
+                          nvdApiKey="${nvd.api.key}"
+                          reportoutputdirectory="${dependency-check.report.dir}"
+                          reportformat="ALL"
                           prettyPrint="true"
-                          cveValidForHours="1"
-                          centralAnalyzerUseCache="false"
-                          nodeAuditAnalyzerUseCache="false"
+                          nvdValidForHours="${nvd.validity.hours}"
+                          centralAnalyzerUseCache="true"
+                          nodeAuditAnalyzerUseCache="true"
                           failBuildOnCVSS="1"
                           assemblyAnalyzerEnabled="false"
-                          dataDirectory="${dependency-check.home}/data"
-                          suppressionFile="${basedir}/.build/dependency-check-suppressions.xml">
-            <fileset dir="lib">
-                <include name="**/*.jar"/>
-            </fileset>
+                          dataDirectory="${nvd.data.dir}"
+                          suppressionFile="${basedir}/.build/dependency-check-suppressions.xml"
+                          nvdDatafeedUrl="${nvdDatafeedUrl}">
+            <fileset refid="dependencies_to_check"/>
         </dependency-check>
     </target>
+
+    <target name="dependency-check" depends="resolver-dist-lib,generate-snyk-file">
+        <fileset dir="lib" id="dependencies_to_check">
+            <include name="**/*.jar"/>
+        </fileset>
+        <antcall target="-run-owasp-scan" inheritrefs="true" inheritall="true"/>
+    </target>
+
+    <target name="generate-snyk-file" unless="ant.gen-snyk.skip">
+        <chmod file="${basedir}/.build/generate-snyk-file" perm="+x"/>
+        <exec executable="${basedir}/.build/generate-snyk-file" failonerror="true"/>
+    </target>
 </project>
diff --git a/databases/cassandra4/files/maven/build-rat.xml b/databases/cassandra4/files/maven/build-rat.xml
index 5a6aa0aa8546..f4a2aab588ad 100644
--- a/databases/cassandra4/files/maven/build-rat.xml
+++ b/databases/cassandra4/files/maven/build-rat.xml
@@ -1,105 +1,122 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
   this work for additional information regarding copyright ownership.
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
 <project basedir="." name="apache-cassandra--rat-tasks"
      xmlns:rat="antlib:org.apache.rat.anttasks">
 
     <!--
       License audit tool
     -->
 
     <target name="_rat_init" depends="resolver-init">
         <typedef uri="antlib:org.apache.rat.anttasks" classpathref="rat.classpath"/>
     </target>
 
     <target name="_build_ratinclude" depends="_rat_init">
-        <exec executable="git" failifexecutionfails="false" failonerror="false" resultproperty="git.success" output="build/.versioned_files">
+        <exec executable="git" failifexecutionfails="false" failonerror="false" resultproperty="git.success" output="${build.dir}/.ratinclude">
             <arg line="ls-tree -r HEAD --name-only"/>
         </exec>
         <condition property="rat.skip" value="true">
             <not>
                 <equals arg1="${git.success}" arg2="0"/>
             </not>
         </condition>
-        <copy file="build/.versioned_files" tofile="build/.ratinclude">
-            <filterchain>
-                <linecontainsregexp>
-                    <regexp pattern=".*\.(java|py|sh|xml|spec|md|iml|bat|btm|cql|css|g|html|jflex|jks|mod|name|pom|textile|yml|yaml|MIDRES|HIGHRES|LOWRES)$"/>
-                </linecontainsregexp>
-            </filterchain>
-        </copy>
     </target>
 
-    <target name="rat-check" depends="_build_ratinclude" unless="${rat.skip}" description="License checks on source" >
+    <target name="rat-check" depends="_build_ratinclude" unless="rat.skip" description="License checks on source" >
         <rat:report reportFile="${build.dir}/rat.txt">
-            <fileset dir="." includesfile="build/.ratinclude">
+            <fileset dir="." includesfile="${build.dir}/.ratinclude">
                  <!-- Config files with not much creativity -->
-                 <exclude name="**/ide/**/*"/>
-                 <exclude name="**/metrics-reporter-config-sample.yaml"/>
-                 <exclude name="**/cassandra.yaml"/>
-                 <exclude name="**/cassandra-murmur.yaml"/>
-                 <exclude name="**/cassandra-seeds.yaml"/>
-                 <exclude NAME="**/doc/antora.yml"/>
-                 <exclude name="**/test/conf/cassandra.yaml"/>
-                 <exclude name="**/test/conf/cassandra_deprecated_parameters_names.yaml"/>
-                 <exclude name="**/test/conf/cassandra_encryption.yaml"/>
-                 <exclude name="**/test/conf/cdc.yaml"/>
-                 <exclude name="**/test/conf/commitlog_compression_LZ4.yaml"/>
-                 <exclude name="**/test/conf/commitlog_compression_Zstd.yaml"/>
-                 <exclude name="**/test/conf/system_keyspaces_directory.yaml"/>
-                 <exclude name="**/test/conf/sstableloader_with_encryption.yaml"/>
-                 <exclude name="**/test/conf/unit-test-conf/test-native-port.yaml"/>
-                 <exclude name="**/test/data/jmxdump/cassandra-3.0-jmx.yaml"/>
-                 <exclude name="**/test/data/jmxdump/cassandra-3.11-jmx.yaml"/>
-                 <exclude name="**/test/data/jmxdump/cassandra-4.0-jmx.yaml"/>
-                 <exclude name="**/tools/cqlstress-counter-example.yaml"/>
-                 <exclude name="**/tools/cqlstress-example.yaml"/>
-                 <exclude name="**/tools/cqlstress-insanity-example.yaml"/>
-                 <exclude name="**/tools/cqlstress-lwt-example.yaml"/>
+                 <exclude name=".asf.yaml"/>
+                 <exclude name=".snyk"/>
+                 <exclude name="**/cassandra*.yaml"/>
+                 <exclude name="conf/metrics-reporter-config-sample.yaml"/>
+                 <exclude NAME="doc/antora.yml"/>
+                 <exclude name="ide/**/*"/>
+                 <exclude name="pylib/cqlshlib/test/config/sslhandling*.config"/>
+                 <exclude NAME="src/resources/org/apache/cassandra/cql3/reserved_keywords.txt"/>
+                 <exclude NAME="src/resources/org/apache/cassandra/index/sasi/analyzer/filter/*.txt"/>
+                 <exclude name="test/conf/cdc.yaml"/>
+                 <exclude name="test/conf/commitlog*.yaml"/>
+                 <exclude name="test/conf/system_keyspaces_directory.yaml"/>
+                 <exclude name="test/conf/sstableloader_with_encryption.yaml"/>
+                 <exclude name="test/conf/unit-test-conf/test-native-port.yaml"/>
+                 <exclude name="test/resources/data/config/YamlConfigurationLoaderTest/*.yaml"/>
+                 <exclude name="tools/cqlstress-*.yaml"/>
+                 <!-- test data -->
+                 <exclude name="pylib/cqlshlib/test/test_authproviderhandling_config/*"/>
+                 <exclude name="test/**/cassandra*.conf"/>
+                 <exclude name="test/**/*.csv"/>
+                 <exclude name="test/**/*.json"/>
+                 <exclude name="test/**/*.txt"/>
+                 <exclude name="test/data/**/*.adler32"/>
+                 <exclude name="test/data/**/*.crc32"/>
+                 <exclude name="test/data/**/CommitLog-*.log"/>
+                 <exclude name="test/data/**/*.bin"/>
+                 <exclude name="test/data/**/*.db"/>
+                 <exclude name="test/data/**/*.sha1"/>
+                 <exclude name="test/data/CASSANDRA-15313/lz4-jvm-crash-failure.txt"/>
+                 <exclude name="test/data/jmxdump/cassandra-*-jmx.yaml"/>
                  <!-- Documentation files -->
-                 <exclude NAME="**/doc/modules/**/*"/>
-                 <!-- NOTICE files -->
-                 <exclude NAME="**/NOTICE.md"/>
-                 <!-- LICENSE files -->
-                 <exclude NAME="**/LICENSE.md"/>
+                 <exclude name=".github/pull_request_template.md"/>
+                 <exclude NAME="doc/modules/**/*"/>
+                 <exclude NAME="src/java/**/*.md"/>
+                 <exclude NAME="**/README*"/>
+                 <exclude NAME="CHANGES.txt"/>
+                 <exclude NAME="CASSANDRA-14092.txt"/>
+                 <exclude NAME="debian/TODO"/>
+                 <!-- legal files -->
+                 <exclude NAME="NOTICE.txt"/>
+                 <exclude NAME="LICENSE.txt"/>
+                 <!-- misc -->
+                 <exclude NAME="**/*.patch"/>
+                 <exclude NAME="**/*.diff"/>
+                 <exclude NAME="debian/cassandra.bash-completion"/>
+                 <exclude NAME="debian/cassandra-sysctl.conf"/>
+                 <exclude NAME="debian/cassandra.install"/>
+                 <exclude NAME="debian/cassandra-tools.install"/>
+                 <exclude NAME="debian/compat"/>
+                 <exclude NAME="debian/control"/>
+                 <exclude NAME="debian/dirs"/>
+                 <exclude NAME="debian/patches/series"/>
             </fileset>
         </rat:report>
         <exec executable="grep" outputproperty="rat.failed.files" failifexecutionfails="false">
             <arg line="-A5 'Unapproved licenses' ${build.dir}/rat.txt"/>
         </exec>
         <fail message="Some files have missing or incorrect license information. Check RAT report in ${build.dir}/rat.txt for more details! \n ${rat.failed.files}">
             <condition>
                 <and>
                     <not>
                         <resourcecontains resource="${build.dir}/rat.txt" substring="0 Unknown Licenses" casesensitive="false" />
                     </not>
                 </and>
             </condition>
         </fail>
     </target>
 
     <target name="_assert_rat_output">
         <fail message="The rat report at build/rat.txt was not generated. Please ensure that the rat-check task is able to run successfully. For dev builds only, touch build/rat.txt to skip this check">
             <condition>
                 <not>
-                    <available file="build/rat.txt" />
+                    <available file="${build.dir}/rat.txt" />
                 </not>
             </condition>
         </fail>
     </target>
 
 </project>
diff --git a/databases/cassandra4/files/maven/build-resolver.xml b/databases/cassandra4/files/maven/build-resolver.xml
index a159d97acaff..c69ca84c29c2 100644
--- a/databases/cassandra4/files/maven/build-resolver.xml
+++ b/databases/cassandra4/files/maven/build-resolver.xml
@@ -1,262 +1,271 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
   this work for additional information regarding copyright ownership.
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
 <project basedir="." name="apache-cassandra--resolver-tasks"
          xmlns:resolver="antlib:org.apache.maven.resolver.ant"
          xmlns:if="ant:if"
          xmlns:unless="ant:unless">
 
     <!-- details of what version of Resolver ANT Tasks to fetch -->
     <property name="resolver-ant-tasks.version" value="1.3.0" />
     <property name="resolver-ant-tasks.local" value="${local.repository}/org/apache/maven/resolver/maven-resolver-ant-tasks/${resolver-ant-tasks.version}/maven-resolver-ant-tasks-${resolver-ant-tasks.version}.jar"/>
     <property name="resolver-ant-tasks.url" value="https://repo1.maven.org/maven2/org/apache/maven/resolver/maven-resolver-ant-tasks" />
     <condition property="resolver-ant-tasks.jar.exists">
         <available file="${resolver-ant-tasks.local}" />
     </condition>
 
     <property name="artifact.python.pypi" value="https://files.pythonhosted.org/packages" />
     <property name="artifact.github.release" value="https://github.com" />
 
     <!-- some artifacts are fetched from github as blobs; these are all in the cassandra project, but in an older commit -->
     <property name="lib.download.sha" value="1371883db3d8bf7d7c54e0baaca89c6c2d2a5abe"/>
     <property name="lib.download.base.url" value="https://raw.githubusercontent.com/apache/cassandra/${lib.download.sha}" />
     <property name="lib.download.url.postfix" value="" />
 
     <path id="resolver-ant-tasks.classpath" path="${resolver-ant-tasks.local}" />
 
     <!--
        Fetch Resolver Ant Tasks and Cassandra's dependencies.
     -->
 
     <target name="_resolver_download" unless="resolver-ant-tasks.jar.exists" description="Fetch Resolver ANT Tasks from Maven Central Repository">
         <echo>Downloading Resolver ANT Tasks...</echo>
         <mkdir dir="${local.repository}/org/apache/maven/resolver/maven-resolver-ant-tasks/${resolver-ant-tasks.version}" />
 
         <get src="${resolver-ant-tasks.url}/${resolver-ant-tasks.version}/maven-resolver-ant-tasks-${resolver-ant-tasks.version}-uber.jar"
              dest="${resolver-ant-tasks.local}" usetimestamp="true" quiet="true"/>
     </target>
 
     <target name="resolver-init" depends="init,_resolver_download" unless="resolver-ant-tasks.initialized" description="Initialize Resolver ANT Tasks">
 
         <typedef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml" classpathref="resolver-ant-tasks.classpath" />
         <resolver:remoterepos id="all">
             <remoterepo id="resolver-central" url="${artifact.remoteRepository.central}"/>
             <remoterepo id="resolver-apache" url="${artifact.remoteRepository.apache}"/>
+            <!-- Snapshot artifacts must not exist in nor be downloaded by any Cassandra release artifact.
+                 Please validate that all artifacts included in parent-pom-template.xml are release
+                 artifacts before committing.
+
+                 To build with a snapshot dependency, ensure build.properties or build.properties.default
+                 contain the correct resolution for "artifact.remoteRepository.apacheSnapshot" and uncomment
+                 the following line.
+
+                 You may also need to add an exclusion for "resolver-apache-snapshot" to your mirrors in ~/.m2/settings.xml
+                 or ~/.ant/settings.xml (maven ant resolver supersedes) as mirrors will, by default, catch and override
+                 all dependency resolution regardless of it being a -SNAPSHOT lib or not.
+             -->
+            <!-- <remoterepo id="resolver-apache-snapshot" url="${artifact.remoteRepository.apacheSnapshot}" releases="false" snapshots="true" updates="always" checksums="fail" /> -->
         </resolver:remoterepos>
 
         <macrodef name="resolve">
             <!--
-              maven-resolver-ant-tasks's resolve logic doesn't have retry logic and does not respect settings.xml,
+              maven-resolver-ant-tasks's resolve logic doesn't have retry logic and does not respect settings.xml, 
               this causes issues when overriding maven central is required (such as when behind a corporate firewall);
               it is critical to always provide the 'all' remoterepos to override resolve's default hard coded logic.
 
               This macro simplifies this logic by centralizing retries and forcing the remoterepo 'all' to be used.
             -->
             <attribute name="failonmissingattachments" default="true"/>
             <element name="elements" implicit="yes"/>
             <sequential>
                 <retry retrycount="3">
                   <resolver:resolve failonmissingattachments="@{failonmissingattachments}">
                         <resolver:remoterepos refid="all"/>
                         <elements/>
                     </resolver:resolve>
                 </retry>
             </sequential>
         </macrodef>
         <macrodef name="resolvepom">
             <attribute name="file"/>
             <attribute name="id"/>
             <element name="elements" implicit="yes" optional="yes"/>
             <sequential>
                 <retry retrycount="3">
                     <resolver:pom file="@{file}" id="@{id}">
                           <remoterepos refid="all"/>
                           <elements/>
                     </resolver:pom>
                 </retry>
             </sequential>
         </macrodef>
 
         <resolve>
             <dependencies>
                 <dependency groupId="com.datastax.wikitext" artifactId="wikitext-core-ant" version="1.3"/>
                 <dependency groupId="org.fusesource.wikitext" artifactId="textile-core" version="1.3"/>
             </dependencies>
             <path refid="wikitext.classpath" classpath="runtime"/>
         </resolve>
         <resolve>
             <dependencies>
                 <dependency groupId="org.apache.rat" artifactId="apache-rat-tasks" version="0.6" />
             </dependencies>
             <path refid="rat.classpath" classpath="runtime"/>
         </resolve>
         <resolve>
             <dependencies>
                 <dependency groupId="org.jacoco" artifactId="org.jacoco.ant" version="${jacoco.version}" />
             </dependencies>
             <path refid="jacocoant.classpath" classpath="runtime"/>
         </resolve>
         <resolve>
             <dependencies>
                 <dependency groupId="org.antlr" artifactId="antlr" version="3.5.2"/>
                 <dependency groupId="org.antlr" artifactId="antlr-runtime" version="3.5.2"/>
                 <dependency groupId="org.antlr" artifactId="ST4" version="4.0.8"/>
             </dependencies>
             <path refid="cql3-grammar.classpath" classpath="runtime"/>
         </resolve>
         <resolve>
             <dependencies>
                 <dependency groupId="de.jflex" artifactId="jflex" version="${jflex.version}" />
             </dependencies>
             <path refid="jflex.classpath" classpath="runtime"/>
         </resolve>
 
         <macrodef name="install">
             <attribute name="pomFile"/>
             <attribute name="file"/>
             <attribute name="classifier" default=""/>
             <attribute name="packaging" default="jar"/>
             <sequential>
                 <exec dir="." executable="sh">
                     <arg line="-c 'mvn org.apache.maven.plugins:maven-install-plugin:2.3.1:install-file -DpomFile=@{pomFile} -Dfile=@{file} -Dclassifier=@{classifier} -Dpackaging=@{packaging}'" />
                 </exec>
             </sequential>
         </macrodef>
 
         <macrodef name="deploy">
             <attribute name="pomFile"/>
             <attribute name="file"/>
             <attribute name="classifier" default=""/>
             <attribute name="packaging" default="jar"/>
             <sequential>
                 <exec dir="." executable="sh">
                     <arg line="-c 'mvn org.apache.maven.plugins:maven-gpg-plugin:1.6:sign-and-deploy-file -DretryFailedDeploymentCount=5 -Durl=${maven-repository-url} -DrepositoryId=${maven-repository-id} -DpomFile=@{pomFile} -Dfile=@{file} -Dclassifier=@{classifier} -Dpackaging=@{packaging}'" />
                 </exec>
             </sequential>
         </macrodef>
 
         <macrodef name="sign-dist">
             <attribute name="file"/>
             <sequential>
                 <echo message="gpg signing @{file}" />
                 <exec dir="." executable="sh">
                     <!-- dummy out the deploy parameters, only the signing is required here -->
                     <arg line="-c 'mvn -q org.apache.maven.plugins:maven-gpg-plugin:1.6:sign-and-deploy-file -Dfile=@{file} -DgroupId=org.apache.cassandra -DartifactId=cassandra-parent -Dversion=${version} -Durl=file:///tmp/ -DrepositoryId=tmp'" />
                 </exec>
             </sequential>
         </macrodef>
 
         <property name="resolver-ant-tasks.initialized" value="true"/>
     </target>
 
     <target name="resolver-retrieve-build" depends="resolver-init,write-poms">
         <resolvepom file="${build.dir}/${final.name}.pom" id="all-pom" />
         <resolvepom file="${build.dir}/tmp-${final.name}-deps.pom" id="pom-deps" />
 
         <resolve>
             <dependencies pomRef="all-pom"/>
             <files dir="${build.dir.lib}/jars" layout="{artifactId}-{version}-{classifier}.{extension}" scopes="compile,provided,!system"/>
         </resolve>
         <resolve>
             <dependencies pomRef="pom-deps"/>
             <files dir="${test.lib}/jars" layout="{artifactId}-{version}-{classifier}.{extension}" scopes="test,!provide,!system"/>
         </resolve>
 
 
         <!-- jacoco agent jar comes wrapped in a jar -->
         <unzip src="${local.repository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}.jar" dest="${build.dir.lib}/jars">
             <patternset>
                 <include name="*.jar"/>
             </patternset>
             <mapper type="flatten"/>
         </unzip>
     </target>
 
     <target name="resolver-dist-lib" depends="resolver-retrieve-build,write-poms">
         <resolvepom file="${build.dir}/${final.name}.pom" id="all-pom" />
 
         <resolve failOnMissingAttachments="true">
             <dependencies pomRef="all-pom"/>
             <files dir="${build.lib}" layout="{artifactId}-{version}-{classifier}.{extension}" scopes="compile,!provide,!system"/>
         </resolve>
         <mkdir dir="${local.repository}/org/apache/cassandra/deps/sigar-bin"/>
         <mkdir dir="${build.lib}/sigar-bin"/>
 
         <!-- files.pythonhosted.org -->
         <get src="${artifact.python.pypi}/59/a0/cf4cd997e1750f0c2d91c6ea5abea218251c43c3581bcc2f118b00baf5cf/futures-2.1.6-py2.py3-none-any.whl" dest="${local.repository}/org/apache/cassandra/deps/futures-2.1.6-py2.py3-none-any.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
         <get src="${artifact.python.pypi}/73/fb/00a976f728d0d1fecfe898238ce23f502a721c0ac0ecfedb80e0d88c64e9/six-1.12.0-py2.py3-none-any.whl" dest="${local.repository}/org/apache/cassandra/deps/six-1.12.0-py2.py3-none-any.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
+        <get src="${artifact.python.pypi}/37/b2/ef1124540ee2c0b417be8d0f74667957e6aa084a3f26621aa67e2e77f3fb/pure_sasl-0.6.2-py2-none-any.whl" dest="${local.repository}/org/apache/cassandra/deps/pure_sasl-0.6.2-py2-none-any.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
 
         <!-- apache/cassandra/lib -->
         <get src="${lib.download.base.url}/lib/geomet-0.1.0.zip" dest="${local.repository}/org/apache/cassandra/deps/geomet-0.1.0.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
         <get dest="${local.repository}/org/apache/cassandra/deps/sigar-bin/" quiet="true" usetimestamp="true" skipexisting="true">
             <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-amd64-freebsd-6.so"/>
             <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-amd64-linux.so"/>
             <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-amd64-solaris.so"/>
             <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-ia64-hpux-11.sl"/>
             <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-ia64-linux.so"/>
             <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-pa-hpux-11.sl"/>
             <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-ppc-aix-5.so"/>
             <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-ppc-linux.so"/>
             <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-ppc64-aix-5.so"/>
             <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-ppc64-linux.so"/>
             <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-ppc64le-linux.so"/>
             <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-s390x-linux.so"/>
             <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-sparc-solaris.so"/>
             <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-sparc64-solaris.so"/>
             <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-universal-macosx.dylib"/>
             <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-universal64-macosx.dylib"/>
             <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-x86-freebsd-5.so"/>
             <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-x86-freebsd-6.so"/>
             <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-x86-linux.so"/>
             <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-x86-solaris.so"/>
-            <url url="${lib.download.base.url}/lib/sigar-bin/sigar-amd64-winnt.dll"/>
-            <url url="${lib.download.base.url}/lib/sigar-bin/sigar-x86-winnt.dll"/>
-            <url url="${lib.download.base.url}/lib/sigar-bin/sigar-x86-winnt.lib"/>
         </get>
-
+        
         <copy todir="${build.lib}" quiet="true">
             <file file="${local.repository}/org/apache/cassandra/deps/futures-2.1.6-py2.py3-none-any.zip"/>
             <file file="${local.repository}/org/apache/cassandra/deps/six-1.12.0-py2.py3-none-any.zip"/>
             <file file="${local.repository}/org/apache/cassandra/deps/geomet-0.1.0.zip"/>
+            <file file="${local.repository}/org/apache/cassandra/deps/pure_sasl-0.6.2-py2-none-any.zip"/>
         </copy>
         <copy todir="${build.lib}/sigar-bin/" quiet="true">
             <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-amd64-freebsd-6.so"/>
             <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-amd64-linux.so"/>
             <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-amd64-solaris.so"/>
             <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-ia64-hpux-11.sl"/>
             <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-ia64-linux.so"/>
             <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-pa-hpux-11.sl"/>
             <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-ppc-aix-5.so"/>
             <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-ppc-linux.so"/>
             <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-ppc64-aix-5.so"/>
             <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-ppc64-linux.so"/>
             <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-ppc64le-linux.so"/>
             <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-s390x-linux.so"/>
             <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-sparc-solaris.so"/>
             <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-sparc64-solaris.so"/>
             <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-universal-macosx.dylib"/>
             <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-universal64-macosx.dylib"/>
             <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-x86-freebsd-5.so"/>
             <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-x86-freebsd-6.so"/>
             <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-x86-linux.so"/>
             <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-x86-solaris.so"/>
-            <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/sigar-amd64-winnt.dll"/>
-            <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/sigar-x86-winnt.dll"/>
-            <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/sigar-x86-winnt.lib"/>
         </copy>
     </target>
 </project>
diff --git a/databases/cassandra4/files/maven/build.properties.default b/databases/cassandra4/files/maven/build.properties.default
index 11da534e32c1..36676f5712d8 100644
--- a/databases/cassandra4/files/maven/build.properties.default
+++ b/databases/cassandra4/files/maven/build.properties.default
@@ -1,4 +1,23 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
 # Maven2 Repository Locations (you can override these in "build.properties" to point to a local proxy, e.g. Nexus)
+#
 artifact.remoteRepository.central:     https://repo1.maven.org/maven2
 artifact.remoteRepository.apache:      https://repo.maven.apache.org/maven2
-
+artifact.remoteRepository.apacheSnapshot: https://repository.apache.org/content/repositories/snapshots
diff --git a/databases/cassandra4/files/maven/build.xml b/databases/cassandra4/files/maven/build.xml
index e9093d367d3b..466b39a1d5aa 100644
--- a/databases/cassandra4/files/maven/build.xml
+++ b/databases/cassandra4/files/maven/build.xml
@@ -1,2174 +1,2430 @@
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
   this work for additional information regarding copyright ownership.
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
 <project basedir="." default="jar" name="apache-cassandra"
          xmlns:artifact="antlib:org.apache.maven.artifact.ant"
          xmlns:if="ant:if"
          xmlns:unless="ant:unless">
 
     <fail message="You need to use Ant of version at least 1.10 to continue.">
       <condition>
         <not>
           <antversion atleast="1.10"/>
         </not>
       </condition>
     </fail>
 
     <property environment="env"/>
     <property file="build.properties" />
     <property file="build.properties.default" />
+    <property file="${user.home}/.ant/build.properties"/>
     <property name="debuglevel" value="source,lines,vars"/>
 
     <!-- default version and SCM information -->
-    <property name="base.version" value="4.0.5"/>
+    <property name="base.version" value="4.1.11"/>
     <property name="scm.connection" value="scm:https://gitbox.apache.org/repos/asf/cassandra.git"/>
     <property name="scm.developerConnection" value="scm:https://gitbox.apache.org/repos/asf/cassandra.git"/>
-    <property name="scm.url" value="https://gitbox.apache.org/repos/asf?p=cassandra.git;a=tree"/>
+    <property name="scm.url" value="https://gitbox.apache.org/repos/asf?p=cassandra.git"/>
 
     <!-- directory details -->
     <property name="basedir" value="."/>
+    <property name="build.helpers.dir" value="${basedir}/.build"/>
     <property name="build.src" value="${basedir}/src"/>
     <property name="build.src.java" value="${basedir}/src/java"/>
     <property name="build.src.antlr" value="${basedir}/src/antlr"/>
     <property name="build.src.resources" value="${basedir}/src/resources"/>
     <property name="build.src.gen-java" value="${basedir}/src/gen-java"/>
     <property name="build.lib" value="${basedir}/lib"/>
     <property name="build.dir" value="${basedir}/build"/>
     <property name="build.dir.lib" value="${basedir}/build/lib"/>
     <property name="build.test.dir" value="${build.dir}/test"/>
     <property name="build.classes" value="${build.dir}/classes"/>
     <property name="build.classes.main" value="${build.classes}/main" />
     <property name="javadoc.dir" value="${build.dir}/javadoc"/>
     <property name="interface.dir" value="${basedir}/interface"/>
     <property name="test.dir" value="${basedir}/test"/>
     <property name="test.resources" value="${test.dir}/resources"/>
     <property name="test.lib" value="${build.dir}/test/lib"/>
     <property name="test.classes" value="${build.dir}/test/classes"/>
     <property name="test.conf" value="${test.dir}/conf"/>
     <property name="test.data" value="${test.dir}/data"/>
     <property name="test.name" value="*Test"/>
     <property name="test.classlistfile" value="testlist.txt"/>
     <property name="test.classlistprefix" value="unit"/>
     <property name="benchmark.name" value=""/>
+    <property name="jmh.args" value=""/>
     <property name="test.methods" value=""/>
+    <property name="test.anttasks.src" value="${test.dir}/anttasks"/>
     <property name="test.unit.src" value="${test.dir}/unit"/>
     <property name="test.long.src" value="${test.dir}/long"/>
     <property name="test.burn.src" value="${test.dir}/burn"/>
     <property name="test.memory.src" value="${test.dir}/memory"/>
     <property name="test.microbench.src" value="${test.dir}/microbench"/>
     <property name="test.distributed.src" value="${test.dir}/distributed"/>
     <property name="test.compression.algo" value="LZ4"/>
-    <property name="test.driver.connection_timeout_ms" value="5000"/>
-    <property name="test.driver.read_timeout_ms" value="12000"/>
+    <property name="test.simulator.src" value="${test.dir}/simulator/main"/>
+    <property name="test.simulator-asm.src" value="${test.dir}/simulator/asm"/>
+    <property name="test.simulator-bootstrap.src" value="${test.dir}/simulator/bootstrap"/>
+    <property name="test.simulator-test.src" value="${test.dir}/simulator/test"/>
+    <property name="test.driver.connection_timeout_ms" value="10000"/>
+    <property name="test.driver.read_timeout_ms" value="24000"/>
+    <property name="test.jvm.args" value="" />
     <property name="dist.dir" value="${build.dir}/dist"/>
-    <property name="tmp.dir" value="${java.io.tmpdir}"/>
+
+    <!-- Use build/tmp for temp files if not otherwise specified. Because Ant properties are immutable, this has no effect if
+         the user specifies the tmp.dir property -->
+    <property name="tmp.dir" value="${build.dir}/tmp"/>
 
     <property name="doc.dir" value="${basedir}/doc"/>
 
     <condition property="version" value="${base.version}">
       <isset property="release"/>
     </condition>
     <property name="version" value="${base.version}-SNAPSHOT"/>
     <property name="version.properties.dir"
               value="${build.src.resources}/org/apache/cassandra/config/" />
     <property name="final.name" value="${ant.project.name}-${version}"/>
 
     <property name="local.repository" value="${user.home}/.m2/repository" />
 
     <!-- details of what version of Maven ANT Tasks to fetch -->
     <property name="maven-ant-tasks.version" value="2.1.3" />
     <property name="maven-ant-tasks.local" value="${local.repository}/org/apache/maven/maven-ant-tasks"/>
     <property name="maven-ant-tasks.url"
               value="https://repo.maven.apache.org/maven2/org/apache/maven/maven-ant-tasks" />
     <!-- details of how and which Maven repository we publish to -->
     <property name="maven.version" value="3.0.3" />
     <condition property="maven-repository-url" value="https://repository.apache.org/service/local/staging/deploy/maven2">
       <isset property="release"/>
     </condition>
     <condition property="maven-repository-id" value="apache.releases.https">
       <isset property="release"/>
     </condition>
     <property name="maven-repository-url" value="https://repository.apache.org/content/repositories/snapshots"/>
     <property name="maven-repository-id" value="apache.snapshots.https"/>
 
-    <property name="test.timeout" value="240000" />
+    <property name="test.timeout" value="480000" />
     <property name="test.memory.timeout" value="480000" />
     <property name="test.long.timeout" value="600000" />
     <property name="test.burn.timeout" value="60000000" />
     <property name="test.distributed.timeout" value="900000" />
+    <property name="test.simulation.timeout" value="1800000" />
 
-    <!-- default for cql tests. Can be override by -Dcassandra.test.use_prepared=false -->
+    <!-- default for cql tests. Can be overridden by -Dcassandra.test.use_prepared=false -->
     <property name="cassandra.test.use_prepared" value="true" />
 
+    <!-- The number of active processors seen by JVM -->
+    <property name="cassandra.test.processorCount" value="2"/>
+
     <!-- skip flushing schema tables during tests -->
     <property name="cassandra.test.flush_local_schema_changes" value="false" />
 
+    <!-- fast shutdown of messaging service -->
+    <property name="cassandra.test.messagingService.nonGracefulShutdown" value="true"/>
+
     <!-- https://www.eclemma.org/jacoco/ -->
     <property name="jacoco.export.dir" value="${build.dir}/jacoco/" />
     <property name="jacoco.partials.dir" value="${jacoco.export.dir}/partials" />
     <property name="jacoco.partialexecfile" value="${jacoco.partials.dir}/partial.exec" />
     <property name="jacoco.finalexecfile" value="${jacoco.export.dir}/jacoco.exec" />
     <property name="jacoco.version" value="0.8.6"/>
 
+    <condition property="isMac" value="true">
+        <os family="mac"/>
+    </condition>
+    <condition property="isLinux" value="true">
+        <and>
+            <os family="unix"/>
+            <not>
+                <os family="mac"/>
+            </not>
+        </and>
+    </condition>
+
     <property name="byteman.version" value="4.0.6"/>
     <property name="jamm.version" value="0.3.2"/>
     <property name="ecj.version" value="4.6.1"/>
     <property name="ohc.version" value="0.5.1"/>
-    <property name="asm.version" value="7.1"/>
+    <property name="asm.version" value="9.1"/>
     <property name="allocation-instrumenter.version" value="3.1.0"/>
     <property name="bytebuddy.version" value="1.10.10"/>
     <property name="jflex.version" value="1.8.2"/>
 
     <!-- https://mvnrepository.com/artifact/net.openhft/chronicle-bom/1.16.23 -->
     <property name="chronicle-queue.version" value="5.20.123" />
     <property name="chronicle-core.version" value="2.20.126" />
     <property name="chronicle-bytes.version" value="2.20.111" />
     <property name="chronicle-wire.version" value="2.20.117" />
     <property name="chronicle-threads.version" value="2.20.111" />
 
+    <property name="dtest-api.version" value="0.0.18" />
+
     <condition property="maven-ant-tasks.jar.exists">
       <available file="${build.dir}/maven-ant-tasks-${maven-ant-tasks.version}.jar" />
     </condition>
 
     <condition property="maven-ant-tasks.jar.local">
       <available file="${maven-ant-tasks.local}/${maven-ant-tasks.version}/maven-ant-tasks-${maven-ant-tasks.version}.jar" />
     </condition>
 
     <condition property="is.source.artifact">
       <available file="${build.src.java}" type="dir" />
     </condition>
 
-    <!-- Check if all tests are being run or just one. If it's all tests don't spam the console with test output.
+    <condition property="cassandra.use_nix_recursive_delete" value="false" else="true">
+        <os family="windows" />
+    </condition>
+
+    <condition property="withoutMethods">
+        <and>
+            <equals arg1="${test.methods}" arg2=""/>
+            <not>
+                <contains string="${test.name}" substring="*"/>
+            </not>
+        </and>
+    </condition>
+    <condition property="withMethods">
+        <and>
+            <not>
+                <equals arg1="${test.methods}" arg2=""/>
+            </not>
+            <not>
+                <contains string="${test.name}" substring="*"/>
+            </not>
+        </and>
+    </condition>
+
+    <!-- Check if all tests are being run or just one (check testclasslist target). If it's all tests don't spam the
+         console with test output.
          If it's an individual test print the output from the test under the assumption someone is debugging the test
          and wants to know what is going on without having to context switch to the log file that is generated.
          Debug level output still needs to be retrieved from the log file.  -->
-    <script language="javascript">
-        if (project.getProperty("cassandra.keepBriefBrief") == null)
-        {
-            if (project.getProperty("test.name").equals("*Test"))
-                project.setProperty("cassandra.keepBriefBrief", "true");
-            else
-                project.setProperty("cassandra.keepBriefBrief", "false");
-        }
-    </script>
+    <macrodef name="set-keepbrief-property">
+        <attribute name="test-name" />
+        <sequential>
+            <condition property="cassandra.keepBriefBrief" value="false" else="true">
+                <not>
+                    <equals arg1="@{test-name}" arg2="*Test"/>
+                </not>
+            </condition>
+        </sequential>
+    </macrodef>
+    <set-keepbrief-property test-name="${test.name}" />
 
     <condition property="java.version.8">
         <equals arg1="${ant.java.version}" arg2="1.8"/>
     </condition>
     <condition property="java.version.11">
         <not><isset property="java.version.8"/></not>
     </condition>
     <fail><condition><not><or>
         <isset property="java.version.8"/>
         <isset property="java.version.11"/>
     </or></not></condition></fail>
 
     <resources id="_jvm11_arg_items">
         <string>-Djdk.attach.allowAttachSelf=true</string>
 
         <string>-XX:+UseConcMarkSweepGC</string>
         <string>-XX:+CMSParallelRemarkEnabled</string>
         <string>-XX:SurvivorRatio=8</string>
         <string>-XX:MaxTenuringThreshold=1</string>
         <string>-XX:CMSInitiatingOccupancyFraction=75</string>
         <string>-XX:+UseCMSInitiatingOccupancyOnly</string>
         <string>-XX:CMSWaitDuration=10000</string>
         <string>-XX:+CMSParallelInitialMarkEnabled</string>
         <string>-XX:+CMSEdenChunksRecordAlways</string>
 
         <string>--add-exports java.base/jdk.internal.misc=ALL-UNNAMED</string>
         <string>--add-exports java.base/jdk.internal.ref=ALL-UNNAMED</string>
         <string>--add-exports java.base/sun.nio.ch=ALL-UNNAMED</string>
         <string>--add-exports java.management.rmi/com.sun.jmx.remote.internal.rmi=ALL-UNNAMED</string>
         <string>--add-exports java.rmi/sun.rmi.registry=ALL-UNNAMED</string>
         <string>--add-exports java.rmi/sun.rmi.server=ALL-UNNAMED</string>
+        <string>--add-exports java.rmi/sun.rmi.transport=ALL-UNNAMED</string>
+        <string>--add-exports java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED</string>
         <string>--add-exports java.sql/java.sql=ALL-UNNAMED</string>
 
         <string>--add-opens java.base/java.lang.module=ALL-UNNAMED</string>
         <string>--add-opens java.base/java.net=ALL-UNNAMED</string>
         <string>--add-opens java.base/jdk.internal.loader=ALL-UNNAMED</string>
         <string>--add-opens java.base/jdk.internal.ref=ALL-UNNAMED</string>
         <string>--add-opens java.base/jdk.internal.reflect=ALL-UNNAMED</string>
         <string>--add-opens java.base/jdk.internal.math=ALL-UNNAMED</string>
         <string>--add-opens java.base/jdk.internal.module=ALL-UNNAMED</string>
         <string>--add-opens java.base/jdk.internal.util.jar=ALL-UNNAMED</string>
         <string>--add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED</string>
+
     </resources>
     <pathconvert property="_jvm_args_concat" refid="_jvm11_arg_items" pathsep=" "/>
     <condition property="java11-jvmargs" value="${_jvm_args_concat}" else="">
         <not>
             <equals arg1="${ant.java.version}" arg2="1.8"/>
         </not>
     </condition>
 
     <!--
       JVM arguments for tests.
 
       There is a race condition bug in java 11 (see CASSANDRA-15981) which causes a crash of the
       JVM; this race is between CMS and class unloading.  In java 8 we can cap the metaspace to
       make tests stable on low resource environments, but in java 11 we need to make it unlimited
       (don't define MaxMetaspaceSize) and disable class unloading in CMS outside of a
       stop-the-world pause.
 
       In java 11 we also need to set a system property to enable netty to use Unsafe direct byte
       buffer construction (see CASSANDRA-16493)
     -->
     <resources id="_jvm8_test_arg_items">
       <!-- TODO see CASSANDRA-16212 - we seem to OOM non stop now after CASSANDRA-16212, so to have clean CI while this gets looked into, disabling limiting metaspace
         <string>-XX:MaxMetaspaceExpansion=64M</string>
         <string>-XX:MaxMetaspaceSize=512M</string>
         <string>-XX:MetaspaceSize=128M</string>
       -->
     </resources>
     <pathconvert property="_jvm8_test_arg_items_concat" refid="_jvm8_test_arg_items" pathsep=" "/>
     <resources id="_jvm11_test_arg_items">
         <string>-XX:-CMSClassUnloadingEnabled</string>
         <string>-Dio.netty.tryReflectionSetAccessible=true</string>
     </resources>
     <pathconvert property="_jvm11_test_arg_items_concat" refid="_jvm11_test_arg_items" pathsep=" "/>
-    <condition property="test-jvmargs" value="${_jvm11_test_arg_items_concat}" else="${_jvm8_test_arg_items_concat}">
+    <condition property="_std-test-jvmargs" value="${_jvm11_test_arg_items_concat}" else="${_jvm8_test_arg_items_concat}">
         <not>
             <equals arg1="${ant.java.version}" arg2="1.8"/>
         </not>
     </condition>
 
     <!-- needed to compile org.apache.cassandra.utils.JMXServerUtils -->
-    <condition property="jdk11-javac-exports" value="--add-exports java.rmi/sun.rmi.registry=ALL-UNNAMED" else="">
+    <condition property="jdk11-javac-exports" value="--add-exports java.rmi/sun.rmi.registry=ALL-UNNAMED --add-exports java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED" else="">
         <not>
             <equals arg1="${ant.java.version}" arg2="1.8"/>
         </not>
     </condition>
     <condition property="jdk11-javadoc-exports" value="${jdk11-javac-exports} --frames" else="">
         <not>
             <equals arg1="${ant.java.version}" arg2="1.8"/>
         </not>
     </condition>
 
     <condition property="build.java.11">
         <istrue value="${use.jdk11}"/>
     </condition>
 
     <condition property="source.version" value="8" else="11">
         <equals arg1="${java.version.8}" arg2="true"/>
     </condition>
     <condition property="target.version" value="8" else="11">
         <equals arg1="${java.version.8}" arg2="true"/>
     </condition>
 
     <!--
          Add all the dependencies.
     -->
     <path id="maven-ant-tasks.classpath" path="${build.dir}/maven-ant-tasks-${maven-ant-tasks.version}.jar" />
     <path id="cassandra.classpath">
         <pathelement location="${build.classes.main}" />
         <fileset dir="${build.dir.lib}">
             <include name="**/*.jar" />
         </fileset>
     </path>
     <path id="cassandra.classpath.test">
         <file file="${build.dir}/${final.name}.jar"/> <!-- we need the jar for tests and benchmarks (multi-version jar) -->
         <fileset dir="${build.dir.lib}">
             <include name="**/*.jar" />
         </fileset>
         <fileset dir="${test.lib}/jars">
             <include name="**/*.jar" />
             <exclude name="**/ant-*.jar"/>
         </fileset>
     </path>
 
   <macrodef name="create-javadoc">
     <attribute name="destdir"/>
     <element name="filesets"/>
     <sequential>
       <javadoc destdir="@{destdir}" author="true" version="true" use="true"
         windowtitle="${ant.project.name} API" classpathref="cassandra.classpath"
-        bottom="Copyright &amp;copy; 2009-2022 The Apache Software Foundation"
+        bottom="Copyright &amp;copy; 2009- The Apache Software Foundation"
         useexternalfile="yes" encoding="UTF-8" failonerror="false"
-        maxmemory="256m" additionalparam="${jdk11-javadoc-exports}">
+        maxmemory="1024m" additionalparam="${jdk11-javadoc-exports}">
         <filesets/>
       </javadoc>
       <fail message="javadoc failed">
         <condition>
             <not>
                 <available file="@{destdir}/index-all.html" />
             </not>
         </condition>
       </fail>
     </sequential>
   </macrodef>
 
     <target name="validate-build-conf">
         <condition property="use-jdk11">
             <or>
                 <isset property="build.java.11"/>
                 <istrue value="${env.CASSANDRA_USE_JDK11}"/>
             </or>
         </condition>
         <fail message="Inconsistent JDK11 options set">
             <condition>
                     <and>
                         <istrue value="${env.CASSANDRA_USE_JDK11}"/>
                         <isset property="use.jdk11"/>
                         <not>
                             <istrue value="${use.jdk11}"/>
                         </not>
                     </and>
             </condition>
                 </fail>
         <fail message="Inconsistent JDK11 options set">
             <condition>
                     <and>
                         <isset property="env.CASSANDRA_USE_JDK11"/>
                         <not>
                             <istrue value="${env.CASSANDRA_USE_JDK11}"/>
                         </not>
                         <istrue value="${use.jdk11}"/>
                     </and>
             </condition>
         </fail>
         <fail message="-Duse.jdk11=true or $CASSANDRA_USE_JDK11=true cannot be set when building from java 8">
             <condition>
                 <not><or>
                     <not><isset property="java.version.8"/></not>
                     <not><isset property="use-jdk11"/></not>
                 </or></not>
             </condition>
         </fail>
         <fail message="-Duse.jdk11=true or $CASSANDRA_USE_JDK11=true must be set when building from java 11">
             <condition>
                 <not><or>
                     <isset property="java.version.8"/>
                     <isset property="use-jdk11"/>
                 </or></not>
             </condition>
         </fail>
     </target>
 
     <!--
         Setup the output directories.
     -->
     <target name="init" depends="validate-build-conf">
         <fail unless="is.source.artifact"
             message="Not a source artifact, stopping here." />
         <mkdir dir="${build.classes.main}"/>
         <mkdir dir="${test.lib}"/>
         <mkdir dir="${test.classes}"/>
         <mkdir dir="${stress.test.classes}"/>
         <mkdir dir="${fqltool.test.classes}"/>
         <mkdir dir="${build.src.gen-java}"/>
         <mkdir dir="${build.dir.lib}"/>
         <mkdir dir="${jacoco.export.dir}"/>
         <mkdir dir="${jacoco.partials.dir}"/>
     </target>
 
     <target name="clean" description="Remove all locally created artifacts">
         <delete dir="${build.test.dir}" />
+        <delete dir="${build.dir}/tmp" />
         <delete dir="${build.classes}" />
         <delete dir="${build.src.gen-java}" />
         <delete dir="${version.properties.dir}" />
         <delete dir="${jacoco.export.dir}" />
         <delete dir="${jacoco.partials.dir}"/>
     </target>
     <target depends="clean" name="cleanall"/>
 
     <target name="realclean" depends="clean" description="Remove the entire build directory and all downloaded artifacts">
         <delete>
-          <fileset dir="${build.lib}" excludes="cassandra-driver-internal-only-*"/>
+          <fileset dir="${build.lib}" excludes="cassandra-driver-internal-only-*,puresasl-internal-only-*"/>
         </delete>
         <delete dir="${build.dir}" />
         <delete dir="${doc.dir}/build" />
         <delete dir="${doc.dir}/source/tools/nodetool" />
     </target>
 
     <!--
        This generates the CQL grammar files from Cql.g
     -->
     <target name="check-gen-cql3-grammar">
         <uptodate property="cql3current"
                 targetfile="${build.src.gen-java}/org/apache/cassandra/cql3/Cql.tokens">
             <srcfiles dir="${build.src.antlr}">
                 <include name="*.g"/>
             </srcfiles>
         </uptodate>
     </target>
 
     <target name="gen-cql3-grammar" depends="check-gen-cql3-grammar" unless="cql3current">
       <echo>Building Grammar ${build.src.antlr}/Cql.g  ...</echo>
       <java classname="org.antlr.Tool"
             classpathref="cql3-grammar.classpath"
             failonerror="true">
          <arg value="-Xconversiontimeout" />
          <arg value="10000" />
          <arg value="${build.src.antlr}/Cql.g" />
          <arg value="-fo" />
          <arg value="${build.src.gen-java}/org/apache/cassandra/cql3/" />
          <arg value="-Xmaxinlinedfastates"/>
          <arg value="10"/> <!-- default is 60 -->
       </java>
     </target>
 
     <target name="generate-cql-html" depends="resolver-init" description="Generate HTML from textile source">
         <taskdef classpathref="wikitext.classpath" resource="wikitexttasks.properties" />
         <wikitext-to-html markupLanguage="Textile">
             <fileset dir="${basedir}">
                 <include name="doc/cql3/*.textile"/>
             </fileset>
         </wikitext-to-html>
     </target>
 
     <target name="gen-asciidoc" description="Generate dynamic asciidoc pages" depends="jar" unless="ant.gen-doc.skip">
         <exec executable="make" osfamily="unix" dir="${doc.dir}">
             <arg value="gen-asciidoc"/>
         </exec>
     </target>
 
     <target name="gen-doc" description="Generate documentation" depends="gen-asciidoc,generate-cql-html" unless="ant.gen-doc.skip">
         <exec executable="make" osfamily="unix" dir="${doc.dir}">
             <arg value="html"/>
         </exec>
     </target>
 
     <!--
         Generates Java sources for tokenization support from jflex
         grammar files
     -->
     <target name="generate-jflex-java" description="Generate Java from jflex grammar">
         <taskdef classname="jflex.anttask.JFlexTask" classpathref="jflex.classpath" name="jflex" />
         <jflex file="${build.src.java}/org/apache/cassandra/index/sasi/analyzer/StandardTokenizerImpl.jflex" destdir="${build.src.gen-java}/" />
     </target>
 
     <!--
        Fetch Maven Ant Tasks and Cassandra's dependencies
        These targets are intentionally free of dependencies so that they
        can be run stand-alone from a binary release artifact.
     -->
     <target name="maven-ant-tasks-localrepo" unless="maven-ant-tasks.jar.exists" if="maven-ant-tasks.jar.local"
             depends="init" description="Fetch Maven ANT Tasks from Maven Local Repository">
       <copy file="${maven-ant-tasks.local}/${maven-ant-tasks.version}/maven-ant-tasks-${maven-ant-tasks.version}.jar"
            tofile="${build.dir}/maven-ant-tasks-${maven-ant-tasks.version}.jar"/>
       <property name="maven-ant-tasks.jar.exists" value="true"/>
     </target>
 
     <target name="maven-ant-tasks-download" depends="init,maven-ant-tasks-localrepo" unless="maven-ant-tasks.jar.exists"
             description="Fetch Maven ANT Tasks from Maven Central Repositroy">
       <echo>Downloading Maven ANT Tasks...</echo>
       <get src="${maven-ant-tasks.url}/${maven-ant-tasks.version}/maven-ant-tasks-${maven-ant-tasks.version}.jar"
            dest="${build.dir}/maven-ant-tasks-${maven-ant-tasks.version}.jar" usetimestamp="true" />
       <copy file="${build.dir}/maven-ant-tasks-${maven-ant-tasks.version}.jar"
             tofile="${maven-ant-tasks.local}/${maven-ant-tasks.version}/maven-ant-tasks-${maven-ant-tasks.version}.jar"/>
     </target>
 
     <target name="maven-ant-tasks-init" depends="maven-ant-tasks-download,resolver-init" unless="maven-ant-tasks.initialized"
             description="Initialize Maven ANT Tasks">
       <typedef uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" />
       <property name="maven-ant-tasks.initialized" value="true"/>
     </target>
 
     <!-- this task defines the dependencies that will be fetched by Maven ANT Tasks
          the dependencies are re-used for publishing artifacts to Maven Central
          in order to keep everything consistent -->
     <target name="maven-declare-dependencies" depends="maven-ant-tasks-init"
             description="Define dependencies and dependency versions">
       <!-- The parent pom defines the versions of all dependencies -->
       <artifact:pom id="parent-pom"
                     groupId="org.apache.cassandra"
                     artifactId="cassandra-parent"
                     packaging="pom"
                     version="${version}"
                     url="https://cassandra.apache.org"
                     name="Apache Cassandra"
                     inceptionYear="2009"
                     description="The Apache Cassandra Project develops a highly scalable second-generation distributed database, bringing together Dynamo's fully distributed design and Bigtable's ColumnFamily-based data model.">
 
         <!-- Inherit from the ASF template pom file, ref http://maven.apache.org/pom/asf/ -->
         <parent groupId="org.apache" artifactId="apache" version="22"/>
         <license name="The Apache Software License, Version 2.0" url="https://www.apache.org/licenses/LICENSE-2.0.txt"/>
         <scm connection="${scm.connection}" developerConnection="${scm.developerConnection}" url="${scm.url}"/>
         <dependencyManagement>
-          <dependency groupId="org.xerial.snappy" artifactId="snappy-java" version="1.1.2.6"/>
-          <dependency groupId="org.lz4" artifactId="lz4-java" version="1.8.0"/>
-          <dependency groupId="com.ning" artifactId="compress-lzf" version="0.8.4" scope="provided"/>
-          <dependency groupId="com.github.luben" artifactId="zstd-jni" version="1.5.0-4"/>
+          <dependency groupId="org.xerial.snappy" artifactId="snappy-java" version="1.1.10.4"/>
+          <dependency groupId="at.yawk.lz4" artifactId="lz4-java" version="1.10.1"/>
+          <dependency groupId="com.github.luben" artifactId="zstd-jni" version="1.5.7-2"/>
           <dependency groupId="com.google.guava" artifactId="guava" version="27.0-jre">
             <exclusion groupId="com.google.code.findbugs" artifactId="jsr305" />
             <exclusion groupId="org.codehaus.mojo" artifactId="animal-sniffer-annotations" />
             <exclusion groupId="com.google.guava" artifactId="listenablefuture" />
             <exclusion groupId="com.google.guava" artifactId="failureaccess" />
             <exclusion groupId="org.checkerframework" artifactId="checker-qual" />
             <exclusion groupId="com.google.errorprone" artifactId="error_prone_annotations" />
           </dependency>
-          <dependency groupId="org.hdrhistogram" artifactId="HdrHistogram" version="2.1.9"/>
+          <dependency groupId="com.google.jimfs" artifactId="jimfs" version="1.1"/>
+          <dependency groupId="org.hdrhistogram" artifactId="HdrHistogram" version="2.1.12"/>
           <dependency groupId="commons-cli" artifactId="commons-cli" version="1.1"/>
           <dependency groupId="commons-codec" artifactId="commons-codec" version="1.9"/>
-          <dependency groupId="commons-io" artifactId="commons-io" version="2.6" scope="test"/>
-          <dependency groupId="org.apache.commons" artifactId="commons-lang3" version="3.11"/>
+          <dependency groupId="commons-io" artifactId="commons-io" version="2.6"/>
+          <dependency groupId="org.apache.commons" artifactId="commons-lang3" version="3.18.0"/>
           <dependency groupId="org.apache.commons" artifactId="commons-math3" version="3.2"/>
           <dependency groupId="org.antlr" artifactId="antlr" version="3.5.2" scope="provided">
             <exclusion groupId="org.antlr" artifactId="stringtemplate"/>
           </dependency>
           <dependency groupId="org.antlr" artifactId="ST4" version="4.0.8"/>
           <dependency groupId="org.antlr" artifactId="antlr-runtime" version="3.5.2">
             <exclusion groupId="org.antlr" artifactId="stringtemplate"/>
           </dependency>
           <dependency groupId="org.slf4j" artifactId="slf4j-api" version="1.7.25"/>
           <dependency groupId="org.slf4j" artifactId="log4j-over-slf4j" version="1.7.25"/>
           <dependency groupId="org.slf4j" artifactId="jcl-over-slf4j" version="1.7.25" />
           <dependency groupId="ch.qos.logback" artifactId="logback-core" version="1.2.9"/>
           <dependency groupId="ch.qos.logback" artifactId="logback-classic" version="1.2.9"/>
-          <dependency groupId="com.fasterxml.jackson.core" artifactId="jackson-core" version="2.13.2"/>
-          <dependency groupId="com.fasterxml.jackson.core" artifactId="jackson-databind" version="2.13.2.2"/>
-          <dependency groupId="com.fasterxml.jackson.core" artifactId="jackson-annotations" version="2.13.2"/>
+          <dependency groupId="com.fasterxml.jackson.core" artifactId="jackson-core" version="2.19.2"/>
+          <dependency groupId="com.fasterxml.jackson.core" artifactId="jackson-databind" version="2.19.2"/>
+          <dependency groupId="com.fasterxml.jackson.core" artifactId="jackson-annotations" version="2.19.2"/>
+          <dependency groupId="com.fasterxml.jackson.datatype" artifactId="jackson-datatype-jsr310" version="2.19.2"/>
+          <dependency groupId="com.fasterxml.jackson.dataformat" artifactId="jackson-dataformat-yaml" version="2.13.2"  scope="test">
+            <!-- CASSANDRA-20848 2.19.x would bring snakeyaml 2.4 which is for now incompatible with rest of the codebase -->
+            <exclusion groupId="org.yaml" artifactId="snakeyaml"/>
+          </dependency>
           <dependency groupId="com.googlecode.json-simple" artifactId="json-simple" version="1.1"/>
           <dependency groupId="com.boundary" artifactId="high-scale-lib" version="1.0.6"/>
           <dependency groupId="com.github.jbellis" artifactId="jamm" version="${jamm.version}"/>
           <dependency groupId="org.yaml" artifactId="snakeyaml" version="1.26"/>
           <dependency groupId="junit" artifactId="junit" version="4.12" scope="test">
             <exclusion groupId="org.hamcrest" artifactId="hamcrest-core"/>
           </dependency>
           <dependency groupId="org.mockito" artifactId="mockito-core" version="3.2.4" scope="test"/>
           <dependency groupId="org.quicktheories" artifactId="quicktheories" version="0.26" scope="test"/>
           <dependency groupId="com.google.code.java-allocation-instrumenter" artifactId="java-allocation-instrumenter" version="${allocation-instrumenter.version}" scope="test">
             <exclusion groupId="com.google.guava" artifactId="guava"/>
           </dependency>
-          <dependency groupId="org.apache.cassandra" artifactId="dtest-api" version="0.0.13" scope="test"/>
+          <dependency groupId="org.apache.cassandra" artifactId="harry-core" version="0.0.1" scope="test"/>
           <dependency groupId="org.reflections" artifactId="reflections" version="0.10.2" scope="test"/>
+          <dependency groupId="org.apache.cassandra" artifactId="dtest-api" version="${dtest-api.version}" scope="test"/>
+          <dependency groupId="com.puppycrawl.tools" artifactId="checkstyle" version="8.40" scope="test"/>
           <dependency groupId="org.apache.hadoop" artifactId="hadoop-core" version="1.0.3" scope="provided">
             <exclusion groupId="org.mortbay.jetty" artifactId="servlet-api"/>
             <exclusion groupId="commons-logging" artifactId="commons-logging"/>
+            <exclusion groupId="commons-lang" artifactId="commons-lang"/>
             <exclusion groupId="org.eclipse.jdt" artifactId="core"/>
             <exclusion groupId="ant" artifactId="ant"/>
             <exclusion groupId="junit" artifactId="junit"/>
             <exclusion groupId="org.codehaus.jackson" artifactId="jackson-mapper-asl"/>
             <exclusion groupId="org.slf4j" artifactId="slf4j-api"/>
           </dependency>
           <dependency groupId="org.apache.hadoop" artifactId="hadoop-minicluster" version="1.0.3" scope="provided">
             <exclusion groupId="asm" artifactId="asm"/> <!-- this is the outdated version 3.1 -->
-            <exclusion groupId="org.slf4j" artifactId="slf4j-api"/>
             <exclusion groupId="org.codehaus.jackson" artifactId="jackson-mapper-asl"/>
+            <exclusion groupId="org.slf4j" artifactId="slf4j-api"/>
           </dependency>
-          <dependency groupId="net.java.dev.jna" artifactId="jna" version="5.6.0"/>
+          <dependency groupId="net.java.dev.jna" artifactId="jna" version="5.9.0"/>
 
           <dependency groupId="org.jacoco" artifactId="org.jacoco.agent" version="${jacoco.version}" scope="test"/>
-          <dependency groupId="org.jacoco" artifactId="org.jacoco.ant" version="${jacoco.version}" scope="test"/>
+          <dependency groupId="org.jacoco" artifactId="org.jacoco.ant" version="${jacoco.version}" scope="test">
+            <exclusion groupId="org.ow2.asm" artifactId="asm"/>
+          </dependency>
 
+          <!-- these dependencies have to be of provided scope as they are used by cassandra-dtests and ccm is looking
+               for these libraries in build/lib/jars -->
           <dependency groupId="org.jboss.byteman" artifactId="byteman-install" version="${byteman.version}" scope="provided"/>
           <dependency groupId="org.jboss.byteman" artifactId="byteman" version="${byteman.version}" scope="provided"/>
           <dependency groupId="org.jboss.byteman" artifactId="byteman-submit" version="${byteman.version}" scope="provided"/>
           <dependency groupId="org.jboss.byteman" artifactId="byteman-bmunit" version="${byteman.version}" scope="provided"/>
 
-          <dependency groupId="net.bytebuddy" artifactId="byte-buddy" version="${bytebuddy.version}" />
-          <dependency groupId="net.bytebuddy" artifactId="byte-buddy-agent" version="${bytebuddy.version}" />
+          <dependency groupId="net.bytebuddy" artifactId="byte-buddy" version="${bytebuddy.version}" scope="test"/>
+          <dependency groupId="net.bytebuddy" artifactId="byte-buddy-agent" version="${bytebuddy.version}" scope="test"/>
 
-          <dependency groupId="org.openjdk.jmh" artifactId="jmh-core" version="1.21" scope="test"/>
-          <dependency groupId="org.openjdk.jmh" artifactId="jmh-generator-annprocess" version="1.21" scope="test"/>
+          <dependency groupId="org.openjdk.jmh" artifactId="jmh-core" version="1.37" scope="test"/>
+          <dependency groupId="org.openjdk.jmh" artifactId="jmh-generator-annprocess" version="1.37" scope="test"/>
 
           <dependency groupId="org.apache.ant" artifactId="ant-junit" version="1.10.12" scope="test"/>
 
           <dependency groupId="org.apache.cassandra" artifactId="cassandra-all" version="${version}" />
           <dependency groupId="io.dropwizard.metrics" artifactId="metrics-core" version="3.1.5" />
           <dependency groupId="io.dropwizard.metrics" artifactId="metrics-jvm" version="3.1.5" />
           <dependency groupId="io.dropwizard.metrics" artifactId="metrics-logback" version="3.1.5" />
           <dependency groupId="com.addthis.metrics" artifactId="reporter-config3" version="3.0.3">
             <exclusion groupId="org.hibernate" artifactId="hibernate-validator" />
            </dependency>
           <dependency groupId="org.mindrot" artifactId="jbcrypt" version="0.4" />
           <dependency groupId="io.airlift" artifactId="airline" version="0.8">
             <exclusion groupId="com.google.code.findbugs" artifactId="jsr305" />
            </dependency>
           <dependency groupId="io.netty" artifactId="netty-bom" version="4.1.58.Final" type="pom" scope="provided"/>
           <dependency groupId="io.netty" artifactId="netty-all" version="4.1.58.Final" />
           <dependency groupId="io.netty" artifactId="netty-tcnative-boringssl-static" version="2.0.36.Final"/>
           <dependency groupId="net.openhft" artifactId="chronicle-queue" version="${chronicle-queue.version}">
             <exclusion groupId="com.sun" artifactId="tools" />
           </dependency>
           <dependency groupId="net.openhft" artifactId="chronicle-core" version="${chronicle-core.version}">
             <exclusion groupId="net.openhft" artifactId="chronicle-analytics" />
             <exclusion groupId="org.jetbrains" artifactId="annotations" />
           </dependency>
           <dependency groupId="net.openhft" artifactId="chronicle-bytes" version="${chronicle-bytes.version}">
             <exclusion groupId="org.jetbrains" artifactId="annotations" />
           </dependency>
           <dependency groupId="net.openhft" artifactId="chronicle-wire" version="${chronicle-wire.version}">
             <exclusion groupId="net.openhft" artifactId="compiler" />
           </dependency>
           <dependency groupId="net.openhft" artifactId="chronicle-threads" version="${chronicle-threads.version}">
             <exclusion groupId="net.openhft" artifactId="affinity" />
             <!-- Exclude JNA here, as we want to avoid breaking consumers of the cassandra-all jar -->
             <exclusion groupId="net.java.dev.jna" artifactId="jna" />
             <exclusion groupId="net.java.dev.jna" artifactId="jna-platform" />
           </dependency>
-          <dependency groupId="com.google.code.findbugs" artifactId="jsr305" version="2.0.2" scope="provided"/>
+          <dependency groupId="com.google.code.findbugs" artifactId="jsr305" version="2.0.2"/>
           <dependency groupId="com.clearspring.analytics" artifactId="stream" version="2.5.2">
             <exclusion groupId="it.unimi.dsi" artifactId="fastutil" />
           </dependency>
-          <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" version="3.11.0" classifier="shaded">
+          <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" version="3.11.5" classifier="shaded">
             <exclusion groupId="io.netty" artifactId="netty-buffer"/>
             <exclusion groupId="io.netty" artifactId="netty-codec"/>
             <exclusion groupId="io.netty" artifactId="netty-handler"/>
             <exclusion groupId="io.netty" artifactId="netty-transport"/>
             <exclusion groupId="org.slf4j" artifactId="slf4j-api"/>
             <exclusion groupId="com.github.jnr" artifactId="jnr-ffi"/>
             <exclusion groupId="com.github.jnr" artifactId="jnr-posix"/>
           </dependency>
           <dependency groupId="org.eclipse.jdt.core.compiler" artifactId="ecj" version="${ecj.version}" />
           <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core" version="${ohc.version}">
             <exclusion groupId="org.slf4j" artifactId="slf4j-api"/>
           </dependency>
           <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core-j8" version="${ohc.version}" />
           <dependency groupId="net.ju-n.compile-command-annotations" artifactId="compile-command-annotations" version="1.2.0" scope="provided"/>
           <dependency groupId="org.fusesource" artifactId="sigar" version="1.6.4">
             <exclusion groupId="log4j" artifactId="log4j"/>
           </dependency>
           <dependency groupId="com.carrotsearch" artifactId="hppc" version="0.8.1" />
           <dependency groupId="de.jflex" artifactId="jflex" version="${jflex.version}">
             <exclusion groupId="org.apache.ant" artifactId="ant"/>
           </dependency>
           <dependency groupId="com.github.rholder" artifactId="snowball-stemmer" version="1.3.0.581.1" />
           <dependency groupId="com.googlecode.concurrent-trees" artifactId="concurrent-trees" version="2.4.0" />
-          <dependency groupId="com.github.ben-manes.caffeine" artifactId="caffeine" version="2.5.6" />
+          <dependency groupId="com.github.ben-manes.caffeine" artifactId="caffeine" version="2.9.2" />
           <dependency groupId="org.jctools" artifactId="jctools-core" version="3.1.0"/>
           <dependency groupId="org.ow2.asm" artifactId="asm" version="${asm.version}"/>
           <dependency groupId="org.ow2.asm" artifactId="asm-tree" version="${asm.version}" scope="test"/>
           <dependency groupId="org.ow2.asm" artifactId="asm-commons" version="${asm.version}" scope="test"/>
+          <dependency groupId="org.ow2.asm" artifactId="asm-util" version="${asm.version}" scope="test"/>
           <dependency groupId="org.gridkit.jvmtool" artifactId="sjk-cli" version="0.14"/>
           <dependency groupId="org.gridkit.jvmtool" artifactId="sjk-core" version="0.14">
             <exclusion groupId="org.gridkit.jvmtool" artifactId="sjk-hflame"/>
             <exclusion groupId="org.perfkit.sjk.parsers" artifactId="sjk-hflame"/>
             <exclusion groupId="org.perfkit.sjk.parsers" artifactId="sjk-jfr-standalone"/>
             <exclusion groupId="org.perfkit.sjk.parsers" artifactId="sjk-nps"/>
             <exclusion groupId="org.perfkit.sjk.parsers" artifactId="sjk-jfr5"/>
             <exclusion groupId="org.perfkit.sjk.parsers" artifactId="sjk-jfr6"/>
           </dependency>
           <dependency groupId="org.gridkit.jvmtool" artifactId="sjk-stacktrace" version="0.14"/>
           <dependency groupId="org.gridkit.jvmtool" artifactId="mxdump" version="0.14"/>
           <dependency groupId="org.gridkit.lab" artifactId="jvm-attach-api" version="1.5"/>
           <dependency groupId="org.gridkit.jvmtool" artifactId="sjk-json" version="0.14"/>
           <dependency groupId="com.beust" artifactId="jcommander" version="1.30"/>
           <dependency groupId="org.psjava" artifactId="psjava" version="0.1.19"/>
           <dependency groupId="javax.inject" artifactId="javax.inject" version="1"/>
           <dependency groupId="com.google.j2objc" artifactId="j2objc-annotations" version="1.3"/>
           <!-- adding this dependency is necessary for assertj. When updating assertj, need to also update the version of
              this that the new assertj's `assertj-parent-pom` depends on. -->
-          <dependency groupId="org.junit" artifactId="junit-bom" version="5.6.0" type="pom" scope="test"/>
+          <dependency groupId="org.junit" artifactId="junit-bom" version="5.10.1" type="pom" scope="test"/>
           <!-- when updating assertj, make sure to also update the corresponding junit-bom dependency -->
-          <dependency groupId="org.assertj" artifactId="assertj-core" version="3.15.0" scope="provided"/>
+          <dependency groupId="org.assertj" artifactId="assertj-core" version="3.25.3" scope="test"/>
           <dependency groupId="org.awaitility" artifactId="awaitility" version="4.0.3"  scope="test">
             <exclusion groupId="org.hamcrest" artifactId="hamcrest"/>
           </dependency>
           <dependency groupId="org.hamcrest" artifactId="hamcrest" version="2.2" scope="test"/>
+          <dependency groupId="com.github.seancfoley" artifactId="ipaddress" version="5.3.3" />
         </dependencyManagement>
         <developer id="adelapena" name="Andres de la Peña"/>
         <developer id="alakshman" name="Avinash Lakshman"/>
         <developer id="aleksey" name="Aleksey Yeschenko"/>
         <developer id="amorton" name="Aaron Morton"/>
         <developer id="aweisberg" name="Ariel Weisberg"/>
         <developer id="bdeggleston" name="Blake Eggleston"/>
         <developer id="benedict" name="Benedict Elliott Smith"/>
         <developer id="benjamin" name="Benjamin Lerer"/>
         <developer id="blambov" name="Branimir Lambov"/>
         <developer id="brandonwilliams" name="Brandon Williams"/>
         <developer id="carl" name="Carl Yeksigian"/>
         <developer id="dbrosius" name="David Brosiusd"/>
         <developer id="dikang" name="Dikang Gu"/>
         <developer id="eevans" name="Eric Evans"/>
         <developer id="edimitrova" name="Ekaterina Dimitrova"/>
         <developer id="gdusbabek" name="Gary Dusbabek"/>
         <developer id="goffinet" name="Chris Goffinet"/>
         <developer id="ifesdjeen" name="Alex Petrov"/>
         <developer id="jaakko" name="Laine Jaakko Olavi"/>
         <developer id="jake" name="T Jake Luciani"/>
         <developer id="jasonbrown" name="Jason Brown"/>
         <developer id="jbellis" name="Jonathan Ellis"/>
         <developer id="jfarrell" name="Jake Farrell"/>
         <developer id="jjirsa" name="Jeff Jirsa"/>
         <developer id="jkni" name="Joel Knighton"/>
         <developer id="jmckenzie" name="Josh McKenzie"/>
         <developer id="johan" name="Johan Oskarsson"/>
         <developer id="junrao" name="Jun Rao"/>
         <developer id="jzhuang" name="Jay Zhuang"/>
         <developer id="kohlisankalp" name="Sankalp Kohli"/>
         <developer id="marcuse" name="Marcus Eriksson"/>
         <developer id="mck" name="Michael Semb Wever"/>
         <developer id="mishail" name="Mikhail Stepura"/>
         <developer id="mshuler" name="Michael Shuler"/>
         <developer id="paulo" name="Paulo Motta"/>
         <developer id="pmalik" name="Prashant Malik"/>
         <developer id="rstupp" name="Robert Stupp"/>
         <developer id="scode" name="Peter Schuller"/>
         <developer id="beobal" name="Sam Tunnicliffe"/>
         <developer id="slebresne" name="Sylvain Lebresne"/>
         <developer id="stefania" name="Stefania Alborghetti"/>
         <developer id="tylerhobbs" name="Tyler Hobbs"/>
         <developer id="vijay" name="Vijay Parthasarathy"/>
         <developer id="xedin" name="Pavel Yaskevich"/>
         <developer id="yukim" name="Yuki Morishita"/>
         <developer id="zznate" name="Nate McCall"/>
       </artifact:pom>
 
       <!-- each dependency set then defines the subset of the dependencies for that dependency set -->
       <artifact:pom id="build-deps-pom"
                     artifactId="cassandra-build-deps">
         <parent groupId="org.apache.cassandra"
                 artifactId="cassandra-parent"
                 version="${version}"
                 relativePath="${final.name}-parent.pom"/>
-        <dependency groupId="junit" artifactId="junit"/>
-        <dependency groupId="commons-io" artifactId="commons-io"/>
-        <dependency groupId="org.mockito" artifactId="mockito-core"/>
-        <dependency groupId="org.quicktheories" artifactId="quicktheories"/>
-        <dependency groupId="org.reflections" artifactId="reflections"/>
-        <dependency groupId="com.google.code.java-allocation-instrumenter" artifactId="java-allocation-instrumenter" version="${allocation-instrumenter.version}"/>
-        <dependency groupId="org.apache.cassandra" artifactId="dtest-api"/>
-        <dependency groupId="org.openjdk.jmh" artifactId="jmh-core"/>
-        <dependency groupId="org.openjdk.jmh" artifactId="jmh-generator-annprocess"/>
-        <dependency groupId="org.apache.ant" artifactId="ant-junit"/>
+        <dependency groupId="junit" artifactId="junit" scope="test"/>
+        <dependency groupId="org.assertj" artifactId="assertj-core" scope="test"/>
+        <dependency groupId="commons-io" artifactId="commons-io" scope="test"/>
+        <dependency groupId="org.mockito" artifactId="mockito-core" scope="test"/>
+        <dependency groupId="org.ow2.asm" artifactId="asm" version="${asm.version}"/>
+        <dependency groupId="org.ow2.asm" artifactId="asm-tree" version="${asm.version}" scope="test"/>
+        <dependency groupId="org.ow2.asm" artifactId="asm-commons" version="${asm.version}" scope="test"/>
+        <dependency groupId="org.ow2.asm" artifactId="asm-util" version="${asm.version}" scope="test"/>
+        <dependency groupId="com.google.jimfs" artifactId="jimfs" version="1.1" scope="test"/>
+        <dependency groupId="com.puppycrawl.tools" artifactId="checkstyle" scope="test"/>
+        <dependency groupId="org.quicktheories" artifactId="quicktheories" scope="test"/>
+        <dependency groupId="org.reflections" artifactId="reflections" scope="test"/>
+        <dependency groupId="com.google.code.java-allocation-instrumenter" artifactId="java-allocation-instrumenter" version="${allocation-instrumenter.version}" scope="test"/>
+        <dependency groupId="org.apache.cassandra" artifactId="dtest-api" scope="test"/>
+        <dependency groupId="org.openjdk.jmh" artifactId="jmh-core" scope="test"/>
+        <dependency groupId="org.openjdk.jmh" artifactId="jmh-generator-annprocess" scope="test"/>
+        <dependency groupId="net.ju-n.compile-command-annotations" artifactId="compile-command-annotations" scope="test"/>
+        <dependency groupId="org.apache.ant" artifactId="ant-junit" scope="test"/>
+        <dependency groupId="org.apache.cassandra" artifactId="harry-core"/>
         <!-- adding this dependency is necessary for assertj. When updating assertj, need to also update the version of
              this that the new assertj's `assertj-parent-pom` depends on. -->
         <dependency groupId="org.junit" artifactId="junit-bom" type="pom"/>
         <dependency groupId="org.awaitility" artifactId="awaitility"/>
         <dependency groupId="org.hamcrest" artifactId="hamcrest"/>
         <!-- coverage debs -->
         <dependency groupId="org.jacoco" artifactId="org.jacoco.agent"/>
         <dependency groupId="org.jacoco" artifactId="org.jacoco.ant"/>
+
+        <dependency groupId="com.fasterxml.jackson.dataformat" artifactId="jackson-dataformat-yaml"/>
       </artifact:pom>
 
       <!-- now the pom's for artifacts being deployed to Maven Central -->
       <artifact:pom id="all-pom"
                     artifactId="cassandra-all"
                     url="https://cassandra.apache.org"
                     name="Apache Cassandra">
         <parent groupId="org.apache.cassandra"
                 artifactId="cassandra-parent"
                 version="${version}"
                 relativePath="${final.name}-parent.pom"/>
         <scm connection="${scm.connection}" developerConnection="${scm.developerConnection}" url="${scm.url}"/>
         <dependency groupId="org.xerial.snappy" artifactId="snappy-java"/>
-        <dependency groupId="org.lz4" artifactId="lz4-java"/>
-        <dependency groupId="com.ning" artifactId="compress-lzf"/>
+        <dependency groupId="at.yawk.lz4" artifactId="lz4-java"/>
         <dependency groupId="com.google.guava" artifactId="guava"/>
         <dependency groupId="commons-cli" artifactId="commons-cli"/>
         <dependency groupId="commons-codec" artifactId="commons-codec"/>
         <dependency groupId="org.apache.commons" artifactId="commons-lang3"/>
         <dependency groupId="org.apache.commons" artifactId="commons-math3"/>
         <dependency groupId="org.antlr" artifactId="antlr" scope="provided"/>
         <dependency groupId="org.antlr" artifactId="ST4"/>
         <dependency groupId="org.antlr" artifactId="antlr-runtime"/>
         <dependency groupId="org.slf4j" artifactId="slf4j-api"/>
         <dependency groupId="org.slf4j" artifactId="log4j-over-slf4j"/>
         <dependency groupId="org.slf4j" artifactId="jcl-over-slf4j"/>
         <dependency groupId="com.fasterxml.jackson.core" artifactId="jackson-core"/>
         <dependency groupId="com.fasterxml.jackson.core" artifactId="jackson-databind"/>
         <dependency groupId="com.fasterxml.jackson.core" artifactId="jackson-annotations"/>
+        <dependency groupId="com.fasterxml.jackson.datatype" artifactId="jackson-datatype-jsr310"/>
         <dependency groupId="com.googlecode.json-simple" artifactId="json-simple"/>
         <dependency groupId="com.boundary" artifactId="high-scale-lib"/>
         <dependency groupId="org.yaml" artifactId="snakeyaml"/>
         <dependency groupId="org.mindrot" artifactId="jbcrypt"/>
         <dependency groupId="io.airlift" artifactId="airline"/>
         <dependency groupId="io.dropwizard.metrics" artifactId="metrics-core"/>
         <dependency groupId="io.dropwizard.metrics" artifactId="metrics-jvm"/>
         <dependency groupId="io.dropwizard.metrics" artifactId="metrics-logback"/>
         <dependency groupId="com.addthis.metrics" artifactId="reporter-config3"/>
         <dependency groupId="com.clearspring.analytics" artifactId="stream"/>
 
         <dependency groupId="ch.qos.logback" artifactId="logback-core"/>
         <dependency groupId="ch.qos.logback" artifactId="logback-classic"/>
 
         <!-- don't need hadoop classes to run, but if you use the hadoop stuff -->
         <dependency groupId="org.apache.hadoop" artifactId="hadoop-core" optional="true"/>
         <dependency groupId="org.apache.hadoop" artifactId="hadoop-minicluster" optional="true"/>
 
         <!-- don't need the Java Driver to run, but if you use the hadoop stuff or UDFs -->
         <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" classifier="shaded" optional="true"/>
           <!-- don't need jna to run, but nice to have -->
         <dependency groupId="net.java.dev.jna" artifactId="jna"/>
 
         <!-- don't need jamm unless running a server in which case it needs to be a -javagent to be used anyway -->
         <dependency groupId="com.github.jbellis" artifactId="jamm"/>
 
         <dependency groupId="io.netty" artifactId="netty-bom"  type="pom"  />
         <dependency groupId="io.netty" artifactId="netty-all"/>
         <dependency groupId="net.openhft" artifactId="chronicle-queue"/>
         <dependency groupId="net.openhft" artifactId="chronicle-core"/>
         <dependency groupId="net.openhft" artifactId="chronicle-bytes"/>
         <dependency groupId="net.openhft" artifactId="chronicle-wire"/>
         <dependency groupId="net.openhft" artifactId="chronicle-threads"/>
         <dependency groupId="org.fusesource" artifactId="sigar"/>
         <dependency groupId="org.eclipse.jdt.core.compiler" artifactId="ecj"/>
         <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core"/>
         <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core-j8"/>
         <dependency groupId="com.github.ben-manes.caffeine" artifactId="caffeine" />
         <dependency groupId="org.jctools" artifactId="jctools-core"/>
         <dependency groupId="org.ow2.asm" artifactId="asm" />
         <dependency groupId="com.carrotsearch" artifactId="hppc" />
         <dependency groupId="org.gridkit.jvmtool" artifactId="sjk-cli" />
         <dependency groupId="org.gridkit.jvmtool" artifactId="sjk-core" />
         <dependency groupId="org.gridkit.jvmtool" artifactId="sjk-stacktrace" />
         <dependency groupId="org.gridkit.jvmtool" artifactId="mxdump" />
         <dependency groupId="org.gridkit.lab" artifactId="jvm-attach-api" />
         <dependency groupId="com.beust" artifactId="jcommander" />
         <dependency groupId="org.gridkit.jvmtool" artifactId="sjk-json"/>
         <dependency groupId="com.github.luben" artifactId="zstd-jni"/>
         <dependency groupId="org.psjava" artifactId="psjava"/>
         <dependency groupId="io.netty" artifactId="netty-tcnative-boringssl-static"/>
         <dependency groupId="javax.inject" artifactId="javax.inject"/>
         <dependency groupId="com.google.j2objc" artifactId="j2objc-annotations"/>
         <dependency groupId="org.hdrhistogram" artifactId="HdrHistogram"/>
 
         <!-- sasi deps -->
-        <dependency groupId="de.jflex" artifactId="jflex" />
         <dependency groupId="com.github.rholder" artifactId="snowball-stemmer" />
         <dependency groupId="com.googlecode.concurrent-trees" artifactId="concurrent-trees" />
 
         <!-- compile tools -->
         <dependency groupId="com.google.code.findbugs" artifactId="jsr305"/>
         <dependency groupId="net.ju-n.compile-command-annotations" artifactId="compile-command-annotations"/>
         <dependency groupId="org.assertj" artifactId="assertj-core"/>
         <dependency groupId="org.jboss.byteman" artifactId="byteman-install"/>
         <dependency groupId="org.jboss.byteman" artifactId="byteman"/>
         <dependency groupId="org.jboss.byteman" artifactId="byteman-submit"/>
         <dependency groupId="org.jboss.byteman" artifactId="byteman-bmunit"/>
+        <dependency groupId="com.github.seancfoley" artifactId="ipaddress" />
       </artifact:pom>
     </target>
 
     <!-- deprecated: legacy compatibility for build scripts in other repositories -->
     <target name="maven-ant-tasks-retrieve-build" depends="resolver-retrieve-build"/>
 
     <target name="echo-base-version">
         <echo message="${base.version}" />
     </target>
 
     <!-- create properties file with C version -->
-    <target name="createVersionPropFile">
+    <target name="createVersionPropFile" depends="set-cqlsh-version">
       <taskdef name="propertyfile" classname="org.apache.tools.ant.taskdefs.optional.PropertyFile"/>
       <mkdir dir="${version.properties.dir}"/>
       <propertyfile file="${version.properties.dir}/version.properties">
         <entry key="CassandraVersion" value="${version}"/>
       </propertyfile>
     </target>
 
     <target name="test-run" depends="jar"
             description="Run in test mode.  Not for production use!">
       <java classname="org.apache.cassandra.service.CassandraDaemon" fork="true">
         <classpath>
           <path refid="cassandra.classpath.test"/>
           <pathelement location="${test.conf}"/>
         </classpath>
         <jvmarg value="-Dstorage-config=${test.conf}"/>
+        <jvmarg value="-Dcassandra.reads.thresholds.coordinator.defensive_checks_enabled=true" /> <!-- enable defensive checks -->
         <jvmarg value="-javaagent:${build.lib}/jamm-${jamm.version}.jar" />
         <jvmarg value="-ea"/>
         <jvmarg line="${java11-jvmargs}"/>
       </java>
     </target>
 
     <!--
         The build target builds all the .class files
     -->
-    <target name="build" depends="resolver-retrieve-build,build-project" description="Compile Cassandra classes"/>
+    <target name="build" depends="resolver-retrieve-build,build-project,checkstyle" description="Compile Cassandra classes"/>
+    <target name="_build_unsafe" depends="resolver-retrieve-build,build-project" description="Compile Cassandra classes without checks"/>
     <target name="codecoverage" depends="jacoco-run,jacoco-report" description="Create code coverage report"/>
 
     <target name="_build_java">
         <!-- Note: we cannot use javac's 'release' option, as that does not allow accessing sun.misc.Unsafe nor
         Nashorn's ClassFilter class as any javac modules option is invalid for relase 8. -->
         <echo message="Compiling for Java ${target.version}..."/>
         <javac
                debug="true" debuglevel="${debuglevel}" encoding="utf-8"
                destdir="${build.classes.main}" includeantruntime="false" source="${source.version}" target="${target.version}">
             <src path="${build.src.java}"/>
             <src path="${build.src.gen-java}"/>
             <compilerarg value="-XDignore.symbol.file"/>
             <compilerarg line="${jdk11-javac-exports}"/>
             <classpath>
                 <path refid="cassandra.classpath"/>
             </classpath>
         </javac>
     </target>
 
     <target depends="init,gen-cql3-grammar,generate-cql-html,generate-jflex-java,rat-check"
             name="build-project">
         <echo message="${ant.project.name}: ${ant.file}"/>
         <!-- Order matters! -->
         <antcall target="_build_java"/>
         <antcall target="createVersionPropFile"/>
         <copy todir="${build.classes.main}">
             <fileset dir="${build.src.resources}" />
         </copy>
         <copy todir="${basedir}/conf" file="${build.classes.main}/META-INF/hotspot_compiler"/>
     </target>
 
     <!-- Stress build file -->
     <property name="stress.build.src" value="${basedir}/tools/stress/src" />
     <property name="stress.test.src" value="${basedir}/tools/stress/test/unit" />
     <property name="stress.build.classes" value="${build.classes}/stress" />
     <property name="stress.test.classes" value="${build.dir}/test/stress-classes" />
-    <property name="stress.manifest" value="${stress.build.classes}/MANIFEST.MF" />
+	<property name="stress.manifest" value="${stress.build.classes}/MANIFEST.MF" />
 
     <target name="stress-build-test" depends="stress-build" description="Compile stress tests">
         <javac debug="true" debuglevel="${debuglevel}" destdir="${stress.test.classes}"
                source="${source.version}" target="${target.version}"
                includeantruntime="false" encoding="utf-8">
             <classpath>
                 <path refid="cassandra.classpath.test"/>
                 <pathelement location="${stress.build.classes}" />
             </classpath>
             <src path="${stress.test.src}"/>
         </javac>
     </target>
 
     <target name="stress-build" depends="build" description="build stress tool">
         <antcall target="_stress_build"/>
     </target>
 
     <target name="_stress_build">
-        <mkdir dir="${stress.build.classes}" />
+    	<mkdir dir="${stress.build.classes}" />
         <javac compiler="modern" debug="true" debuglevel="${debuglevel}"
                source="${source.version}" target="${target.version}"
                encoding="utf-8" destdir="${stress.build.classes}" includeantruntime="true">
             <src path="${stress.build.src}" />
             <classpath>
                 <path refid="cassandra.classpath" />
             </classpath>
         </javac>
         <copy todir="${stress.build.classes}">
             <fileset dir="${stress.build.src}/resources" />
         </copy>
     </target>
 
-    <target name="stress-test" depends="stress-build-test, build-test" description="Runs stress tests">
+    <target name="stress-test" depends="maybe-build-test" description="Runs stress tests">
         <testmacro inputdir="${stress.test.src}"
                        timeout="${test.timeout}">
         </testmacro>
     </target>
 
     <!-- Use this with an FQDN for test class, and an optional csv list of methods like this:
       ant stress-test-some -Dtest.name=org.apache.cassandra.stress.generate.DistributionGaussianTest
       ant stress-test-some -Dtest.name=org.apache.cassandra.stress.generate.DistributionGaussianTest -Dtest.methods=simpleGaussian
     -->
-    <target name="stress-test-some" depends="stress-build-test, build-test" description="Runs stress tests">
+    <target name="stress-test-some" depends="maybe-build-test" description="Runs stress tests">
         <testmacro inputdir="${stress.test.src}"
                        timeout="${test.timeout}">
           <test unless:blank="${test.methods}" name="${test.name}" methods="${test.methods}" outfile="build/test/output/TEST-${test.name}-${test.methods}"/>
           <test if:blank="${test.methods}" name="${test.name}" outfile="build/test/output/TEST-${test.name}"/>
         </testmacro>
     </target>
 
     <!--
         fqltool build file
         -->
     <property name="fqltool.build.src" value="${basedir}/tools/fqltool/src" />
     <property name="fqltool.test.src" value="${basedir}/tools/fqltool/test/unit" />
     <property name="fqltool.build.classes" value="${build.classes}/fqltool" />
     <property name="fqltool.test.classes" value="${build.dir}/test/fqltool-classes" />
     <property name="fqltool.manifest" value="${fqltool.build.classes}/MANIFEST.MF" />
 
     <target name="fqltool-build-test" depends="fqltool-build" description="Compile fqltool tests">
         <javac debug="true" debuglevel="${debuglevel}" destdir="${fqltool.test.classes}"
                source="${source.version}" target="${target.version}"
                includeantruntime="false" encoding="utf-8">
             <classpath>
                 <path refid="cassandra.classpath.test"/>
                 <pathelement location="${fqltool.build.classes}" />
             </classpath>
             <src path="${fqltool.test.src}"/>
         </javac>
     </target>
 
     <target name="fqltool-build" depends="build" description="build fqltool">
         <antcall target="_fqltool_build"/>
     </target>
 
     <target name="_fqltool_build">
-        <mkdir dir="${fqltool.build.classes}" />
+    	<mkdir dir="${fqltool.build.classes}" />
         <javac compiler="modern" debug="true" debuglevel="${debuglevel}"
                source="${source.version}" target="${target.version}"
                encoding="utf-8" destdir="${fqltool.build.classes}" includeantruntime="true">
             <src path="${fqltool.build.src}" />
             <classpath>
                 <path refid="cassandra.classpath" />
             </classpath>
         </javac>
     </target>
 
-    <target name="fqltool-test" depends="fqltool-build-test, build-test" description="Runs fqltool tests">
+    <target name="fqltool-test" depends="fqltool-build-test, maybe-build-test" description="Runs fqltool tests">
         <testmacro inputdir="${fqltool.test.src}"
                        timeout="${test.timeout}">
         </testmacro>
     </target>
 
-    <target name="_write-poms" depends="maven-declare-dependencies">
-        <artifact:writepom pomRefId="parent-pom" file="${build.dir}/${final.name}-parent.pom"/>
-        <artifact:writepom pomRefId="all-pom" file="${build.dir}/${final.name}.pom"/>
-        <artifact:writepom pomRefId="build-deps-pom" file="${build.dir}/tmp-${final.name}-deps.pom"/>
+    <!--
+        simulator asm build file
+        -->
+    <property name="simulator-asm.build.src" value="${test.simulator-asm.src}" />
+    <property name="simulator-asm.build.classes" value="${build.classes}/simulator-asm" />
+    <property name="simulator-asm.manifest" value="${simulator-asm.build.classes}/MANIFEST.MF" />
+
+    <property name="simulator-bootstrap.build.src" value="${test.simulator-bootstrap.src}" />
+    <property name="simulator-bootstrap.build.classes" value="${build.classes}/simulator-bootstrap" />
+    <property name="simulator-bootstrap.manifest" value="${simulator-bootstrap.build.classes}/MANIFEST.MF" />
+
+    <target name="simulator-asm-build" depends="_build_unsafe" description="build simulator-asm">
+        <antcall target="_simulator-asm_build"/>
     </target>
 
-    <target name="write-poms" unless="without.maven">
-        <antcall target="_write-poms" />
+    <target name="simulator-bootstrap-build" depends="_build_unsafe" description="build simulator-bootstrap">
+        <antcall target="_simulator-bootstrap_build"/>
     </target>
 
+    <target name="_simulator-asm_build">
+    	<mkdir dir="${simulator-asm.build.classes}" />
+        <javac compiler="modern" debug="true" debuglevel="${debuglevel}"
+               source="${source.version}" target="${target.version}"
+               encoding="utf-8" destdir="${simulator-asm.build.classes}" includeantruntime="true">
+            <src path="${simulator-asm.build.src}" />
+            <classpath>
+                <fileset dir="${test.lib}">
+                     <include name="**/asm-*${asm.version}.jar" />
+                </fileset>
+                <fileset dir="${build.lib}">
+                     <include name="**/asm-*${asm.version}.jar" />
+                </fileset>
+            </classpath>
+        </javac>
+    </target>
+
+    <target name="_simulator-bootstrap_build">
+    	<mkdir dir="${simulator-bootstrap.build.classes}" />
+        <javac compiler="modern" debug="true" debuglevel="${debuglevel}"
+               source="${source.version}" target="${target.version}"
+               encoding="utf-8" destdir="${simulator-bootstrap.build.classes}" includeantruntime="true">
+            <src path="${simulator-bootstrap.build.src}" />
+            <classpath>
+                <fileset dir="${test.lib}">
+                     <include name="**/asm-*${asm.version}.jar" />
+                </fileset>
+                <fileset dir="${build.lib}">
+                     <include name="**/asm-*${asm.version}.jar" />
+                </fileset>
+            </classpath>
+            <compilerarg value="-XDignore.symbol.file"/>
+        </javac>
+    </target>
+
+	<target name="_write-poms" depends="maven-declare-dependencies">
+	    <artifact:writepom pomRefId="parent-pom" file="${build.dir}/${final.name}-parent.pom"/>
+	    <artifact:writepom pomRefId="all-pom" file="${build.dir}/${final.name}.pom"/>
+	    <artifact:writepom pomRefId="build-deps-pom" file="${build.dir}/tmp-${final.name}-deps.pom"/>
+	</target>
+
+	<target name="write-poms" unless="without.maven">
+	    <antcall target="_write-poms" />
+	</target>
+
     <!--
         The jar target makes cassandra.jar output.
     -->
     <target name="_main-jar"
             depends="build"
             description="Assemble Cassandra JAR files">
       <mkdir dir="${build.classes.main}/META-INF" />
       <copy file="LICENSE.txt"
             tofile="${build.classes.main}/META-INF/LICENSE.txt"/>
       <copy file="NOTICE.txt"
             tofile="${build.classes.main}/META-INF/NOTICE.txt"/>
 
       <!-- Main Jar -->
       <jar jarfile="${build.dir}/${final.name}.jar">
         <fileset dir="${build.classes.main}">
         </fileset>
         <manifest>
         <!-- <section name="org/apache/cassandra/infrastructure"> -->
           <attribute name="Multi-Release" value="true"/>
           <attribute name="Implementation-Title" value="Cassandra"/>
           <attribute name="Implementation-Version" value="${version}"/>
           <attribute name="Implementation-Vendor" value="Apache"/>
         <!-- </section> -->
         </manifest>
       </jar>
     </target>
+
+    <target name="stress-jar"
+            depends="stress-build"
+            description="Assemble Cassandra JAR files">
+        <!-- Stress jar -->
+        <manifest file="${stress.manifest}">
+            <attribute name="Built-By" value="Pavel Yaskevich"/>
+            <attribute name="Main-Class" value="org.apache.cassandra.stress.Stress"/>
+        </manifest>
+        <mkdir dir="${stress.build.classes}/META-INF" />
+        <mkdir dir="${build.dir}/tools/lib/" />
+        <jar destfile="${build.dir}/tools/lib/stress.jar" manifest="${stress.manifest}">
+            <fileset dir="${stress.build.classes}"/>
+        </jar>
+    </target>
+
+    <target name="fqltool-jar"
+            depends="fqltool-build"
+            description="Assemble Cassandra JAR files">
+
+        <!-- fqltool jar -->
+        <manifest file="${fqltool.manifest}">
+            <attribute name="Built-By" value="Marcus Eriksson"/>
+            <attribute name="Main-Class" value="org.apache.cassandra.fqltool.FullQueryLogTool"/>
+        </manifest>
+        <mkdir dir="${fqltool.build.classes}/META-INF" />
+        <mkdir dir="${build.dir}/tools/lib/" />
+        <jar destfile="${build.dir}/tools/lib/fqltool.jar" manifest="${fqltool.manifest}">
+            <fileset dir="${fqltool.build.classes}"/>
+        </jar>
+    </target>
+
+    <target name="simulator-jars"
+            depends="simulator-asm-build,simulator-bootstrap-build"
+            description="Assemble Cassandra JAR files">
+
+        <!-- simulator asm jar -->
+        <manifest file="${simulator-asm.manifest}">
+            <attribute name="Built-By" value="Benedict Elliott Smith"/>
+            <attribute name="Premain-Class" value="org.apache.cassandra.simulator.asm.InterceptAgent"/>
+            <attribute name="Agent-Class" value="org.apache.cassandra.simulator.asm.InterceptAgent"/>
+            <attribute name="Can-Redefine-Classes" value="true"/>
+            <attribute name="Can-Retransform-Classes" value="true"/>
+        </manifest>
+        <mkdir dir="${simulator-asm.build.classes}/META-INF" />
+        <mkdir dir="${test.lib}/jars/" />
+        <jar destfile="${test.lib}/jars/simulator-asm.jar" manifest="${simulator-asm.manifest}">
+            <fileset dir="${simulator-asm.build.classes}"/>
+            <fileset dir="${test.lib}/jars">
+                <include name="**/asm-*${asm.version}.jar" />
+            </fileset>
+        </jar>
+
+        <!-- simulator bootstrap jar -->
+        <manifest file="${simulator-bootstrap.manifest}">
+            <attribute name="Built-By" value="Benedict Elliott Smith"/>
+        </manifest>
+        <mkdir dir="${simulator-bootstrap.build.classes}/META-INF" />
+        <mkdir dir="${test.lib}/jars/" />
+        <jar destfile="${test.lib}/jars/simulator-bootstrap.jar" manifest="${simulator-bootstrap.manifest}">
+            <fileset dir="${simulator-bootstrap.build.classes}"/>
+            <fileset dir="${test.lib}/jars">
+                <include name="**/asm-*${asm.version}.jar" />
+            </fileset>
+        </jar>
+    </target>
+
     <target name="jar"
-            depends="_main-jar,build-test,stress-build,fqltool-build,write-poms"
+            depends="_main-jar,build-test,stress-jar,fqltool-jar,simulator-jars,write-poms"
             description="Assemble Cassandra JAR files">
-      <!-- Stress jar -->
-      <manifest file="${stress.manifest}">
-        <attribute name="Built-By" value="Pavel Yaskevich"/>
-        <attribute name="Main-Class" value="org.apache.cassandra.stress.Stress"/>
-      </manifest>
-      <mkdir dir="${stress.build.classes}/META-INF" />
-      <mkdir dir="${build.dir}/tools/lib/" />
-      <jar destfile="${build.dir}/tools/lib/stress.jar" manifest="${stress.manifest}">
-        <fileset dir="${stress.build.classes}"/>
-      </jar>
-      <!-- fqltool jar -->
-      <manifest file="${fqltool.manifest}">
-        <attribute name="Built-By" value="Marcus Eriksson"/>
-        <attribute name="Main-Class" value="org.apache.cassandra.fqltool.FullQueryLogTool"/>
-      </manifest>
-      <mkdir dir="${fqltool.build.classes}/META-INF" />
-      <mkdir dir="${build.dir}/tools/lib/" />
-      <jar destfile="${build.dir}/tools/lib/fqltool.jar" manifest="${stress.manifest}">
-        <fileset dir="${fqltool.build.classes}"/>
-      </jar>
     </target>
 
     <!--
         The javadoc-jar target makes cassandra-javadoc.jar output required for publishing to Maven central repository.
     -->
     <target name="javadoc-jar" depends="javadoc" unless="no-javadoc" description="Assemble Cassandra JavaDoc JAR file">
       <jar jarfile="${build.dir}/${final.name}-javadoc.jar" basedir="${javadoc.dir}"/>
       <!-- javadoc task always rebuilds so might as well remove the generated docs to prevent
            being pulled into the distribution by accident -->
       <delete quiet="true" dir="${javadoc.dir}"/>
     </target>
 
     <!--
         The sources-jar target makes cassandra-sources.jar output required for publishing to Maven central repository.
     -->
     <target name="sources-jar" depends="init" description="Assemble Cassandra Sources JAR file">
       <jar jarfile="${build.dir}/${final.name}-sources.jar">
         <fileset dir="${build.src.java}" defaultexcludes="yes">
           <include name="org/apache/**/*.java"/>
         </fileset>
         <fileset dir="${build.src.gen-java}" defaultexcludes="yes">
           <include name="org/apache/**/*.java"/>
         </fileset>
       </jar>
     </target>
 
     <target name="_artifacts-init" depends="jar">
       <mkdir dir="${dist.dir}"/>
       <!-- fix the control linefeed so that builds on windows works on linux -->
       <fixcrlf srcdir="bin" includes="**/*" eol="lf" eof="remove" />
       <fixcrlf srcdir="conf" includes="**/*" eol="lf" eof="remove" />
       <fixcrlf srcdir="tools/bin" includes="**/*" eol="lf" eof="remove" />
       <copy todir="${dist.dir}/lib">
         <fileset dir="${build.lib}"/>
         <fileset dir="${build.dir}">
           <include name="${final.name}.jar" />
         </fileset>
       </copy>
       <copy todir="${dist.dir}/doc" failonerror="false">
         <fileset dir="doc">
           <include name="cql3/CQL.html" />
           <include name="cql3/CQL.css" />
           <include name="SASI.md" />
         </fileset>
       </copy>
       <copy todir="${dist.dir}/doc/html" failonerror="false">
         <fileset dir="doc" />
         <globmapper from="build/html/*" to="*"/>
       </copy>
       <copy todir="${dist.dir}/bin">
         <fileset dir="bin"/>
       </copy>
       <copy todir="${dist.dir}/conf">
         <fileset dir="conf"/>
       </copy>
       <copy todir="${dist.dir}/pylib">
         <fileset dir="pylib">
           <include name="**" />
           <exclude name="**/*.pyc" />
         </fileset>
       </copy>
       <copy todir="${dist.dir}/">
         <fileset dir="${basedir}">
           <include name="*.txt" />
+          <include name=".snyk" />
         </fileset>
       </copy>
       <copy todir="${dist.dir}/tools/bin">
         <fileset dir="${basedir}/tools/bin"/>
       </copy>
       <copy todir="${dist.dir}/tools/">
         <fileset dir="${basedir}/tools/">
             <include name="*.yaml"/>
-    </fileset>
+	</fileset>
       </copy>
       <copy todir="${dist.dir}/tools/lib">
         <fileset dir="${build.dir}/tools/lib/">
             <include name="*.jar" />
         </fileset>
       </copy>
     </target>
 
     <!-- creates release tarballs -->
-    <target name="artifacts" depends="_artifacts-init,gen-doc,sources-jar,javadoc-jar"
+    <target name="artifacts" depends="_artifacts-init,gen-doc,sources-jar"
             description="Create Cassandra release artifacts">
       <tar compression="gzip" longfile="gnu"
         destfile="${build.dir}/${final.name}-bin.tar.gz">
 
         <!-- Everything but bin/ (default mode) -->
         <tarfileset dir="${dist.dir}" prefix="${final.name}">
           <include name="**"/>
           <exclude name="bin/*" />
           <exclude name="tools/bin/*"/>
         </tarfileset>
         <!-- Shell includes in bin/ (default mode) -->
         <tarfileset dir="${dist.dir}" prefix="${final.name}">
           <include name="bin/*.in.sh" />
           <include name="tools/bin/*.in.sh" />
         </tarfileset>
         <!-- Executable scripts in bin/ -->
         <tarfileset dir="${dist.dir}" prefix="${final.name}" mode="755">
           <include name="bin/*"/>
           <include name="tools/bin/*"/>
           <exclude name="bin/*.in.sh" />
           <exclude name="tools/bin/*.in.sh" />
         </tarfileset>
       </tar>
 
       <tar compression="gzip" longfile="gnu"
            destfile="${build.dir}/${final.name}-src.tar.gz">
 
         <tarfileset dir="${basedir}"
                     prefix="${final.name}-src">
           <include name="**"/>
           <exclude name="build/**" />
           <exclude name="lib/**" />
           <exclude name="src/gen-java/**" />
           <exclude name=".git/**" />
           <exclude name="venv/**" />
           <exclude name="src/resources/org/apache/cassandra/config/version.properties" />
           <exclude name="conf/hotspot_compiler" />
           <exclude name="doc/cql3/CQL.html" />
           <exclude name="doc/build/**" />
           <exclude name="bin/*" /> <!-- handled separately below -->
           <exclude name="tools/bin/*" /> <!-- handled separately below -->
           <!-- exclude python generated files -->
           <exclude name="**/__pycache__/**" />
           <!-- exclude Eclipse files -->
           <exclude name=".project" />
           <exclude name=".classpath" />
           <exclude name=".settings/**" />
           <exclude name=".externalToolBuilders/**" />
           <!-- exclude NetBeans files -->
           <exclude name="ide/nbproject/private/**" />
         </tarfileset>
 
         <!-- python driver -->
         <tarfileset dir="${basedir}" prefix="${final.name}-src">
           <include name="lib/cassandra-driver-internal-only-**" />
         </tarfileset>
 
         <!-- Shell includes in bin/ and tools/bin/ -->
         <tarfileset dir="${basedir}" prefix="${final.name}-src">
           <include name="bin/*.in.sh" />
           <include name="tools/bin/*.in.sh" />
         </tarfileset>
         <!-- Everything else (assumed to be scripts), is executable -->
         <tarfileset dir="${basedir}" prefix="${final.name}-src" mode="755">
           <include name="bin/*"/>
           <exclude name="bin/*.in.sh" />
           <include name="tools/bin/*"/>
           <exclude name="tools/bin/*.in.sh" />
         </tarfileset>
       </tar>
 
       <checksum forceOverwrite="yes" todir="${build.dir}" fileext=".sha256" algorithm="SHA-256">
         <fileset dir="${build.dir}">
           <include name="${final.name}-bin.tar.gz" />
           <include name="${final.name}-src.tar.gz" />
         </fileset>
       </checksum>
       <checksum forceOverwrite="yes" todir="${build.dir}" fileext=".sha512" algorithm="SHA-512">
         <fileset dir="${build.dir}">
           <include name="${final.name}-bin.tar.gz" />
           <include name="${final.name}-src.tar.gz" />
         </fileset>
       </checksum>
     </target>
 
-  <target name="build-jmh" depends="build-test, jar" description="Create JMH uber jar">
-      <jar jarfile="${build.test.dir}/deps.jar">
-          <zipgroupfileset dir="${test.lib}/jars">
-              <include name="*jmh*.jar"/>
-              <include name="jopt*.jar"/>
-              <include name="commons*.jar"/>
-              <include name="junit*.jar"/>
-              <include name="hamcrest*.jar"/>
-          </zipgroupfileset>
-          <zipgroupfileset dir="${build.lib}" includes="*.jar"/>
-      </jar>
-      <jar jarfile="${build.test.dir}/benchmarks.jar">
-          <manifest>
-              <attribute name="Main-Class" value="org.openjdk.jmh.Main"/>
-          </manifest>
-          <zipfileset src="${build.test.dir}/deps.jar" excludes="META-INF/*.SF" />
-          <fileset dir="${build.classes.main}"/>
-          <fileset dir="${test.classes}"/>
-          <fileset dir="${test.conf}" />
-      </jar>
+  <!-- Wrapper of build-test without dependencies, so both that target and its dependencies are skipped if the property
+    no-build-test is true. This is meant to be used to run tests without actually building them, provided that they have
+    been built before. All test targets depend on this, so one can run them using the no-build-test property.
+    For example:
+
+    ant test -Dno-build-test=true
+    ant test -Dtest.name=StorageServiceServerTest -Dno-build-test=true
+    ant testsome -Dtest.name=org.apache.cassandra.service.StorageServiceServerTest -Dno-build-test=true
+
+    The property is false by default, so if it's not specified the tests would be built with all their dependencies.
+    See CASSANDRA-16625 and CASSANDRA-18000 for further details.
+     -->
+  <target name="maybe-build-test" unless="no-build-test">
+    <antcall target="build-test" inheritRefs="true"/>
   </target>
 
-  <target name="build-test" depends="_main-jar,stress-build,fqltool-build,resolver-dist-lib" unless="no-build-test"
+  <target name="build-test" depends="_main-jar,stress-build-test,fqltool-build,resolver-dist-lib,simulator-jars,checkstyle-test"
           description="Compile test classes">
     <antcall target="_build-test"/>
   </target>
 
   <target name="_build-test">
     <javac
      compiler="modern"
      debug="true"
      debuglevel="${debuglevel}"
      destdir="${test.classes}"
      includeantruntime="true"
      source="${source.version}"
      target="${target.version}"
      encoding="utf-8">
      <classpath>
         <path refid="cassandra.classpath.test"/>
         <pathelement location="${fqltool.build.classes}"/>
      </classpath>
      <compilerarg value="-XDignore.symbol.file"/>
+     <compilerarg line="${jdk11-javac-exports}"/>
+     <src path="${test.anttasks.src}"/>
      <src path="${test.unit.src}"/>
      <src path="${test.long.src}"/>
      <src path="${test.burn.src}"/>
      <src path="${test.memory.src}"/>
      <src path="${test.microbench.src}"/>
      <src path="${test.distributed.src}"/>
+     <src path="${test.simulator.src}"/>
+     <src path="${test.simulator-asm.src}"/>
+     <src path="${test.simulator-bootstrap.src}"/>
+     <src path="${test.simulator-test.src}"/>
     </javac>
 
+    <antcall target="_check-test-names" inheritRefs="true"/>
+
     <!-- Non-java resources needed by the test suite -->
     <copy todir="${test.classes}">
       <fileset dir="${test.resources}"/>
     </copy>
   </target>
 
+    <macrodef name="check-test-names">
+        <attribute name="annotationName"/>
+        <attribute name="regex"/>
+        <attribute name="scanClassPath" default="${test.classes}:${fqltool.test.classes}:${stress.test.classes}"/>
+        <attribute name="packageName" default="org.apache.cassandra"/>
+        <attribute name="expand" default="true"/>
+        <attribute name="normalize" default="true"/>
+        <attribute name="verbose" default="false"/>
+
+        <sequential>
+            <java taskname="check-test-names" fork="true" failonerror="yes" classname="org.apache.cassandra.anttasks.TestNameCheckTask">
+                <classpath>
+                    <path refid="cassandra.classpath.test"/>
+                    <pathelement location="${fqltool.build.classes}"/>
+                    <pathelement location="${stress.build.classes}"/>
+                    <pathelement location="${test.classes}"/>
+                    <pathelement location="${fqltool.test.classes}"/>
+                    <pathelement location="${stress.test.classes}"/>
+                </classpath>
+                <jvmarg line="${java11-jvmargs}"/>
+                <jvmarg value="-DscanClassPath=@{scanClassPath}"/>
+                <jvmarg value="-DpackageName=@{packageName}"/>
+                <jvmarg value="-DannotationName=@{annotationName}"/>
+                <jvmarg value="-Dexpand=@{expand}"/>
+                <jvmarg value="-Dnormalize=@{normalize}"/>
+                <jvmarg value="-Dverbose=@{verbose}"/>
+                <jvmarg value="-Dregex=@{regex}"/>
+            </java>
+        </sequential>
+    </macrodef>
+
+  <target name="_check-test-names">
+      <check-test-names annotationName="org.junit.Test" regex=".*Test$"/>
+      <check-test-names annotationName="org.openjdk.jmh.annotations.Benchmark" regex=".*(Bench|_jmhType.*)$"/>
+  </target>
+
   <!-- Run tests separately and report errors after and generate a junit report -->
   <macrodef name="testhelper">
     <attribute name="testdelegate"/>
     <sequential>
-      <testhelper_ testdelegate="@{testdelegate}"/>
+        <taskdef name="testhelper_" classname="org.apache.cassandra.anttasks.TestHelper" classpath="${test.classes}"/>
+        <testhelper_ property="@{testdelegate}"/>
       <fail message="Some test(s) failed.">
         <condition>
             <and>
             <isset property="testfailed"/>
             <not>
               <isset property="ant.test.failure.ignore"/>
             </not>
           </and>
         </condition>
       </fail>
     </sequential>
   </macrodef>
 
   <!-- Run a list of junit tasks but don't track errors or generate a report after
        If a test fails the testfailed property will be set. All the tests are run using the testdelegate
        macro that is specified as an attribute and they will be run sequentially in this ant process -->
-  <scriptdef name="testhelper_" language="javascript">
-    <attribute name="testdelegate"/>
-    <![CDATA[
-        sep = project.getProperty("path.separator");
-        all = project.getProperty("all-test-classes").split(sep);
-        var p = project.createTask('sequential');
-        for (i = 0; i < all.length; i++) {
-            if (all[i] == undefined) continue;
-            task = project.createTask( attributes.get("testdelegate") );
-            task.setDynamicAttribute( "test.file.list", "" + all[i]);
-            p.addTask(task);
-        }
-        p.perform();
-    ]]>
-  </scriptdef>
 
   <!-- Defines how to run a set of tests. If you change the defaults for attributes
        you should also update them in testmacro.,
        The two are split because the helper doesn't generate
        a junit report or fail on errors -->
   <macrodef name="testmacrohelper">
     <attribute name="inputdir" />
     <attribute name="timeout" default="${test.timeout}" />
     <attribute name="forkmode" default="perTest"/>
     <element name="optjvmargs" implicit="true" optional="true" />
     <attribute name="filter" default="**/${test.name}.java"/>
     <attribute name="exclude" default="" />
     <attribute name="filelist" default="" />
     <attribute name="testtag" default=""/>
     <attribute name="usejacoco" default="no"/>
     <attribute name="showoutput" default="false"/>
 
     <sequential>
       <condition property="additionalagent"
                  value="-javaagent:${build.dir.lib}/jars/jacocoagent.jar=destfile=${jacoco.partialexecfile}"
                  else="">
         <istrue value="${usejacoco}"/>
       </condition>
       <taskdef name="junit-timeout" classname="org.apache.cassandra.JStackJUnitTask">
         <classpath>
           <pathelement location="${test.classes}"/>
         </classpath>
       </taskdef>
       <mkdir dir="${build.test.dir}/cassandra"/>
       <mkdir dir="${build.test.dir}/output"/>
       <mkdir dir="${build.test.dir}/output/@{testtag}"/>
+      <mkdir dir="${tmp.dir}"/>
       <junit-timeout fork="on" forkmode="@{forkmode}" failureproperty="testfailed" maxmemory="1024m" timeout="@{timeout}" showoutput="@{showoutput}">
         <formatter classname="org.apache.cassandra.CassandraXMLJUnitResultFormatter" extension=".xml" usefile="true"/>
         <formatter classname="org.apache.cassandra.CassandraBriefJUnitResultFormatter" usefile="false"/>
         <jvmarg value="-Dstorage-config=${test.conf}"/>
         <jvmarg value="-Djava.awt.headless=true"/>
         <!-- Cassandra 3.0+ needs <jvmarg line="... ${additionalagent}" /> here! (not value=) -->
         <jvmarg line="-javaagent:${build.lib}/jamm-${jamm.version}.jar ${additionalagent}" />
         <jvmarg value="-ea"/>
         <jvmarg value="-Djava.io.tmpdir=${tmp.dir}"/>
         <jvmarg value="-Dcassandra.debugrefcount=true"/>
         <jvmarg value="-Xss256k"/>
         <!-- When we do classloader manipulation SoftReferences can cause memory leaks
              that can OOM our test runs. The next two settings informs our GC
              algorithm to limit the metaspace size and clean up SoftReferences
              more aggressively rather than waiting. See CASSANDRA-14922 for more details.
         -->
         <jvmarg value="-XX:SoftRefLRUPolicyMSPerMB=0" />
+        <jvmarg value="-XX:ActiveProcessorCount=${cassandra.test.processorCount}" />
         <jvmarg value="-Dcassandra.test.driver.connection_timeout_ms=${test.driver.connection_timeout_ms}"/>
         <jvmarg value="-Dcassandra.test.driver.read_timeout_ms=${test.driver.read_timeout_ms}"/>
         <jvmarg value="-Dcassandra.memtable_row_overhead_computation_step=100"/>
         <jvmarg value="-Dcassandra.test.use_prepared=${cassandra.test.use_prepared}"/>
         <jvmarg value="-Dcassandra.test.sstableformatdevelopment=true"/>
         <!-- The first time SecureRandom initializes can be slow if it blocks on /dev/random -->
         <jvmarg value="-Djava.security.egd=file:/dev/urandom" />
         <jvmarg value="-Dcassandra.testtag=@{testtag}"/>
         <jvmarg value="-Dcassandra.keepBriefBrief=${cassandra.keepBriefBrief}" />
         <jvmarg value="-Dcassandra.strict.runtime.checks=true" />
+        <jvmarg value="-Dcassandra.reads.thresholds.coordinator.defensive_checks_enabled=true" /> <!-- enable defensive checks -->
+        <jvmarg value="-Dcassandra.test.flush_local_schema_changes=${cassandra.test.flush_local_schema_changes}"/>
+        <jvmarg value="-Dcassandra.test.messagingService.nonGracefulShutdown=${cassandra.test.messagingService.nonGracefulShutdown}"/>
+        <jvmarg value="-Dcassandra.use_nix_recursive_delete=${cassandra.use_nix_recursive_delete}"/>
         <jvmarg line="${java11-jvmargs}"/>
         <!-- disable shrinks in quicktheories CASSANDRA-15554 -->
         <jvmarg value="-DQT_SHRINKS=0"/>
-        <jvmarg line="${test-jvmargs}" />
+        <jvmarg line="${_std-test-jvmargs}" />
+        <jvmarg line="${test.jvm.args}" />
         <optjvmargs/>
         <!-- Uncomment to debug unittest, attach debugger to port 1416 -->
         <!--
         <jvmarg line="-agentlib:jdwp=transport=dt_socket,address=localhost:1416,server=y,suspend=y" />
         -->
         <classpath>
           <pathelement path="${java.class.path}"/>
           <pathelement location="${stress.build.classes}"/>
           <pathelement location="${fqltool.build.classes}"/>
-          <path refid="cassandra.classpath.test" />
           <pathelement location="${test.classes}"/>
+          <path refid="cassandra.classpath.test" />
           <pathelement location="${stress.test.classes}"/>
           <pathelement location="${fqltool.test.classes}"/>
           <pathelement location="${test.conf}"/>
+          <pathelement path="${java.class.path}"/>
+          <path refid="cassandra.classpath" />
           <fileset dir="${test.lib}">
             <include name="**/*.jar" />
               <exclude name="**/ant-*.jar"/>
           </fileset>
         </classpath>
         <batchtest todir="${build.test.dir}/output/@{testtag}">
             <fileset dir="@{inputdir}" includes="@{filter}" excludes="@{exclude}"/>
             <filelist dir="@{inputdir}" files="@{filelist}"/>
         </batchtest>
       </junit-timeout>
 
       <delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/commitlog"/>
       <delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/cdc_raw"/>
       <delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/data"/>
       <delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/ssl_upload_tables"/>
       <delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/system_data"/>
       <delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/saved_caches"/>
       <delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/hints"/>
     </sequential>
   </macrodef>
 
-  <target name="testold" depends="build-test" description="Execute unit tests">
+  <target name="testold" depends="maybe-build-test" description="Execute unit tests">
     <testmacro inputdir="${test.unit.src}" timeout="${test.timeout}">
       <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
       <jvmarg value="-Dinvalid-legacy-sstable-root=${test.data}/invalid-legacy-sstables"/>
       <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
       <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
       <jvmarg value="-Dcassandra.skip_sync=true" />
     </testmacro>
     <fileset dir="${test.unit.src}" />
   </target>
 
   <!-- Will not generate a junit report or fail on error  -->
   <macrodef name="testlist">
     <attribute name="test.file.list"/>
     <sequential>
       <testmacrohelper inputdir="${test.dir}/${test.classlistprefix}" filelist="@{test.file.list}" exclude="**/*.java" timeout="${test.timeout}">
         <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
         <jvmarg value="-Dinvalid-legacy-sstable-root=${test.data}/invalid-legacy-sstables"/>
         <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
         <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
         <jvmarg value="-Dcassandra.skip_sync=true" />
       </testmacrohelper>
     </sequential>
   </macrodef>
 
   <!-- Will not generate a junit report  -->
   <macrodef name="testlist-compression">
     <attribute name="test.file.list" />
     <sequential>
       <property name="compressed_yaml" value="${build.test.dir}/cassandra.compressed.yaml"/>
       <concat destfile="${compressed_yaml}">
           <fileset file="${test.conf}/cassandra.yaml"/>
           <fileset file="${test.conf}/commitlog_compression_${test.compression.algo}.yaml"/>
       </concat>
       <testmacrohelper inputdir="${test.unit.src}" filelist="@{test.file.list}"
                        exclude="**/*.java" timeout="${test.timeout}" testtag="compression">
         <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
         <jvmarg value="-Dinvalid-legacy-sstable-root=${test.data}/invalid-legacy-sstables"/>
         <jvmarg value="-Dcassandra.test.compression=true"/>
         <jvmarg value="-Dcassandra.test.compression.algo=${test.compression.algo}"/>
         <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
         <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
         <jvmarg value="-Dcassandra.config=file:///${compressed_yaml}"/>
         <jvmarg value="-Dcassandra.skip_sync=true" />
       </testmacrohelper>
     </sequential>
   </macrodef>
 
   <macrodef name="testlist-cdc">
     <attribute name="test.file.list" />
     <sequential>
       <property name="cdc_yaml" value="${build.test.dir}/cassandra.cdc.yaml"/>
       <concat destfile="${cdc_yaml}">
         <fileset file="${test.conf}/cassandra.yaml"/>
         <fileset file="${test.conf}/cdc.yaml"/>
       </concat>
       <testmacrohelper inputdir="${test.unit.src}" filelist="@{test.file.list}"
                        exclude="**/*.java" timeout="${test.timeout}" testtag="cdc">
         <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
         <jvmarg value="-Dinvalid-legacy-sstable-root=${test.data}/invalid-legacy-sstables"/>
         <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
         <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
         <jvmarg value="-Dcassandra.config=file:///${cdc_yaml}"/>
         <jvmarg value="-Dcassandra.skip_sync=true" />
       </testmacrohelper>
     </sequential>
   </macrodef>
 
   <macrodef name="testlist-system-keyspace-directory">
     <attribute name="test.file.list" />
     <sequential>
       <property name="system_keyspaces_directory_yaml" value="${build.test.dir}/cassandra.system.yaml"/>
       <concat destfile="${system_keyspaces_directory_yaml}">
         <fileset file="${test.conf}/cassandra.yaml"/>
         <fileset file="${test.conf}/system_keyspaces_directory.yaml"/>
       </concat>
       <testmacrohelper inputdir="${test.unit.src}" filelist="@{test.file.list}"
                        exclude="**/*.java" timeout="${test.timeout}" testtag="system_keyspace_directory">
         <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
         <jvmarg value="-Dinvalid-legacy-sstable-root=${test.data}/invalid-legacy-sstables"/>
         <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
         <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
         <jvmarg value="-Dcassandra.config=file:///${system_keyspaces_directory_yaml}"/>
         <jvmarg value="-Dcassandra.skip_sync=true" />
       </testmacrohelper>
     </sequential>
   </macrodef>
 
   <!--
     Run named ant task with jacoco, such as "ant jacoco-run -Dtaskname=test"
     the target run must enable the jacoco agent if usejacoco is 'yes' -->
   <target name="jacoco-run" description="run named task with jacoco instrumentation">
     <condition property="runtask" value="${taskname}" else="test">
       <isset property="taskname"/>
     </condition>
     <antcall target="${runtask}">
       <param name="usejacoco" value="yes"/>
     </antcall>
   </target>
 
   <!-- Use this with an FQDN for test class, and an optional csv list of methods like this:
+    ant testsome -Dtest.name=org.apache.cassandra.service.StorageServiceServerTest
     ant testsome -Dtest.name=org.apache.cassandra.service.StorageServiceServerTest -Dtest.methods=testRegularMode,testGetAllRangesEmpty
   -->
-  <target name="testsome" depends="build-test" description="Execute specific unit tests" >
+  <target name="testsome" depends="maybe-build-test" description="Execute specific unit tests" >
     <testmacro inputdir="${test.unit.src}" timeout="${test.timeout}">
       <test unless:blank="${test.methods}" name="${test.name}" methods="${test.methods}" outfile="build/test/output/TEST-${test.name}-${test.methods}"/>
       <test if:blank="${test.methods}" name="${test.name}" outfile="build/test/output/TEST-${test.name}"/>
       <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
       <jvmarg value="-Dinvalid-legacy-sstable-root=${test.data}/invalid-legacy-sstables"/>
       <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
       <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
       <jvmarg value="-Dcassandra.skip_sync=true" />
     </testmacro>
   </target>
 
   <!-- Use this with an FQDN for test class, and an optional csv list of methods like this:
     ant long-testsome -Dtest.name=org.apache.cassandra.cql3.ManyRowsTest
     ant long-testsome -Dtest.name=org.apache.cassandra.cql3.ManyRowsTest -Dtest.methods=testLargeCount
   -->
-  <target name="long-testsome" depends="build-test" description="Execute specific long unit tests" >
+  <target name="long-testsome" depends="maybe-build-test" description="Execute specific long unit tests" >
     <testmacro inputdir="${test.long.src}" timeout="${test.long.timeout}">
-      <test unless:blank="${test.methods}" name="${test.name}" methods="${test.methods}"/>
-      <test if:blank="${test.methods}" name="${test.name}"/>
+      <test if="withMethods" name="${test.name}" methods="${test.methods}" todir="${build.test.dir}/output/" outfile="TEST-${test.name}-${test.methods}"/>
+      <test if="withoutMethods" name="${test.name}" todir="${build.test.dir}/output/" outfile="TEST-${test.name}"/>
       <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
       <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
     </testmacro>
   </target>
 
   <!-- Use this with an FQDN for test class, and an optional csv list of methods like this:
     ant burn-testsome -Dtest.name=org.apache.cassandra.utils.memory.LongBufferPoolTest
     ant burn-testsome -Dtest.name=org.apache.cassandra.utils.memory.LongBufferPoolTest -Dtest.methods=testPoolAllocateWithRecyclePartially
   -->
-  <target name="burn-testsome" depends="build-test" description="Execute specific burn unit tests" >
+  <target name="burn-testsome" depends="maybe-build-test" description="Execute specific burn unit tests" >
     <testmacro inputdir="${test.burn.src}" timeout="${test.burn.timeout}">
-      <test unless:blank="${test.methods}" name="${test.name}" methods="${test.methods}"/>
-      <test if:blank="${test.methods}" name="${test.name}"/>
+      <test if="withMethods" name="${test.name}" methods="${test.methods}" todir="${build.test.dir}/output/" outfile="TEST-${test.name}-${test.methods}"/>
+      <test if="withoutMethods" name="${test.name}" todir="${build.test.dir}/output/" outfile="TEST-${test.name}"/>
       <jvmarg value="-Dlogback.configurationFile=test/conf/logback-burntest.xml"/>
     </testmacro>
   </target>
 
-  <target name="test-compression" depends="build-test,stress-build" description="Execute unit tests with sstable compression enabled">
+  <target name="test-compression" depends="maybe-build-test,stress-build" description="Execute unit tests with sstable compression enabled">
     <path id="all-test-classes-path">
       <fileset dir="${test.unit.src}" includes="**/${test.name}.java" />
       <fileset dir="${test.distributed.src}" includes="**/${test.name}.java" />
     </path>
     <property name="all-test-classes" refid="all-test-classes-path"/>
     <testhelper testdelegate="testlist-compression" />
   </target>
 
-  <target name="test-cdc" depends="build-test" description="Execute unit tests with change-data-capture enabled">
+  <target name="test-cdc" depends="maybe-build-test" description="Execute unit tests with change-data-capture enabled">
     <path id="all-test-classes-path">
       <fileset dir="${test.unit.src}" includes="**/${test.name}.java" />
     </path>
     <property name="all-test-classes" refid="all-test-classes-path"/>
     <testhelper testdelegate="testlist-cdc" />
   </target>
 
-  <target name="test-system-keyspace-directory" depends="build-test" description="Execute unit tests with a system keyspaces directory configured">
+  <target name="test-system-keyspace-directory" depends="maybe-build-test" description="Execute unit tests with a system keyspaces directory configured">
     <path id="all-test-classes-path">
       <fileset dir="${test.unit.src}" includes="**/${test.name}.java" />
     </path>
     <property name="all-test-classes" refid="all-test-classes-path"/>
     <testhelper testdelegate="testlist-system-keyspace-directory" />
   </target>
 
-  <target name="msg-ser-gen-test" depends="build-test" description="Generates message serializations">
+  <target name="msg-ser-gen-test" depends="maybe-build-test" description="Generates message serializations">
     <testmacro inputdir="${test.unit.src}"
         timeout="${test.timeout}" filter="**/SerializationsTest.java">
       <jvmarg value="-Dcassandra.test-serialization-writes=True"/>
     </testmacro>
   </target>
 
-  <target name="msg-ser-test" depends="build-test" description="Tests message serializations">
+  <target name="msg-ser-test" depends="maybe-build-test" description="Tests message serializations">
       <testmacro inputdir="${test.unit.src}" timeout="${test.timeout}"
                filter="**/SerializationsTest.java"/>
   </target>
 
-  <target name="msg-ser-test-7" depends="build-test" description="Generates message serializations">
+  <target name="msg-ser-test-7" depends="maybe-build-test" description="Generates message serializations">
     <testmacro inputdir="${test.unit.src}"
         timeout="${test.timeout}" filter="**/SerializationsTest.java">
       <jvmarg value="-Dcassandra.version=0.7"/>
     </testmacro>
   </target>
 
-  <target name="msg-ser-test-10" depends="build-test" description="Tests message serializations on 1.0 messages">
+  <target name="msg-ser-test-10" depends="maybe-build-test" description="Tests message serializations on 1.0 messages">
     <testmacro inputdir="${test.unit.src}"
         timeout="${test.timeout}" filter="**/SerializationsTest.java">
       <jvmarg value="-Dcassandra.version=1.0"/>
     </testmacro>
   </target>
 
-  <target name="test-burn" depends="build-test" description="Execute functional tests">
+  <target name="test-burn" depends="maybe-build-test" description="Execute functional tests">
     <testmacro inputdir="${test.burn.src}"
                timeout="${test.burn.timeout}">
     </testmacro>
   </target>
 
-  <target name="long-test" depends="build-test" description="Execute functional tests">
+  <target name="long-test" depends="maybe-build-test" description="Execute functional tests">
     <testmacro inputdir="${test.long.src}"
                timeout="${test.long.timeout}">
       <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
       <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
     </testmacro>
   </target>
 
-  <target name="test-memory" depends="build-test" description="Execute functional tests">
+  <target name="test-memory" depends="maybe-build-test" description="Execute functional tests">
       <testmacro inputdir="${test.memory.src}"
                  timeout="${test.memory.timeout}">
           <jvmarg value="-javaagent:${build.dir}/test/lib/jars/java-allocation-instrumenter-${allocation-instrumenter.version}.jar"/>
       </testmacro>
   </target>
 
-  <target name="cql-test" depends="build-test" description="Execute CQL tests">
+  <target name="cql-test" depends="maybe-build-test" description="Execute CQL tests">
     <sequential>
       <echo message="running CQL tests"/>
       <mkdir dir="${build.test.dir}/cassandra"/>
       <mkdir dir="${build.test.dir}/output"/>
       <junit fork="on" forkmode="once" failureproperty="testfailed" maxmemory="1024m" timeout="${test.timeout}">
         <formatter type="brief" usefile="false"/>
         <jvmarg value="-Dstorage-config=${test.conf}"/>
         <jvmarg value="-Djava.awt.headless=true"/>
         <jvmarg value="-javaagent:${build.lib}/jamm-${jamm.version}.jar" />
         <jvmarg value="-ea"/>
         <jvmarg value="-Xss256k"/>
         <jvmarg value="-Dcassandra.memtable_row_overhead_computation_step=100"/>
         <jvmarg value="-Dcassandra.test.use_prepared=${cassandra.test.use_prepared}"/>
         <jvmarg value="-Dcassandra.skip_sync=true" />
         <classpath>
           <path refid="cassandra.classpath.test" />
           <pathelement location="${test.classes}"/>
           <pathelement location="${test.conf}"/>
           <fileset dir="${test.lib}">
             <include name="**/*.jar" />
           </fileset>
         </classpath>
         <batchtest todir="${build.test.dir}/output">
             <fileset dir="${test.unit.src}" includes="**/cql3/*Test.java">
                 <contains text="CQLTester" casesensitive="yes"/>
             </fileset>
         </batchtest>
       </junit>
       <fail message="Some CQL test(s) failed.">
         <condition>
             <and>
             <isset property="testfailed"/>
             <not>
               <isset property="ant.test.failure.ignore"/>
             </not>
           </and>
         </condition>
       </fail>
     </sequential>
   </target>
 
   <!-- Use this with an simple class name for test class, and an optional csv list of methods like this:
-      ant cql-test-some -Dtest.name=ListsTest
-      ant cql-test-some -Dtest.name=ListsTest -Dtest.methods=testPrecisionTime_getNext_simple
-    -->
-  <target name="cql-test-some" depends="build-test" description="Execute specific CQL tests" >
+    ant cql-test-some -Dtest.name=ListsTest
+    ant cql-test-some -Dtest.name=ListsTest -Dtest.methods=testPrecisionTime_getNext_simple
+  -->
+  <target name="cql-test-some" depends="maybe-build-test" description="Execute specific CQL tests" >
     <sequential>
       <echo message="running ${test.methods} tests from ${test.name}"/>
       <mkdir dir="${build.test.dir}/cassandra"/>
       <mkdir dir="${build.test.dir}/output"/>
       <junit fork="on" forkmode="once" failureproperty="testfailed" maxmemory="1024m" timeout="${test.timeout}">
         <formatter type="brief" usefile="false"/>
         <jvmarg value="-Dstorage-config=${test.conf}"/>
         <jvmarg value="-Djava.awt.headless=true"/>
         <jvmarg value="-javaagent:${build.lib}/jamm-${jamm.version}.jar" />
         <jvmarg value="-ea"/>
         <jvmarg value="-Xss256k"/>
         <jvmarg value="-Dcassandra.test.use_prepared=${cassandra.test.use_prepared}"/>
         <jvmarg value="-Dcassandra.memtable_row_overhead_computation_step=100"/>
         <jvmarg value="-Dcassandra.skip_sync=true" />
         <classpath>
           <path refid="cassandra.classpath.test" />
           <pathelement location="${test.classes}"/>
           <pathelement location="${test.conf}"/>
           <fileset dir="${test.lib}">
             <include name="**/*.jar" />
           </fileset>
         </classpath>
         <test unless:blank="${test.methods}" name="org.apache.cassandra.cql3.${test.name}" methods="${test.methods}" todir="${build.test.dir}/output"/>
         <test if:blank="${test.methods}" name="org.apache.cassandra.cql3.${test.name}" todir="${build.test.dir}/output"/>
       </junit>
     </sequential>
   </target>
 
   <!-- Use JaCoCo ant extension without needing externally saved lib -->
   <target name="jacoco-init" depends="resolver-init">
     <typedef uri="antlib:org.jacoco.ant" classpathref="jacocoant.classpath"/>
   </target>
 
   <target name="jacoco-merge" depends="jacoco-init">
     <jacoco:merge destfile="${jacoco.finalexecfile}" xmlns:jacoco="antlib:org.jacoco.ant">
         <fileset dir="${jacoco.export.dir}" includes="*.exec,**/*.exec"/>
     </jacoco:merge>
   </target>
 
   <target name="jacoco-report" depends="jacoco-merge">
     <jacoco:report xmlns:jacoco="antlib:org.jacoco.ant">
       <executiondata>
         <file file="${jacoco.finalexecfile}" />
       </executiondata>
       <structure name="JaCoCo Cassandara Coverage Report">
         <classfiles>
           <fileset dir="${build.classes.main}">
             <include name="**/*.class"/>
           </fileset>
         </classfiles>
         <sourcefiles encoding="UTF-8">
           <dirset dir="${build.src}">
             <include name="java"/>
             <include name="gen-java"/>
           </dirset>
         </sourcefiles>
       </structure>
       <!-- to produce reports in different formats. -->
       <html destdir="${jacoco.export.dir}" />
       <csv destfile="${jacoco.export.dir}/report.csv" />
       <xml destfile="${jacoco.export.dir}/report.xml" />
     </jacoco:report>
   </target>
 
   <target name="jacoco-cleanup" description="Destroy JaCoCo exec data and reports">
     <delete file="${jacoco.partialexecfile}"/>
     <delete dir="${jacoco.export.dir}"/>
   </target>
 
   <target name="javadoc" depends="build" description="Create javadoc" unless="no-javadoc">
     <create-javadoc destdir="${javadoc.dir}">
       <filesets>
         <fileset dir="${build.src.java}" defaultexcludes="yes">
           <include name="org/apache/**/*.java"/>
         </fileset>
       </filesets>
     </create-javadoc>
    </target>
 
   <!-- Run tests and reports errors and generates a junit report after -->
   <macrodef name="testmacro">
     <attribute name="inputdir" />
     <attribute name="timeout" default="${test.timeout}" />
     <attribute name="forkmode" default="perTest"/>
     <attribute name="showoutput" default="true"/>
     <element name="optjvmargs" implicit="true" optional="true" />
     <attribute name="filter" default="**/${test.name}.java"/>
     <attribute name="exclude" default="" />
     <attribute name="filelist" default="" />
     <attribute name="testtag" default=""/>
 
     <sequential>
       <testmacrohelper inputdir="@{inputdir}" timeout="@{timeout}"
                        forkmode="@{forkmode}" filter="@{filter}"
                        exclude="@{exclude}" filelist="@{filelist}"
                        testtag="@{testtag}" showoutput="false" >
           <optjvmargs/>
       </testmacrohelper>
       <fail message="Some test(s) failed.">
         <condition>
             <and>
             <isset property="testfailed"/>
             <not>
               <isset property="ant.test.failure.ignore"/>
             </not>
           </and>
         </condition>
       </fail>
     </sequential>
   </macrodef>
 
-  <target name="test" depends="eclipse-warnings,build-test" description="Test Runner">
+  <target name="test" depends="eclipse-warnings,maybe-build-test" description="Test Runner">
     <path id="all-test-classes-path">
       <fileset dir="${test.unit.src}" includes="**/${test.name}.java" excludes="**/distributed/test/UpgradeTest*.java" />
     </path>
     <property name="all-test-classes" refid="all-test-classes-path"/>
     <testhelper testdelegate="testlist"/>
   </target>
 
   <target name="generate-test-report" description="Generates JUnit's HTML report from results already in build/output">
       <junitreport todir="${build.test.dir}">
         <fileset dir="${build.test.dir}/output">
           <include name="**/TEST-*.xml"/>
         </fileset>
         <report format="frames" todir="${build.test.dir}/junitreport"/>
       </junitreport>
   </target>
 
   <!-- run a list of tests as provided in -Dtest.classlistfile (or default of 'testnames.txt')
   The class list file should be one test class per line, with the path starting after test/unit
   e.g. org/apache/cassandra/hints/HintMessageTest.java -->
-  <target name="testclasslist" depends="build-test" description="Run tests given in file -Dtest.classlistfile (one-class-per-line, e.g. org/apache/cassandra/db/SomeTest.java)">
+  <target name="testclasslist" depends="maybe-build-test" description="Run tests given in file -Dtest.classlistfile (one-class-per-line, e.g. org/apache/cassandra/db/SomeTest.java)">
     <path id="all-test-classes-path">
       <fileset dir="${test.dir}/${test.classlistprefix}" includesfile="${test.classlistfile}"/>
     </path>
     <property name="all-test-classes" refid="all-test-classes-path"/>
     <testhelper testdelegate="testlist"/>
   </target>
-  <target name="testclasslist-compression" depends="build-test" description="Run tests given in file -Dtest.classlistfile (one-class-per-line, e.g. org/apache/cassandra/db/SomeTest.java)">
+  <target name="testclasslist-compression" depends="maybe-build-test" description="Run tests given in file -Dtest.classlistfile (one-class-per-line, e.g. org/apache/cassandra/db/SomeTest.java)">
       <path id="all-test-classes-path">
           <fileset dir="${test.dir}/${test.classlistprefix}" includesfile="${test.classlistfile}"/>
       </path>
       <property name="all-test-classes" refid="all-test-classes-path"/>
       <testhelper testdelegate="testlist-compression"/>
   </target>
-  <target name="testclasslist-cdc" depends="build-test" description="Run tests given in file -Dtest.classlistfile (one-class-per-line, e.g. org/apache/cassandra/db/SomeTest.java)">
+  <target name="testclasslist-cdc" depends="maybe-build-test" description="Run tests given in file -Dtest.classlistfile (one-class-per-line, e.g. org/apache/cassandra/db/SomeTest.java)">
       <path id="all-test-classes-path">
           <fileset dir="${test.dir}/${test.classlistprefix}" includesfile="${test.classlistfile}"/>
       </path>
       <property name="all-test-classes" refid="all-test-classes-path"/>
       <testhelper testdelegate="testlist-cdc"/>
   </target>
-  <target name="testclasslist-system-keyspace-directory" depends="build-test" description="Run tests given in file -Dtest.classlistfile (one-class-per-line, e.g. org/apache/cassandra/db/SomeTest.java)">
+  <target name="testclasslist-system-keyspace-directory" depends="maybe-build-test" description="Run tests given in file -Dtest.classlistfile (one-class-per-line, e.g. org/apache/cassandra/db/SomeTest.java)">
       <path id="all-test-classes-path">
           <fileset dir="${test.dir}/${test.classlistprefix}" includesfile="${test.classlistfile}"/>
       </path>
       <property name="all-test-classes" refid="all-test-classes-path"/>
       <testhelper testdelegate="testlist-system-keyspace-directory"/>
   </target>
 
   <!-- Build a self-contained jar for e.g. remote execution; not currently used for running burn tests with this build script -->
   <target name="burn-test-jar" depends="build-test, build" description="Create dtest-compatible jar, including all dependencies">
       <jar jarfile="${build.dir}/burntest.jar">
           <zipgroupfileset dir="${build.lib}" includes="*.jar" excludes="META-INF/*.SF"/>
           <fileset dir="${build.classes.main}"/>
           <fileset dir="${test.classes}"/>
           <fileset dir="${test.conf}" excludes="logback*.xml"/>
           <fileset dir="${basedir}/conf" includes="logback*.xml"/>
           <zipgroupfileset dir="${build.dir.lib}/jars">
               <include name="junit*.jar"/>
           </zipgroupfileset>
       </jar>
   </target>
 
   <target name="dtest-jar" depends="build-test, build" description="Create dtest-compatible jar, including all dependencies">
-      <jar jarfile="${build.dir}/dtest-${base.version}.jar">
-          <zipgroupfileset dir="${build.lib}" includes="*.jar" excludes="META-INF/*.SF"/>
-          <zipgroupfileset dir="${build.dir.lib}/jars" includes="javassist-*.jar,reflections-*.jar" excludes="META-INF/*.SF"/>
+      <jar jarfile="${build.dir}/dtest-${base.version}.jar" duplicate="preserve">
           <fileset dir="${build.classes.main}"/>
           <fileset dir="${test.classes}"/>
           <fileset dir="${test.conf}" />
+          <zipgroupfileset dir="${build.lib}" includes="*.jar" excludes="META-INF/*.SF"/>
+          <zipgroupfileset dir="${test.lib}/jars" includes="jimfs-1.1.jar,dtest-api-*.jar,asm-*.jar,javassist-*.jar,reflections-*.jar,semver4j-*.jar" excludes="META-INF/*.SF"/>
+          <zipgroupfileset dir="${build.dir.lib}/jars" includes="asm-*.jar" excludes="META-INF/*.SF"/>
       </jar>
   </target>
 
-  <target name="test-jvm-dtest" depends="build-test" description="Execute in-jvm dtests">
-    <testmacro inputdir="${test.distributed.src}" timeout="${test.distributed.timeout}" forkmode="once" showoutput="true" filter="**/test/*Test.java">
+  <target name="test-jvm-dtest" depends="maybe-build-test" description="Execute in-jvm dtests">
+    <testmacro inputdir="${test.distributed.src}" timeout="${test.distributed.timeout}" forkmode="once" showoutput="true" filter="**/test/${test.name}.java">
       <jvmarg value="-Dlogback.configurationFile=test/conf/logback-dtest.xml"/>
       <jvmarg value="-Dcassandra.ring_delay_ms=10000"/>
       <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
       <jvmarg value="-Dcassandra.skip_sync=true" />
     </testmacro>
   </target>
 
-  <target name="test-jvm-upgrade-dtest" depends="build-test" description="Execute in-jvm dtests">
+  <target name="test-simulator-dtest" depends="maybe-build-test" description="Execute simulator dtests">
+    <testmacro inputdir="${test.simulator-test.src}" timeout="${test.simulation.timeout}" forkmode="perTest" showoutput="true" filter="**/test/${test.name}.java">
+      <jvmarg value="-Dlogback.configurationFile=test/conf/logback-simulator.xml"/>
+      <jvmarg value="-Dcassandra.ring_delay_ms=10000"/>
+      <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
+      <jvmarg value="-Dcassandra.skip_sync=true" />
+      <jvmarg value="-Dcassandra.debugrefcount=false"/>
+      <jvmarg value="-Dcassandra.test.simulator.determinismcheck=strict"/>
+      <!-- Support Simulator Tests -->
+      <jvmarg line="-javaagent:${test.lib}/jars/simulator-asm.jar"/>
+      <jvmarg line="-Xbootclasspath/a:${test.lib}/jars/simulator-bootstrap.jar"/>
+      <jvmarg line="-XX:ActiveProcessorCount=4"/>
+      <jvmarg line="-XX:-TieredCompilation"/>
+      <jvmarg line="-XX:-BackgroundCompilation"/>
+      <jvmarg line="-XX:CICompilerCount=1"/>
+      <jvmarg line="-XX:Tier4CompileThreshold=1000"/>
+      <jvmarg line="-XX:ReservedCodeCacheSize=256M"/>
+      <jvmarg line="-Xmx8G"/>
+    </testmacro>
+  </target>
+
+  <target name="test-jvm-upgrade-dtest" depends="maybe-build-test" description="Execute in-jvm dtests">
     <testmacro inputdir="${test.distributed.src}" timeout="${test.distributed.timeout}" forkmode="once" showoutput="true" filter="**/upgrade/*Test.java">
       <jvmarg value="-Dlogback.configurationFile=test/conf/logback-dtest.xml"/>
       <jvmarg value="-Dcassandra.ring_delay_ms=10000"/>
       <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
       <jvmarg value="-Dcassandra.skip_sync=true" />
     </testmacro>
   </target>
 
   <!-- Use this with an FQDN for test class, and an optional csv list of methods like this:
+      ant test-jvm-dtest-some -Dtest.name=org.apache.cassandra.distributed.test.ResourceLeakTest
       ant test-jvm-dtest-some -Dtest.name=org.apache.cassandra.distributed.test.ResourceLeakTest -Dtest.methods=looperTest
     -->
-  <target name="test-jvm-dtest-some" depends="build-test" description="Execute some in-jvm dtests">
+  <target name="test-jvm-dtest-some" depends="maybe-build-test" description="Execute some in-jvm dtests">
     <testmacro inputdir="${test.distributed.src}" timeout="${test.distributed.timeout}" forkmode="once" showoutput="true">
       <test unless:blank="${test.methods}" name="${test.name}" methods="${test.methods}" outfile="build/test/output/TEST-${test.name}-${test.methods}"/>
       <test if:blank="${test.methods}" name="${test.name}" outfile="build/test/output/TEST-${test.name}"/>
       <jvmarg value="-Dlogback.configurationFile=test/conf/logback-dtest.xml"/>
       <jvmarg value="-Dcassandra.ring_delay_ms=10000"/>
       <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
       <jvmarg value="-Dcassandra.skip_sync=true" />
     </testmacro>
   </target>
 
-  <!-- run microbenchmarks suite -->
-  <target name="microbench" depends="build-jmh">
-      <java classname="org.openjdk.jmh.Main"
-            fork="true"
-            failonerror="true">
-          <classpath>
-              <path refid="cassandra.classpath.test" />
-              <pathelement location="${test.classes}"/>
-              <pathelement location="${test.conf}"/>
-              <fileset dir="${test.lib}">
-                  <include name="**/*.jar" />
-              </fileset>
-          </classpath>
-          <arg value="-foe"/>
-          <arg value="true"/>
-          <arg value="-rf"/>
-          <arg value="json"/>
-          <arg value="-rff"/>
-          <arg value="${build.test.dir}/jmh-result.json"/>
-          <arg value="-v"/>
-          <arg value="EXTRA"/>
-
-          <!-- Broken: ZeroCopyStreamingBench,MutationBench,FastThreadLocalBench  (FIXME) -->
-          <arg value="-e"/><arg value="ZeroCopyStreamingBench|MutationBench|FastThreadLocalBench"/>
-
-          <arg value=".*microbench.*${benchmark.name}"/>
-      </java>
+  <target name="microbench" depends="jar">
+    <antcall target="-microbench" inheritrefs="true"/>
+  </target>
+
+  <target name="microbench-with-profiler" depends="jar">
+    <antcall target="-microbench-with-profiler" inheritrefs="true"/>
   </target>
 
   <!-- run arbitrary mains in tests, for example to run the long running memory tests with lots of memory pressure
       ant run-main -Dmainclass=org.apache.cassandra.utils.memory.LongBufferPoolTest -Dvmargs="-Xmx30m -XX:-UseGCOverheadLimit"
   -->
-  <target name="run-main" depends="build-test">
+  <target name="run-main" depends="maybe-build-test">
       <property name="mainclass" value="" />
       <property name="vmargs" value="" />
       <property name="args" value="" />
       <java classname="${mainclass}"
             fork="true"
             failonerror="true">
           <jvmarg value="-server" />
           <jvmarg value="-ea" />
           <jvmarg line="${vmargs}" />
           <arg line="${args}" />
           <classpath>
               <path refid="cassandra.classpath" />
               <pathelement location="${test.classes}"/>
               <pathelement location="${test.conf}"/>
               <fileset dir="${test.lib}">
-                  <include name="**/*.jar" />
+                  asm-<include name="**/*.jar" />
               </fileset>
           </classpath>
       </java>
   </target>
 
   <target name="_maybe_update_idea_to_java11" if="java.version.11">
     <replace file="${eclipse.project.name}.iml" token="JDK_1_8" value="JDK_11"/>
     <replace file=".idea/misc.xml" token="JDK_1_8" value="JDK_11"/>
     <replace file=".idea/misc.xml" token="1.8" value="11"/>
     <replaceregexp file=".idea/workspace.xml"
-                   match="name=&quot;VM_PARAMETERS&quot; value=&quot;(.*)&quot;"
-                   replace="name=&quot;VM_PARAMETERS&quot; value=&quot;\1 ${java11-jvmargs}&quot;"
+                   match="name=&quot;VM_PARAMETERS&quot; value=&quot;(.*)"
+                   replace="name=&quot;VM_PARAMETERS&quot; value=&quot;\1 ${java11-jvmargs}"
                    byline="true"/>
 
       <echo file=".idea/compiler.xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="JavacSettings">
-    <option name="ADDITIONAL_OPTIONS_STRING" value="--add-exports java.rmi/sun.rmi.registry=ALL-UNNAMED" />
+    <option name="ADDITIONAL_OPTIONS_STRING" value="--add-exports java.rmi/sun.rmi.registry=ALL-UNNAMED --add-exports java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED --add-exports java.rmi/sun.rmi.transport=ALL-UNNAMED" />
   </component>
 </project>]]></echo>
   </target>
 
   <!-- Generate IDEA project description files -->
   <target name="generate-idea-files" depends="init,maven-ant-tasks-init,resolver-dist-lib,gen-cql3-grammar,generate-jflex-java,createVersionPropFile" description="Generate IDEA files">
     <mkdir dir=".idea"/>
     <mkdir dir=".idea/libraries"/>
     <copy todir=".idea" overwrite="true">
         <fileset dir="ide/idea"/>
     </copy>
     <replace file=".idea/workspace.xml" token="trunk" value="${eclipse.project.name}"/>
+    <replace file=".idea/workspace.xml" token="-Dcassandra.use_nix_recursive_delete=true" value="-Dcassandra.use_nix_recursive_delete=${cassandra.use_nix_recursive_delete}"/>
     <copy tofile="${eclipse.project.name}.iml" file="ide/idea-iml-file.xml"/>
     <echo file=".idea/.name">Apache Cassandra ${eclipse.project.name}</echo>
     <echo file=".idea/modules.xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/]]>${eclipse.project.name}<![CDATA[.iml" filepath="$PROJECT_DIR$/]]>${eclipse.project.name}<![CDATA[.iml" />
     </modules>
   </component>
 </project>]]></echo>
       <antcall target="_maybe_update_idea_to_java11"/>
   </target>
 
   <!-- Generate Eclipse project description files -->
   <target name="generate-eclipse-files" depends="build-test" description="Generate eclipse files">
     <echo file=".project"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
   <name>${eclipse.project.name}</name>
   <comment></comment>
   <projects>
   </projects>
   <buildSpec>
     <buildCommand>
       <name>org.eclipse.jdt.core.javabuilder</name>
     </buildCommand>
   </buildSpec>
   <natures>
     <nature>org.eclipse.jdt.core.javanature</nature>
   </natures>
 </projectDescription>]]>
     </echo>
+    <path id="eclipse-project-libs-path">
+        <fileset dir="lib">
+            <include name="**/*.jar" />
+        </fileset>
+        <fileset dir="build/lib/jars">
+            <include name="**/*.jar" />
+        </fileset>
+        <fileset dir="build/test/lib/jars">
+            <include name="**/*.jar" />
+        </fileset>
+    </path>
+    <pathconvert property="eclipse-libs-list" refid="eclipse-project-libs-path" pathsep="${line.separator}">
+        <mapper>
+            <regexpmapper from="^(.*)$$" to='&lt;classpathentry kind="lib" path="\1" /&gt;'/>
+        </mapper>
+    </pathconvert>
+    <property name="eclipse-project-libs" refid="eclipse-project-libs-path"/>
     <echo file=".classpath"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
 <classpath>
   <classpathentry kind="src" path="src/java"/>
   <classpathentry kind="src" path="src/resources"/>
   <classpathentry kind="src" path="src/gen-java"/>
   <classpathentry kind="src" path="conf" including="hotspot_compiler"/>
   <classpathentry kind="src" output="build/test/classes" path="test/unit"/>
   <classpathentry kind="src" output="build/test/classes" path="test/long"/>
   <classpathentry kind="src" output="build/test/classes" path="test/distributed"/>
+  <classpathentry kind="src" output="build/test/classes" path="test/simulator/asm"/>
+  <classpathentry kind="src" output="build/test/classes" path="test/simulator/main"/>
   <classpathentry kind="src" output="build/test/classes" path="test/resources" />
   <classpathentry kind="src" path="tools/stress/src"/>
   <classpathentry kind="src" path="tools/fqltool/src"/>
   <classpathentry kind="src" output="build/test/stress-classes" path="tools/stress/test/unit" />
   <classpathentry kind="src" output="build/test/fqltool-classes" path="tools/fqltool/test/unit" />
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="output" path="build/classes/eclipse"/>
   <classpathentry kind="lib" path="test/conf"/>
   <classpathentry kind="lib" path="${java.home}/../lib/tools.jar"/>
+  ${eclipse-libs-list}
+</classpath>
 ]]>
-    </echo>
-      <path id="eclipse-project-libs-path">
-       <fileset dir="lib">
-          <include name="**/*.jar" />
-     </fileset>
-      <fileset dir="build/lib/jars">
-          <include name="**/*.jar" />
-       </fileset>
-     <fileset dir="build/test/lib/jars">
-        <include name="**/*.jar" />
-     </fileset>
-      </path>
-      <property name="eclipse-project-libs" refid="eclipse-project-libs-path"/>
-       <script language="javascript">
+	</echo>
+    <taskdef name="echoeclipseprojectslibs" classname="org.apache.cassandra.anttasks.EchoEclipseProjectLibs" classpath="${test.classes}">
         <classpath>
             <path refid="cassandra.classpath"/>
             <path refid="cassandra.classpath.test"/>
         </classpath>
-        <![CDATA[
-        var File = java.io.File;
-          var FilenameUtils = Packages.org.apache.commons.io.FilenameUtils;
-          jars = project.getProperty("eclipse-project-libs").split(project.getProperty("path.separator"));
-
-          cp = "";
-          for (i=0; i< jars.length; i++) {
-             srcjar = FilenameUtils.getBaseName(jars[i]) + '-sources.jar';
-           srcdir = FilenameUtils.concat(project.getProperty("build.test.dir"), 'sources');
-             srcfile = new File(FilenameUtils.concat(srcdir, srcjar));
-
-             cp += ' <classpathentry kind="lib" path="' + jars[i] + '"';
-             if (srcfile.exists()) {
-                cp += ' sourcepath="' + srcfile.getAbsolutePath() + '"';
-             }
-             cp += '/>\n';
-          }
-
-          cp += '</classpath>';
-
-          echo = project.createTask("echo");
-          echo.setMessage(cp);
-          echo.setFile(new File(".classpath"));
-          echo.setAppend(true);
-          echo.perform();
-      ]]> </script>
+    </taskdef>
     <mkdir dir=".settings" />
   </target>
 
   <pathconvert property="eclipse.project.name">
     <path path="${basedir}" />
     <regexpmapper from="^.*/([^/]+)$$" to="\1" handledirsep="yes" />
   </pathconvert>
 
   <!-- Clean Eclipse project description files -->
   <target name="clean-eclipse-files">
     <delete file=".project" />
     <delete file=".classpath" />
     <delete dir=".settings" />
-      <delete dir=".externalToolBuilders" />
-      <delete dir="build/eclipse-classes" />
+  	<delete dir=".externalToolBuilders" />
+  	<delete dir="build/eclipse-classes" />
   </target>
 
   <!-- ECJ 4.6.1 in standalone mode does not work with JPMS, so we skip this target for Java 11 -->
   <target name="eclipse-warnings" depends="build, _assert_rat_output" description="Run eclipse compiler code analysis" if="java.version.8">
         <property name="ecj.log.dir" value="${build.dir}/ecj" />
         <property name="ecj.warnings.file" value="${ecj.log.dir}/eclipse_compiler_checks.txt"/>
         <mkdir  dir="${ecj.log.dir}" />
 
         <property name="ecj.properties" value="${basedir}/eclipse_compiler.properties" />
 
         <echo message="Running Eclipse Code Analysis.  Output logged to ${ecj.warnings.file}" />
 
-    <java
-        jar="${build.dir.lib}/jars/ecj-${ecj.version}.jar"
+	<java
+	    jar="${build.dir.lib}/jars/ecj-${ecj.version}.jar"
             fork="true"
-        failonerror="true"
+	    failonerror="true"
             maxmemory="512m">
             <arg value="-source"/>
-        <arg value="${source.version}" />
-        <arg value="-target"/>
-        <arg value="${target.version}" />
-        <arg value="-d" />
+	    <arg value="${source.version}" />
+	    <arg value="-target"/>
+	    <arg value="${target.version}" />
+	    <arg value="-d" />
             <arg value="none" />
-        <arg value="-proc:none" />
+	    <arg value="-proc:none" />
             <arg value="-log" />
             <arg value="${ecj.warnings.file}" />
             <arg value="-properties" />
             <arg value="${ecj.properties}" />
             <arg value="-cp" />
             <arg value="${toString:cassandra.classpath}" />
             <arg value="${build.src.java}" />
         </java>
   </target>
 
+  <target name="init-checkstyle" depends="maven-ant-tasks-retrieve-build,build-project" unless="no-checkstyle">
+      <path id="checkstyle.lib.path">
+          <fileset dir="${test.lib}/jars" includes="*.jar"/>
+      </path>
+      <!-- Sevntu custom checks are retrieved by Ivy into lib folder
+         and will be accessible to checkstyle-->
+      <taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties"
+               classpathref="checkstyle.lib.path"/>
+  </target>
+
+  <target name="checkstyle" depends="init-checkstyle,maven-ant-tasks-retrieve-build,build-project" description="Run custom checkstyle code analysis" if="java.version.8" unless="no-checkstyle">
+      <property name="checkstyle.log.dir" value="${build.dir}/checkstyle" />
+      <property name="checkstyle.report.file" value="${checkstyle.log.dir}/checkstyle_report.xml"/>
+      <mkdir  dir="${checkstyle.log.dir}" />
+
+      <property name="checkstyle.properties" value="${build.helpers.dir}/checkstyle.xml" />
+      <property name="checkstyle.suppressions" value="${build.helpers.dir}/checkstyle_suppressions.xml" />
+      <checkstyle config="${checkstyle.properties}"
+                  failureProperty="checkstyle.failure"
+                  failOnViolation="true">
+          <formatter type="plain"/>
+          <formatter type="xml" tofile="${checkstyle.report.file}"/>
+          <fileset dir="${build.src.java}" includes="**/*.java"/>
+      </checkstyle>
+  </target>
+
+  <target name="checkstyle-test" depends="init-checkstyle,maven-ant-tasks-retrieve-build,build-project" description="Run custom checkstyle code analysis on tests" if="java.version.8" unless="no-checkstyle">
+      <property name="checkstyle.log.dir" value="${build.dir}/checkstyle" />
+      <property name="checkstyle_test.report.file" value="${checkstyle.log.dir}/checkstyle_report_test.xml"/>
+      <mkdir  dir="${checkstyle.log.dir}" />
+
+      <property name="checkstyle_test.properties" value="${build.helpers.dir}/checkstyle_test.xml" />
+      <property name="checkstyle.suppressions" value="${build.helpers.dir}/checkstyle_suppressions.xml" />
+      <checkstyle config="${checkstyle_test.properties}"
+                  failureProperty="checkstyle.failure"
+                  failOnViolation="true">
+          <formatter type="plain"/>
+          <formatter type="xml" tofile="${checkstyle_test.report.file}"/>
+          <fileset dir="${test.dir}" includes="**/*.java"/>
+      </checkstyle>
+  </target>
 
   <!-- Installs artifacts to local Maven repository -->
   <target name="mvn-install"
           depends="maven-declare-dependencies,jar,sources-jar,javadoc-jar"
           description="Installs the artifacts in the Maven Local Repository">
 
     <!-- the parent -->
     <install pomFile="${build.dir}/${final.name}-parent.pom"
              file="${build.dir}/${final.name}-parent.pom"
              packaging="pom"/>
 
     <!-- the cassandra-all jar -->
     <install pomFile="${build.dir}/${final.name}.pom"
              file="${build.dir}/${final.name}.jar"/>
     <install pomFile="${build.dir}/${final.name}.pom"
              file="${build.dir}/${final.name}-sources.jar"
              classifier="sources"/>
     <install pomFile="${build.dir}/${final.name}.pom"
              file="${build.dir}/${final.name}-javadoc.jar"
              classifier="javadoc"/>
   </target>
 
   <!-- Publish artifacts to remote Maven repository -->
   <target name="publish"
           depends="mvn-install,artifacts"
           description="Publishes the artifacts to the Maven repository">
 
     <!-- the parent -->
     <deploy pomFile="${build.dir}/${final.name}-parent.pom"
             file="${build.dir}/${final.name}-parent.pom"
             packaging="pom"/>
 
     <!-- the cassandra-all jar -->
     <deploy pomFile="${build.dir}/${final.name}.pom"
             file="${build.dir}/${final.name}.jar"/>
     <deploy pomFile="${build.dir}/${final.name}.pom"
             file="${build.dir}/${final.name}-sources.jar"
             classifier="sources"/>
     <deploy pomFile="${build.dir}/${final.name}.pom"
             file="${build.dir}/${final.name}-javadoc.jar"
             classifier="javadoc"/>
 
     <!-- the distribution -->
     <sign-dist file="${build.dir}/${final.name}-bin.tar.gz" />
     <sign-dist file="${build.dir}/${final.name}-src.tar.gz" />
 
   </target>
 
-  <import file="${basedir}/.build/build-resolver.xml"/>
-  <import file="${basedir}/.build/build-rat.xml"/>
-  <import file="${basedir}/.build/build-owasp.xml"/>
+  <import file="${build.helpers.dir}/build-resolver.xml"/>
+  <import file="${build.helpers.dir}/build-rat.xml"/>
+  <import file="${build.helpers.dir}/build-owasp.xml"/>
+  <import file="${build.helpers.dir}/build-cqlsh.xml"/>
+  <import file="${build.helpers.dir}/build-bench.xml"/>
 </project>
diff --git a/databases/cassandra4/files/maven/checkstyle.xml b/databases/cassandra4/files/maven/checkstyle.xml
new file mode 100644
index 000000000000..3d2b2919e8b7
--- /dev/null
+++ b/databases/cassandra4/files/maven/checkstyle.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!DOCTYPE module PUBLIC
+          "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+          "https://checkstyle.org/dtds/configuration_1_3.dtd">
+
+<module name="Checker">
+  <property name="severity" value="error"/>
+
+  <property name="fileExtensions" value="java, properties, xml"/>
+  
+  <property name="cacheFile" value="${checkstyle.log.dir}/checkstyle_cachefile"/>
+
+  <module name="BeforeExecutionExclusionFileFilter">
+    <property name="fileNamePattern" value="module\-info\.java$"/>
+  </module>
+
+  <!-- https://checkstyle.org/config_filters.html#SuppressionFilter -->
+  <!-- this exists only because for some reason the comment filter does not seem to work for Semaphore -->
+  <module name="SuppressionFilter">
+    <property name="file" value="${checkstyle.suppressions}"
+              default="checkstyle-suppressions.xml" />
+    <property name="optional" value="false"/>
+  </module>
+
+  <module name="TreeWalker">
+    <module name="SuppressWithNearbyCommentFilter">
+       <property name="commentFormat" value="checkstyle: permit this import"/>
+       <property name="checkFormat" value="IllegalImport"/>
+       <property name="influenceFormat" value="0"/>
+    </module>
+ 
+    <module name="SuppressWithNearbyCommentFilter">
+       <property name="commentFormat" value="checkstyle: permit this instantiation"/>
+       <property name="checkFormat" value="IllegalInstantiation"/>
+       <property name="influenceFormat" value="0"/>
+    </module>
+ 
+    <module name="SuppressWithNearbyCommentFilter">
+       <property name="commentFormat" value="checkstyle: permit system clock"/>
+       <property name="idFormat" value="blockSystemClock"/>
+       <property name="influenceFormat" value="0"/>
+    </module>
+
+    <module name="SuppressWithNearbyCommentFilter">
+      <property name="commentFormat" value="checkstyle: permit this invocation"/>
+      <property name="idFormat" value="blockPathToFile"/>
+      <property name="influenceFormat" value="0"/>
+    </module>
+ 
+    <module name="RegexpSinglelineJava">
+      <!-- block system time -->
+      <property name="id" value="blockSystemClock"/>
+      <property name="format" value="System\.(currentTimeMillis|nanoTime)"/>
+      <property name="ignoreComments" value="true"/>
+      <property name="message" value="Avoid System for time, should use org.apache.cassandra.utils.Clock.Global or org.apache.cassandra.utils.Clock interface" />
+    </module>
+
+    <module name="RegexpSinglelineJava">
+      <!-- block Instant.now -->
+      <property name="id" value="blockInstantNow"/>
+      <property name="format" value="Instant\.now"/>
+      <property name="ignoreComments" value="true"/>
+      <property name="message" value="Avoid Instant.now() for time, should use org.apache.cassandra.util.FBUtilities.now()" />
+    </module>
+
+    <module name="RegexpSinglelineJava">
+      <!-- block normal executors -->
+      <property name="id" value="blockExecutors"/>
+      <property name="format" value="newSingleThreadExecutor|newFixedThreadPool|newCachedThreadPool|newSingleThreadScheduledExecutor|newWorkStealingPool|newScheduledThreadPool|defaultThreadFactory"/>
+      <property name="ignoreComments" value="true"/>
+      <property name="message" value="Avoid creating an executor directly, should use org.apache.cassandra.concurrent.ExecutorFactory.Global#executorFactory" />
+    </module>
+    <module name="RegexpSinglelineJava">
+      <!-- block guavas directExecutor -->
+      <property name="id" value="blockGuavaDirectExecutor"/>
+      <property name="format" value="MoreExecutors\.directExecutor"/>
+      <property name="ignoreComments" value="true"/>
+      <property name="message" value="Avoid MoreExecutors.directExecutor() in favor of ImmediateExecutor.INSTANCE" />
+    </module>
+    <module name="IllegalImport">
+      <property name="illegalPkgs" value="junit.framework,org.jboss.byteman"/>
+      <property name="illegalClasses" value="java.io.File,java.io.FileInputStream,java.io.FileOutputStream,java.io.FileReader,java.io.FileWriter,java.io.RandomAccessFile,java.util.concurrent.Semaphore,java.util.concurrent.CountDownLatch,java.util.concurrent.Executors,java.util.concurrent.LinkedBlockingQueue,java.util.concurrent.SynchronousQueue,java.util.concurrent.ArrayBlockingQueue,com.google.common.util.concurrent.Futures,java.util.concurrent.CompletableFuture,io.netty.util.concurrent.Future,io.netty.util.concurrent.Promise,io.netty.util.concurrent.AbstractFuture,com.google.common.util.concurrent.ListenableFutureTask,com.google.common.util.concurrent.ListenableFuture,com.google.common.util.concurrent.AbstractFuture,java.nio.file.Paths"/>
+    </module>
+    <module name="IllegalInstantiation">
+      <property name="classes" value="java.io.File,java.lang.Thread,java.util.concurrent.FutureTask,java.util.concurrent.Semaphore,java.util.concurrent.CountDownLatch,java.util.concurrent.ScheduledThreadPoolExecutor,java.util.concurrent.ThreadPoolExecutor,java.util.concurrent.ForkJoinPool,java.lang.OutOfMemoryError"/>
+    </module>
+
+    <module name="RegexpSinglelineJava">
+      <!-- block Path#toFile() -->
+      <property name="id" value="blockPathToFile"/>
+      <property name="format" value="toFile\(\)"/>
+      <property name="message" value="Avoid Path#toFile(), as some implementations may not support it." />
+    </module>
+
+    <module name="RedundantImport"/>
+    <module name="UnusedImports"/>
+  </module>
+
+</module>
diff --git a/databases/cassandra4/files/maven/checkstyle_suppressions.xml b/databases/cassandra4/files/maven/checkstyle_suppressions.xml
new file mode 100644
index 000000000000..ed4d1443f7fc
--- /dev/null
+++ b/databases/cassandra4/files/maven/checkstyle_suppressions.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!DOCTYPE suppressions PUBLIC
+        "-//Checkstyle//DTD SuppressionFilter Configuration 1.1//EN"
+        "https://checkstyle.org/dtds/suppressions_1_1.dtd">
+
+<suppressions>
+  <suppress checks="RegexpSinglelineJava" files="Semaphore\.java"/>
+</suppressions>
diff --git a/databases/cassandra4/files/maven/checkstyle_test.xml b/databases/cassandra4/files/maven/checkstyle_test.xml
new file mode 100644
index 000000000000..5b6e16e8b2b2
--- /dev/null
+++ b/databases/cassandra4/files/maven/checkstyle_test.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!DOCTYPE module PUBLIC
+          "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+          "https://checkstyle.org/dtds/configuration_1_3.dtd">
+
+<module name="Checker">
+  <property name="severity" value="error"/>
+
+  <property name="fileExtensions" value="java, properties, xml"/>
+  
+  <property name="cacheFile" value="${checkstyle.log.dir}/checkstyle_test_cachefile"/>
+
+  <module name="BeforeExecutionExclusionFileFilter">
+    <property name="fileNamePattern" value="module\-info\.java$"/>
+  </module>
+
+  <!-- https://checkstyle.org/config_filters.html#SuppressionFilter -->
+  <!-- this exists only because for some reason the comment filter does not seem to work for Semaphore -->
+  <module name="SuppressionFilter">
+    <property name="file" value="${checkstyle.suppressions}"
+              default="checkstyle-suppressions.xml" />
+    <property name="optional" value="false"/>
+  </module>
+
+  <module name="TreeWalker">
+    <module name="SuppressWithNearbyCommentFilter">
+       <property name="commentFormat" value="checkstyle: permit this import"/>
+       <property name="checkFormat" value="IllegalImport"/>
+       <property name="influenceFormat" value="0"/>
+    </module>
+
+    <module name="SuppressWithNearbyCommentFilter">
+       <property name="commentFormat" value="checkstyle: permit this instantiation"/>
+       <property name="checkFormat" value="IllegalInstantiation"/>
+       <property name="influenceFormat" value="0"/>
+    </module>
+
+    <module name="IllegalImport">
+      <property name="illegalPkgs" value="junit.framework"/>
+      <property name="illegalClasses" value=""/>
+    </module>
+    <module name="IllegalInstantiation">
+      <property name="classes" value=""/>
+    </module>
+
+    <module name="RegexpSinglelineJava">
+      <property name="id" value="hardcodeTmpDirectoryUsage"/>
+      <property name="format" value="(File|Directory)\(&quot;/tmp"/>
+      <property name="ignoreComments" value="true"/>
+      <property name="message" value="Please do not hardcode '/tmp' for test files and directories. Use Files.createTempDirectory to create a base test directory instead." />
+    </module>
+
+    <module name="RedundantImport"/>
+    <module name="UnusedImports"/>
+  </module>
+
+</module>
diff --git a/databases/cassandra4/files/maven/dependency-check-suppressions.xml b/databases/cassandra4/files/maven/dependency-check-suppressions.xml
new file mode 100644
index 000000000000..b7c9921d8cea
--- /dev/null
+++ b/databases/cassandra4/files/maven/dependency-check-suppressions.xml
@@ -0,0 +1,76 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!--
+  copy suppressions / false positives here if there are any, how to do it is explained in
+  https://jeremylong.github.io/DependencyCheck/general/suppression.html
+-->
+<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
+    <suppress>
+        <!--  https://issues.apache.org/jira/browse/CASSANDRA-17907 -->
+        <packageUrl regex="true">^pkg:maven/org\.yaml/snakeyaml@.*$</packageUrl>
+        <cve>CVE-2022-1471</cve>
+        <cve>CVE-2022-25857</cve>
+        <cve>CVE-2022-38749</cve>
+        <cve>CVE-2022-38750</cve>
+        <cve>CVE-2022-38751</cve>
+        <cve>CVE-2022-38752</cve>
+        <cve>CVE-2022-41854</cve>
+    </suppress>
+    <suppress>
+        <!-- not applicable https://nvd.nist.gov/vuln/detail/CVE-2020-8908 -->
+        <packageUrl regex="true">^pkg:maven/com\.google\.guava/guava@.*$</packageUrl>
+        <cve>CVE-2020-8908</cve>
+        <cve>CVE-2023-2976</cve>
+    </suppress>
+    <!-- netty's http stuff is not applicable here -->
+    <suppress>
+        <packageUrl regex="true">^pkg:maven/io\.netty/netty\-.*@.*$</packageUrl>
+        <cve>CVE-2021-21290</cve>
+        <cve>CVE-2021-21295</cve>
+        <cve>CVE-2021-21409</cve>
+        <cve>CVE-2022-24823</cve>
+        <cve>CVE-2025-24970</cve>
+        <cve>CVE-2025-25193</cve>
+        <cve>CVE-2024-29025</cve>
+        <cve>CVE-2023-34462</cve>
+        <cve>CVE-2021-37136</cve>
+        <cve>CVE-2021-37137</cve>
+        <cve>CVE-2022-41881</cve>
+        <cve>CVE-2021-43797</cve>
+        <cve>CVE-2023-44487</cve>
+        <cve>CVE-2024-47535</cve>
+        <cve>CVE-2025-55163</cve>
+        <cve>CVE-2025-58056</cve>
+        <cve>CVE-2025-58057</cve>
+    </suppress>
+
+    <!-- https://issues.apache.org/jira/browse/CASSANDRA-19142 -->
+    <!-- https://issues.apache.org/jira/browse/CASSANDRA-20412 -->
+    <suppress>
+        <packageUrl regex="true">^pkg:maven/ch\.qos\.logback/logback\-core@.*$</packageUrl>
+        <cve>CVE-2023-6378</cve>
+        <cve>CVE-2024-12798</cve>
+        <cve>CVE-2024-12801</cve>
+    </suppress>
+    <suppress>
+        <packageUrl regex="true">^pkg:maven/ch\.qos\.logback/logback\-classic@.*$</packageUrl>
+        <cve>CVE-2023-6378</cve>
+        <cve>CVE-2024-12798</cve>
+        <cve>CVE-2024-12801</cve>
+    </suppress>
+</suppressions>
diff --git a/databases/cassandra4/files/maven/generate-snyk-file b/databases/cassandra4/files/maven/generate-snyk-file
new file mode 100644
index 000000000000..8c556abf62fd
--- /dev/null
+++ b/databases/cassandra4/files/maven/generate-snyk-file
@@ -0,0 +1,75 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""
+Regenerates the toplevel .snyk file from the dependency-check-suppressions.xml found in this directory.
+"""
+
+import re
+import os
+
+
+script_dir = os.path.dirname(os.path.abspath(__file__))
+with open(os.path.join(script_dir, "dependency-check-suppressions.xml"), "r") as f:
+    xml_lines = [line.strip() for line in f.readlines()]
+
+snyk_data = {"ignore": {}}
+
+# Parse XML (keeping track of comments)
+last_comment = None
+i = 0
+while i < len(xml_lines):
+    # Detect XML comments (these contain the suppression reason)
+    if xml_lines[i].startswith("<!--") and xml_lines[i].endswith("-->"):
+        last_comment = xml_lines[i][4:-3].strip()
+
+    # Collect CVE suppressions
+    if "<suppress>" in xml_lines[i]:
+        cve_ids = []
+        packages = ''
+        i += 1
+        while i < len(xml_lines):
+            if xml_lines[i].startswith("<!--") and xml_lines[i].endswith("-->"):
+                last_comment = xml_lines[i][4:-3].strip() 
+            if "<cve>" in xml_lines[i] and "</cve>" in xml_lines[i]:
+                cve_ids.append(xml_lines[i].strip().replace("<cve>", "").replace("</cve>", "").strip())
+            if "<packageUrl" in xml_lines[i] and "</packageUrl>" in xml_lines[i]:
+                packages = re.sub(r'<packageUrl(?: regex="(?:true|false)")?>|</packageUrl>', '', xml_lines[i]).strip()
+            if "</suppress>" in xml_lines[i]:
+                break
+            i += 1
+        reason = (last_comment + " -- " + packages) if last_comment else "Suppressed due to internal review, see project's .build/dependency-check-suppressions.xml"
+
+        # Add suppressions
+        for cve_id in cve_ids:
+            snyk_data["ignore"][cve_id] = [{"reason": reason}]
+
+        last_comment = None
+    else:
+        i += 1
+
+with open(os.path.join(script_dir, "../.snyk"), "w") as snyk_file:
+    snyk_file.write("# Snyk (https://snyk.io) policy file, provides ignores for known false positives.\n")
+    snyk_file.write("# This file is autogenerated from .build/dependency-check-suppressions.xml\n")
+    snyk_file.write("version: v1.25.0\n")
+    snyk_file.write("ignore:\n")
+    for cve_id, ignores in sorted(snyk_data["ignore"].items()):
+        snyk_file.write("  {}:\n".format(cve_id))
+        for ignore in ignores:
+            snyk_file.write("    - reason: {}\n".format(ignore['reason']))
+
diff --git a/databases/cassandra4/files/patch-bin_cassandra b/databases/cassandra4/files/patch-bin_cassandra
deleted file mode 100644
index 40ea8dcd46d8..000000000000
--- a/databases/cassandra4/files/patch-bin_cassandra
+++ /dev/null
@@ -1,20 +0,0 @@
---- bin/cassandra.orig	2020-04-10 22:29:25 UTC
-+++ bin/cassandra
-@@ -31,7 +31,7 @@
- #   JVM_OPTS -- Additional arguments to the JVM for heap size, etc
- #   JVM_ON_OUT_OF_MEMORY_ERROR_OPT -- The OnOutOfMemoryError JVM option if specified
- #   CASSANDRA_CONF -- Directory containing Cassandra configuration files.
--#   CASSANDRA_LOG_DIR -- Directory containing logs(default: $CASSANDRA_HOME/logs).
-+#   CASSANDRA_LOG_DIR -- Directory containing logs(default: /var/log/cassandra).
- #
- # As a convenience, a fragment of shell is sourced in order to set one or
- # more of these variables. This so-called `include' can be placed in a 
-@@ -116,7 +116,7 @@ if [ -f "$CASSANDRA_CONF/cassandra-env.sh" ]; then
- fi
- 
- if [ -z "$CASSANDRA_LOG_DIR" ]; then
--  CASSANDRA_LOG_DIR=$CASSANDRA_HOME/logs
-+  CASSANDRA_LOG_DIR=/var/log/cassandra
- fi
- 
- # Special-case path variables.
diff --git a/databases/cassandra4/files/patch-bin_cqlsh b/databases/cassandra4/files/patch-bin_cqlsh
index 8797af062ef5..afaf9f76089a 100644
--- a/databases/cassandra4/files/patch-bin_cqlsh
+++ b/databases/cassandra4/files/patch-bin_cqlsh
@@ -1,11 +1,11 @@
---- bin/cqlsh.orig	2022-05-06 16:40:06 UTC
+--- bin/cqlsh.orig	2026-03-17 23:20:36 UTC
 +++ bin/cqlsh
-@@ -88,7 +88,7 @@ if [ "$USER_SPECIFIED_PYTHON" != "" ]; then
+@@ -90,7 +90,7 @@ else
      # run a user specified Python interpreter
      run_if_supported_version "$USER_SPECIFIED_PYTHON" "$@"
  else
--    for interpreter in python3 python python2.7; do
-+    for interpreter in python3 python3.9 python3.8 python3.7 python3.6 python python2.7; do
+-    for interpreter in python3 python; do
++    for interpreter in /usr/local/bin/python3.11 python3 python3.9 python3.8 python3.7 python3.6 python; do
          run_if_supported_version "$interpreter" "$@"
      done
  fi
diff --git a/databases/cassandra4/files/patch-build.xml b/databases/cassandra4/files/patch-build.xml
index 260d784805f8..16b174272d46 100644
--- a/databases/cassandra4/files/patch-build.xml
+++ b/databases/cassandra4/files/patch-build.xml
@@ -1,179 +1,179 @@
---- build.xml.orig	2022-07-12 10:18:13 UTC
+--- build.xml.orig	2026-03-17 23:20:36 UTC
 +++ build.xml
-@@ -31,6 +31,7 @@
-     <property file="build.properties" />
+@@ -32,6 +32,7 @@ -->
      <property file="build.properties.default" />
+     <property file="${user.home}/.ant/build.properties"/>
      <property name="debuglevel" value="source,lines,vars"/>
 +    <property name="pycmd" value="python"/>
  
      <!-- default version and SCM information -->
-     <property name="base.version" value="4.0.5"/>
-@@ -81,7 +82,7 @@
+     <property name="base.version" value="4.1.11"/>
+@@ -93,7 +94,7 @@ -->
      <condition property="version" value="${base.version}">
        <isset property="release"/>
      </condition>
 -    <property name="version" value="${base.version}-SNAPSHOT"/>
 +    <property name="version" value="${base.version}"/>
      <property name="version.properties.dir"
                value="${build.src.resources}/org/apache/cassandra/config/" />
      <property name="final.name" value="${ant.project.name}-${version}"/>
-@@ -288,6 +289,24 @@
+@@ -350,6 +351,24 @@ -->
              <exclude name="**/ant-*.jar"/>
          </fileset>
      </path>
 +    <path id="cassandra.classpath.staged">
 +        <file file="${build.dir}/${final.name}.jar"/> <!-- we need the jar for tests and benchmarks (multi-version jar) -->
 +        <fileset dir="${stagedlib}">
 +            <include name="**/*.jar" />
 +        </fileset>
 +        <fileset dir="${build.dir.lib}">
 +            <include name="**/assertj-core-3.15.0.jar" />
 +            <include name="**/byteman*.jar" />
 +            <include name="**/commons-lang-2.4.jar" />
 +            <include name="**/commons-collections-3.2.1.jar" />
 +            <include name="**/ohc-core-0.5.1.jar" />
 +            <include name="**/ohc-core-j8-0.5.1.jar" />
 +        </fileset>
 +        <fileset dir="${test.lib}/jars">
 +            <include name="**/*.jar" />
 +            <exclude name="**/ant-*.jar"/>
 +        </fileset>
 +    </path>
  
    <macrodef name="create-javadoc">
      <attribute name="destdir"/>
-@@ -297,7 +316,7 @@
-         windowtitle="${ant.project.name} API" classpathref="cassandra.classpath"
-         bottom="Copyright &amp;copy; 2009-2022 The Apache Software Foundation"
-         useexternalfile="yes" encoding="UTF-8" failonerror="false"
--        maxmemory="256m" additionalparam="${jdk11-javadoc-exports}">
-+        maxmemory="512m" additionalparam="${jdk11-javadoc-exports}">
-         <filesets/>
-       </javadoc>
-       <fail message="javadoc failed">
-@@ -438,6 +457,8 @@
+@@ -501,6 +520,8 @@ -->
      <target name="gen-doc" description="Generate documentation" depends="gen-asciidoc,generate-cql-html" unless="ant.gen-doc.skip">
          <exec executable="make" osfamily="unix" dir="${doc.dir}">
              <arg value="html"/>
 +            <arg value="PYTHON_CMD=${pycmd}"/>
 +            <arg value="PYTHON_VER=${pyver}"/>
          </exec>
      </target>
  
-@@ -896,7 +917,7 @@
+@@ -965,7 +986,7 @@ -->
+     <!--
+         The build target builds all the .class files
+     -->
+-    <target name="build" depends="resolver-retrieve-build,build-project,checkstyle" description="Compile Cassandra classes"/>
++    <target name="build" depends="resolver-retrieve-build,build-project" description="Compile Cassandra classes"/>
+     <target name="_build_unsafe" depends="resolver-retrieve-build,build-project" description="Compile Cassandra classes without checks"/>
+     <target name="codecoverage" depends="jacoco-run,jacoco-report" description="Create code coverage report"/>
+ 
+@@ -986,7 +1007,7 @@ -->
          </javac>
      </target>
  
 -    <target depends="init,gen-cql3-grammar,generate-cql-html,generate-jflex-java,rat-check"
 +    <target depends="init,gen-cql3-grammar,generate-cql-html,generate-jflex-java"
              name="build-project">
          <echo message="${ant.project.name}: ${ant.file}"/>
          <!-- Order matters! -->
-@@ -1147,6 +1168,89 @@
+@@ -1339,6 +1360,89 @@ -->
        </copy>
      </target>
  
 +    <!-- FreeBSD for staging -->
 +    <target name="freebsd-stage" depends="jar"
 +            description="Create Cassandra directory structure for staging">
 +      <mkdir dir="${dist.dir}"/>
 +      <copy todir="${dist.dir}/lib">
 +        <fileset dir="${build.lib}">
 +          <exclude name="sigar*.jar"/>
 +          <exclude name="sigar-bin/*"/>
 +          <exclude name="snappy*.jar"/>
 +          <exclude name="netty-all*.jar"/>
 +          <exclude name="ohc*.jar"/>
 +          <exclude name="licenses/snappy*.txt"/>
 +          <exclude name="licenses/netty-all*.txt"/>
 +          <exclude name="licenses/ohc*.txt"/>
 +        </fileset>
 +        <fileset dir="${build.dir}">
 +          <include name="${final.name}.jar" />
 +        </fileset>
 +      </copy>
 +      <copy todir="${dist.dir}/bin">
 +        <fileset dir="bin">
 +	  <exclude name="*.bat" />
 +	  <exclude name="*.ps1" />
 +	  <exclude name="*.orig" />
 +	</fileset>
 +      </copy>
 +      <copy todir="${dist.dir}/conf">
 +        <fileset dir="conf">
 +          <exclude name="*.ps1" />
 +	  <exclude name="*.orig" />
 +        </fileset>
 +      </copy>
 +      <copy todir="${dist.dir}/pylib">
 +        <fileset dir="pylib">
 +          <include name="**" />
 +          <exclude name="**/*.pyc" />
 +          <exclude name="Dockerfile.ubuntu.*" />
 +          <exclude name="cqlshlib/test/**" />
 +          <exclude name="cassandra-cqlsh-tests.sh" />
 +        </fileset>
 +      </copy>
 +      <copy todir="${dist.dir}/">
 +        <fileset dir="${basedir}">
 +          <include name="*.txt" />
 +        </fileset>
 +      </copy>
 +      <copy todir="${dist.dir}/tools/bin">
 +        <fileset dir="${basedir}/tools/bin">
 +          <exclude name="*.bat" />
 +          <exclude name="*.ps1" />
 +	  <exclude name="*.orig" />
 +        </fileset>
 +      </copy>
 +      <copy todir="${dist.dir}/tools/">
 +        <fileset dir="${basedir}/tools/">
 +            <include name="*.yaml"/>
 +	</fileset>
 +      </copy>
 +      <copy todir="${dist.dir}/tools/lib">
 +        <fileset dir="${build.dir}/tools/lib/">
 +            <include name="*.jar" />
 +        </fileset>
 +      </copy>
 +    </target>
 +
 +    <target name="freebsd-stage-doc" depends="freebsd-stage,javadoc,gen-doc"
 +            description="Create Cassandra directory structure for staging, including docs">
 +      <copy todir="${dist.dir}/javadoc">
 +        <fileset dir="${javadoc.dir}"/>
 +      </copy>
 +      <copy todir="${dist.dir}/doc">
 +        <fileset dir="doc">
 +          <include name="cql3/CQL.html" />
 +          <include name="cql3/CQL.css" />
 +          <include name="SASI.md" />
 +        </fileset>
 +      </copy>
 +      <copy todir="${dist.dir}/doc/html">
 +        <fileset dir="doc" />
 +        <globmapper from="build/html/*" to="*"/>
 +      </copy>
 +    </target>
 +    
      <!-- creates release tarballs -->
-     <target name="artifacts" depends="_artifacts-init,gen-doc,sources-jar,javadoc-jar"
+     <target name="artifacts" depends="_artifacts-init,gen-doc,sources-jar"
              description="Create Cassandra release artifacts">
-@@ -1397,7 +1501,7 @@
-           <pathelement path="${java.class.path}"/>
+@@ -1621,7 +1725,7 @@ -->
            <pathelement location="${stress.build.classes}"/>
            <pathelement location="${fqltool.build.classes}"/>
+           <pathelement location="${test.classes}"/>
 -          <path refid="cassandra.classpath.test" />
 +          <path refid="cassandra.classpath.staged" />
-           <pathelement location="${test.classes}"/>
            <pathelement location="${stress.test.classes}"/>
            <pathelement location="${fqltool.test.classes}"/>
-@@ -2089,7 +2193,7 @@
+           <pathelement location="${test.conf}"/>
+@@ -2302,7 +2406,7 @@ -->
    </target>
  
    <!-- ECJ 4.6.1 in standalone mode does not work with JPMS, so we skip this target for Java 11 -->
 -  <target name="eclipse-warnings" depends="build, _assert_rat_output" description="Run eclipse compiler code analysis" if="java.version.8">
 +  <target name="eclipse-warnings" depends="build" description="Run eclipse compiler code analysis" if="java.version.8">
          <property name="ecj.log.dir" value="${build.dir}/ecj" />
          <property name="ecj.warnings.file" value="${ecj.log.dir}/eclipse_compiler_checks.txt"/>
          <mkdir  dir="${ecj.log.dir}" />
diff --git a/databases/cassandra4/files/patch-conf_cassandra.yaml b/databases/cassandra4/files/patch-conf_cassandra.yaml
index ceb30f186b12..319a2b46d3ff 100644
--- a/databases/cassandra4/files/patch-conf_cassandra.yaml
+++ b/databases/cassandra4/files/patch-conf_cassandra.yaml
@@ -1,71 +1,71 @@
---- conf/cassandra.yaml.orig	2022-05-06 16:40:06 UTC
+--- conf/cassandra.yaml.orig	2026-03-17 23:20:36 UTC
 +++ conf/cassandra.yaml
-@@ -77,7 +77,7 @@ max_hints_delivery_threads: 2
+@@ -79,7 +79,7 @@ max_hints_delivery_threads: 2
  
  # Directory where Cassandra should store hints.
  # If not set, the default directory is $CASSANDRA_HOME/data/hints.
 -# hints_directory: /var/lib/cassandra/hints
 +hints_directory: /var/db/cassandra/hints
  
  # How often hints should be flushed from the internal buffers to disk.
  # Will *not* trigger fsync.
-@@ -204,8 +204,8 @@ partitioner: org.apache.cassandra.dht.Murmur3Partition
+@@ -309,8 +309,8 @@ partitioner: org.apache.cassandra.dht.Murmur3Partition
  # directories are specified, Cassandra will spread data evenly across 
  # them by partitioning the token ranges.
  # If not set, the default directory is $CASSANDRA_HOME/data/data.
 -# data_file_directories:
 -#     - /var/lib/cassandra/data
 +data_file_directories:
 +    - /var/db/cassandra/data
  
  # Directory were Cassandra should store the data of the local system keyspaces.
  # By default Cassandra will store the data of the local system keyspaces in the first of the data directories specified
-@@ -217,7 +217,7 @@ partitioner: org.apache.cassandra.dht.Murmur3Partition
+@@ -322,7 +322,7 @@ partitioner: org.apache.cassandra.dht.Murmur3Partition
  # commit log.  when running on magnetic HDD, this should be a
  # separate spindle than the data directories.
  # If not set, the default directory is $CASSANDRA_HOME/data/commitlog.
 -# commitlog_directory: /var/lib/cassandra/commitlog
 +commitlog_directory: /var/db/cassandra/commitlog
  
  # Enable / disable CDC functionality on a per-node basis. This modifies the logic used
  # for write path allocation rejection (standard: never reject. cdc: reject Mutation
-@@ -228,7 +228,7 @@ cdc_enabled: false
+@@ -333,7 +333,7 @@ cdc_enabled: false
  # segment contains mutations for a CDC-enabled table. This should be placed on a
  # separate spindle than the data directories. If not set, the default directory is
  # $CASSANDRA_HOME/data/cdc_raw.
 -# cdc_raw_directory: /var/lib/cassandra/cdc_raw
 +cdc_raw_directory: /var/db/cassandra/cdc_raw
  
  # Policy for data disk failures:
  #
-@@ -320,20 +320,12 @@ key_cache_save_period: 14400
+@@ -428,20 +428,12 @@ key_cache_save_period: 4h
  
  # Row cache implementation class name. Available implementations:
  #
 -# org.apache.cassandra.cache.OHCProvider
 -#   Fully off-heap row cache implementation (default).
 -#
  # org.apache.cassandra.cache.SerializingCacheProvider
  #   This is the row cache implementation availabile
  #   in previous releases of Cassandra.
 -# row_cache_class_name: org.apache.cassandra.cache.OHCProvider
 +# row_cache_class_name: org.apache.cassandra.cache.SerializingCacheProvider
  
  # Maximum size of the row cache in memory.
 -# Please note that OHC cache implementation requires some additional off-heap memory to manage
 -# the map structures and some in-flight memory during operations before/after cache entries can be
 -# accounted against the cache capacity. This overhead is usually small compared to the whole capacity.
 -# Do not specify more memory that the system can afford in the worst usual situation and leave some
 -# headroom for OS block level cache. Do never allow your system to swap.
  #
  # Default value is 0, to disable row caching.
- row_cache_size_in_mb: 0
-@@ -380,7 +372,7 @@ counter_cache_save_period: 7200
+ # Min unit: MiB
+@@ -492,7 +484,7 @@ counter_cache_save_period: 7200s
  
  # saved caches
  # If not set, the default directory is $CASSANDRA_HOME/data/saved_caches.
 -# saved_caches_directory: /var/lib/cassandra/saved_caches
 +saved_caches_directory: /var/db/cassandra/saved_caches
  
  # Number of seconds the server will wait for each cache (row, key, etc ...) to load while starting
- # the Cassandra process. Setting this to a negative value is equivalent to disabling all cache loading on startup
+ # the Cassandra process. Setting this to zero is equivalent to disabling all cache loading on startup
diff --git a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_config_Config.java b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_config_Config.java
index 86e8c2a152bf..dc1b6afedc6b 100644
--- a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_config_Config.java
+++ b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_config_Config.java
@@ -1,11 +1,11 @@
---- src/java/org/apache/cassandra/config/Config.java.orig	2022-05-06 16:40:06 UTC
+--- src/java/org/apache/cassandra/config/Config.java.orig	2026-03-17 23:20:36 UTC
 +++ src/java/org/apache/cassandra/config/Config.java
-@@ -304,7 +304,7 @@ public class Config
-     public volatile int key_cache_save_period = 14400;
-     public volatile int key_cache_keys_to_save = Integer.MAX_VALUE;
+@@ -445,7 +445,7 @@ public class Config
+     @Replaces(oldName = "key_cache_save_period", converter = Converters.SECONDS_CUSTOM_DURATION)
+     public volatile DurationSpec.IntSecondsBound key_cache_save_period = new DurationSpec.IntSecondsBound("4h");
  
 -    public String row_cache_class_name = "org.apache.cassandra.cache.OHCProvider";
 +    public String row_cache_class_name = "org.apache.cassandra.cache.SerializingCacheProvider";
-     public long row_cache_size_in_mb = 0;
-     public volatile int row_cache_save_period = 0;
-     public volatile int row_cache_keys_to_save = Integer.MAX_VALUE;
+     @Replaces(oldName = "row_cache_size_in_mb", converter = Converters.MEBIBYTES_DATA_STORAGE_LONG, deprecated = true)
+     public DataStorageSpec.LongMebibytesBound row_cache_size = new DataStorageSpec.LongMebibytesBound("0MiB");
+     @Replaces(oldName = "row_cache_save_period", converter = Converters.SECONDS_CUSTOM_DURATION)
diff --git a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_db_commitlog_MemoryMappedSegment.java b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_db_commitlog_MemoryMappedSegment.java
index f70f7674b3ae..610828729281 100644
--- a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_db_commitlog_MemoryMappedSegment.java
+++ b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_db_commitlog_MemoryMappedSegment.java
@@ -1,11 +1,11 @@
 --- src/java/org/apache/cassandra/db/commitlog/MemoryMappedSegment.java.orig	2019-10-24 16:42:10 UTC
 +++ src/java/org/apache/cassandra/db/commitlog/MemoryMappedSegment.java
 @@ -90,7 +90,7 @@ public class MemoryMappedSegment extends CommitLogSegm
          {
              throw new FSWriteError(e, getPath());
          }
--        NativeLibrary.trySkipCache(fd, startMarker, nextMarker, logFile.getAbsolutePath());
-+//        NativeLibrary.trySkipCache(fd, startMarker, nextMarker, logFile.getAbsolutePath());
+-        NativeLibrary.trySkipCache(fd, startMarker, nextMarker, logFile.absolutePath());
++//        NativeLibrary.trySkipCache(fd, startMarker, nextMarker, logFile.absolutePath());
      }
  
      @Override
diff --git a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_NativeTransportService.java b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_NativeTransportService.java
index 1b1c2d0aadf3..14d877271d6f 100644
--- a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_NativeTransportService.java
+++ b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_NativeTransportService.java
@@ -1,18 +1,18 @@
---- src/java/org/apache/cassandra/service/NativeTransportService.java.orig	2020-12-18 17:35:13 UTC
+--- src/java/org/apache/cassandra/service/NativeTransportService.java.orig	2023-05-25 14:13:38 UTC
 +++ src/java/org/apache/cassandra/service/NativeTransportService.java
-@@ -159,12 +159,15 @@ public class NativeTransportService
+@@ -160,12 +160,15 @@ public class NativeTransportService
       */
      public static boolean useEpoll()
      {
 +        /*
          final boolean enableEpoll = Boolean.parseBoolean(System.getProperty("cassandra.native.epoll.enabled", "true"));
  
          if (enableEpoll && !Epoll.isAvailable() && NativeLibrary.osType == NativeLibrary.OSType.LINUX)
              logger.warn("epoll not available", Epoll.unavailabilityCause());
  
          return enableEpoll && Epoll.isAvailable();
 +        */
 +        return false; // Epoll is only available for Linux. Prevent warning given that we otherwise pass ourselves off as Linux.
      }
  
      /**
diff --git a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_StartupChecks.java b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_StartupChecks.java
index 6f62b1c83ef8..0f46975e5a62 100644
--- a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_StartupChecks.java
+++ b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_StartupChecks.java
@@ -1,18 +1,17 @@
---- src/java/org/apache/cassandra/service/StartupChecks.java.orig	2021-03-26 19:57:28 UTC
+--- src/java/org/apache/cassandra/service/StartupChecks.java.orig	2023-05-25 14:13:38 UTC
 +++ src/java/org/apache/cassandra/service/StartupChecks.java
-@@ -281,7 +281,14 @@ public class StartupChecks
-     {
-         public void execute()
+@@ -363,7 +363,13 @@ public class StartupChecks
          {
+             if (options.isDisabled(getStartupCheckType()))
+                 return;
 -            SigarLibrary.instance.warnIfRunningInDegradedMode();
 +            try {
 +                @SuppressWarnings("unused")
 +                Class<?> loadMe = org.hyperic.sigar.SigarException.class;
-+                
 +                SigarLibrary.instance.warnIfRunningInDegradedMode();
 +            } catch (NoClassDefFoundError e) {
 +                logger.info("Could not initialize SIGAR library: SIGAR option not selected during install or jar no longer available.");
 +            }
          }
      };
  
diff --git a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_utils_FastByteOperations.java b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_utils_FastByteOperations.java
index 3f18ded96bcb..6cae029643ef 100644
--- a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_utils_FastByteOperations.java
+++ b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_utils_FastByteOperations.java
@@ -1,108 +1,108 @@
---- src/java/org/apache/cassandra/utils/FastByteOperations.java.orig	2020-12-18 17:35:13 UTC
+--- src/java/org/apache/cassandra/utils/FastByteOperations.java.orig	2026-03-17 23:20:36 UTC
 +++ src/java/org/apache/cassandra/utils/FastByteOperations.java
-@@ -205,6 +205,20 @@ public class FastByteOperations
+@@ -210,6 +210,20 @@ public class FastByteOperations
  
          static final boolean BIG_ENDIAN = ByteOrder.nativeOrder().equals(ByteOrder.BIG_ENDIAN);
  
 +        private static byte unsafeGetByte(Object o, long offset)
 +        {
 +            return o == null
 +                    ? theUnsafe.getByte(offset)
 +                    : theUnsafe.getByte(o, offset);
 +        }
 +
 +        private static long unsafeGetLong(Object o, long offset)
 +        {
 +            return o == null
 +                    ? theUnsafe.getLong(offset)
 +                    : theUnsafe.getLong(o, offset);
 +        }
 +
          public int compare(byte[] buffer1, int offset1, int length1, byte[] buffer2, int offset2, int length2)
          {
              return compareTo(buffer1, BYTE_ARRAY_BASE_OFFSET + offset1, length1,
-@@ -228,7 +242,7 @@ public class FastByteOperations
+@@ -233,7 +247,7 @@ public class FastByteOperations
              else
              {
                  obj1 = null;
 -                offset1 = theUnsafe.getLong(buffer1, DIRECT_BUFFER_ADDRESS_OFFSET) + position1;
 +                offset1 = unsafeGetLong(buffer1, DIRECT_BUFFER_ADDRESS_OFFSET) + position1;
              }
  
              return compareTo(obj1, offset1, length1, buffer2, BYTE_ARRAY_BASE_OFFSET + offset2, length2);
-@@ -249,7 +263,7 @@ public class FastByteOperations
+@@ -254,7 +268,7 @@ public class FastByteOperations
              if (src.hasArray())
                  System.arraycopy(src.array(), src.arrayOffset() + srcPosition, trg, trgPosition, length);
              else
 -                copy(null, srcPosition + theUnsafe.getLong(src, DIRECT_BUFFER_ADDRESS_OFFSET), trg, trgPosition, length);
 +                copy(null, srcPosition + unsafeGetLong(src, DIRECT_BUFFER_ADDRESS_OFFSET), trg, trgPosition, length);
          }
  
          public void copy(byte[] src, int srcPosition, ByteBuffer trg, int trgPosition, int length)
-@@ -272,7 +286,7 @@ public class FastByteOperations
+@@ -277,7 +291,7 @@ public class FastByteOperations
              else
              {
                  src = null;
 -                srcOffset = theUnsafe.getLong(srcBuf, DIRECT_BUFFER_ADDRESS_OFFSET);
 +                srcOffset = unsafeGetLong(srcBuf, DIRECT_BUFFER_ADDRESS_OFFSET);
              }
              copy(src, srcOffset + srcPosition, trgBuf, trgPosition, length);
          }
-@@ -282,7 +296,7 @@ public class FastByteOperations
+@@ -287,7 +301,7 @@ public class FastByteOperations
              if (trgBuf.hasArray())
                  copy(src, srcOffset, trgBuf.array(), trgBuf.arrayOffset() + trgPosition, length);
              else
 -                copy(src, srcOffset, null, trgPosition + theUnsafe.getLong(trgBuf, DIRECT_BUFFER_ADDRESS_OFFSET), length);
 +                copy(src, srcOffset, null, trgPosition + unsafeGetLong(trgBuf, DIRECT_BUFFER_ADDRESS_OFFSET), length);
          }
  
          public static void copy(Object src, long srcOffset, byte[] trg, int trgPosition, int length)
-@@ -290,7 +304,7 @@ public class FastByteOperations
+@@ -295,7 +309,7 @@ public class FastByteOperations
              if (length <= MIN_COPY_THRESHOLD)
              {
                  for (int i = 0 ; i < length ; i++)
 -                    trg[trgPosition + i] = theUnsafe.getByte(src, srcOffset + i);
 +                    trg[trgPosition + i] = unsafeGetByte(src, srcOffset + i);
              }
              else
              {
-@@ -329,7 +343,7 @@ public class FastByteOperations
+@@ -334,7 +348,7 @@ public class FastByteOperations
              else
              {
                  obj1 = null;
 -                offset1 = theUnsafe.getLong(buffer1, DIRECT_BUFFER_ADDRESS_OFFSET);
 +                offset1 = unsafeGetLong(buffer1, DIRECT_BUFFER_ADDRESS_OFFSET);
              }
              offset1 += buffer1.position();
              length1 = buffer1.remaining();
-@@ -352,7 +366,7 @@ public class FastByteOperations
+@@ -357,7 +371,7 @@ public class FastByteOperations
              else
              {
                  obj2 = null;
 -                offset2 = theUnsafe.getLong(buffer, DIRECT_BUFFER_ADDRESS_OFFSET);
 +                offset2 = unsafeGetLong(buffer, DIRECT_BUFFER_ADDRESS_OFFSET);
              }
              int length2 = limit - position;
              offset2 += position;
-@@ -385,8 +399,8 @@ public class FastByteOperations
+@@ -390,8 +404,8 @@ public class FastByteOperations
              int wordComparisons = minLength & ~7;
              for (int i = 0; i < wordComparisons ; i += Longs.BYTES)
              {
 -                long lw = theUnsafe.getLong(buffer1, memoryOffset1 + i);
 -                long rw = theUnsafe.getLong(buffer2, memoryOffset2 + i);
 +                long lw = unsafeGetLong(buffer1, memoryOffset1 + i);
 +                long rw = unsafeGetLong(buffer2, memoryOffset2 + i);
  
                  if (lw != rw)
                  {
-@@ -399,8 +413,8 @@ public class FastByteOperations
+@@ -404,8 +418,8 @@ public class FastByteOperations
  
              for (int i = wordComparisons ; i < minLength ; i++)
              {
 -                int b1 = theUnsafe.getByte(buffer1, memoryOffset1 + i) & 0xFF;
 -                int b2 = theUnsafe.getByte(buffer2, memoryOffset2 + i) & 0xFF;
 +                int b1 = unsafeGetByte(buffer1, memoryOffset1 + i) & 0xFF;
 +                int b2 = unsafeGetByte(buffer2, memoryOffset2 + i) & 0xFF;
                  if (b1 != b2)
                      return b1 - b2;
              }
diff --git a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_utils_NativeLibrary.java b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_utils_NativeLibrary.java
index c9ff8e59e786..991989ee7013 100644
--- a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_utils_NativeLibrary.java
+++ b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_utils_NativeLibrary.java
@@ -1,14 +1,14 @@
---- src/java/org/apache/cassandra/utils/NativeLibrary.java.orig	2020-08-28 13:55:56 UTC
+--- src/java/org/apache/cassandra/utils/NativeLibrary.java.orig	2023-05-25 14:13:37 UTC
 +++ src/java/org/apache/cassandra/utils/NativeLibrary.java
-@@ -143,7 +143,10 @@ public final class NativeLibrary
-         else if (osName.contains("windows"))
-             return WINDOWS;
+@@ -140,7 +140,10 @@ public final class NativeLibrary
+         else if (osName.contains("mac"))
+             return MAC;
  
--        logger.warn("the current operating system, {}, is unsupported by cassandra", osName);
+-        logger.warn("the current operating system, {}, is unsupported by Cassandra", osName);
 +        if (osName.contains("bsd"))
-+            logger.warn("the current operating system, {}, is fantastic, though not officially supported by cassandra", osName);
++            logger.warn("the current operating system, {}, is fantastic, though not officially supported by Cassandra", osName);
 +        else
-+            logger.warn("the current operating system, {}, is unsupported by cassandra", osName);
++            logger.warn("the current operating system, {}, is unsupported by Cassandra", osName);
          if (osName.contains("aix"))
              return AIX;
          else
diff --git a/databases/cassandra4/files/patch-test_conf_cassandra-murmur.yaml b/databases/cassandra4/files/patch-test_conf_cassandra-murmur.yaml
index b9ec0a7b5450..91adb324a2b5 100644
--- a/databases/cassandra4/files/patch-test_conf_cassandra-murmur.yaml
+++ b/databases/cassandra4/files/patch-test_conf_cassandra-murmur.yaml
@@ -1,10 +1,10 @@
---- test/conf/cassandra-murmur.yaml.orig	2021-05-25 15:24:22 UTC
+--- test/conf/cassandra-murmur.yaml.orig	2023-05-25 14:13:38 UTC
 +++ test/conf/cassandra-murmur.yaml
 @@ -36,7 +36,6 @@ server_encryption_options:
  incremental_backups: true
  concurrent_compactors: 4
- compaction_throughput_mb_per_sec: 0
+ compaction_throughput: 0MiB/s
 -row_cache_class_name: org.apache.cassandra.cache.OHCProvider
- row_cache_size_in_mb: 16
- enable_user_defined_functions: true
- enable_scripted_user_defined_functions: true
+ row_cache_size: 16MiB
+ user_defined_functions_enabled: true
+ scripted_user_defined_functions_enabled: true
diff --git a/databases/cassandra4/files/patch-test_conf_cassandra-seeds.yaml b/databases/cassandra4/files/patch-test_conf_cassandra-seeds.yaml
index af236bca394c..e4034d59fdfa 100644
--- a/databases/cassandra4/files/patch-test_conf_cassandra-seeds.yaml
+++ b/databases/cassandra4/files/patch-test_conf_cassandra-seeds.yaml
@@ -1,10 +1,10 @@
---- test/conf/cassandra-seeds.yaml.orig	2021-05-25 15:24:52 UTC
+--- test/conf/cassandra-seeds.yaml.orig	2023-05-25 14:13:38 UTC
 +++ test/conf/cassandra-seeds.yaml
 @@ -37,7 +37,6 @@ server_encryption_options:
  incremental_backups: true
  concurrent_compactors: 4
- compaction_throughput_mb_per_sec: 0
+ compaction_throughput: 0MiB/s
 -row_cache_class_name: org.apache.cassandra.cache.OHCProvider
- row_cache_size_in_mb: 16
- enable_user_defined_functions: true
- enable_scripted_user_defined_functions: true
+ row_cache_size: 16MiB
+ user_defined_functions_enabled: true
+ scripted_user_defined_functions_enabled: true
diff --git a/databases/cassandra4/files/patch-test_conf_cassandra.yaml b/databases/cassandra4/files/patch-test_conf_cassandra.yaml
index 8cdaf3180e12..0d5f27e572d5 100644
--- a/databases/cassandra4/files/patch-test_conf_cassandra.yaml
+++ b/databases/cassandra4/files/patch-test_conf_cassandra.yaml
@@ -1,10 +1,10 @@
---- test/conf/cassandra.yaml.orig	2018-03-06 21:24:02 UTC
+--- test/conf/cassandra.yaml.orig	2023-05-25 14:13:38 UTC
 +++ test/conf/cassandra.yaml
 @@ -40,7 +40,6 @@ server_encryption_options:
  incremental_backups: true
  concurrent_compactors: 4
- compaction_throughput_mb_per_sec: 0
+ compaction_throughput: 0MiB/s
 -row_cache_class_name: org.apache.cassandra.cache.OHCProvider
- row_cache_size_in_mb: 16
- enable_user_defined_functions: true
- enable_scripted_user_defined_functions: true
+ row_cache_size: 16MiB
+ user_defined_functions_enabled: true
+ scripted_user_defined_functions_enabled: true
diff --git a/databases/cassandra4/files/patch-test_conf_unit-test-conf_test-native-port.yaml b/databases/cassandra4/files/patch-test_conf_unit-test-conf_test-native-port.yaml
index 72ab0ee6d9af..725f03bd16bc 100644
--- a/databases/cassandra4/files/patch-test_conf_unit-test-conf_test-native-port.yaml
+++ b/databases/cassandra4/files/patch-test_conf_unit-test-conf_test-native-port.yaml
@@ -1,10 +1,10 @@
---- test/conf/unit-test-conf/test-native-port.yaml.orig	2021-05-25 15:19:42 UTC
+--- test/conf/unit-test-conf/test-native-port.yaml.orig	2023-05-25 14:13:37 UTC
 +++ test/conf/unit-test-conf/test-native-port.yaml
 @@ -40,7 +40,6 @@ server_encryption_options:
  incremental_backups: true
  concurrent_compactors: 4
- compaction_throughput_mb_per_sec: 0
+ compaction_throughput: 0MiB/s
 -row_cache_class_name: org.apache.cassandra.cache.OHCProvider
- row_cache_size_in_mb: 16
- enable_user_defined_functions: true
- enable_scripted_user_defined_functions: true
+ row_cache_size: 16MiB
+ user_defined_functions_enabled: true
+ scripted_user_defined_functions_enabled: true
diff --git a/databases/cassandra4/pkg-plist b/databases/cassandra4/pkg-plist
index da8be43e7b34..564a6cfd1544 100644
--- a/databases/cassandra4/pkg-plist
+++ b/databases/cassandra4/pkg-plist
@@ -1,149 +1,153 @@
+%%AMD64ONLY%%%%DATADIR%%/lib/zstd-jni-%%ZSTDJNI_VERSION%%-freebsd_amd64.jar
 %%DATADIR%%/bin/cassandra
 %%DATADIR%%/bin/cassandra.in.sh
 %%DATADIR%%/bin/cqlsh
 %%DATADIR%%/bin/cqlsh.py
 %%DATADIR%%/bin/debug-cql
 %%DATADIR%%/bin/nodetool
 %%DATADIR%%/bin/sstableloader
 %%DATADIR%%/bin/sstablescrub
 %%DATADIR%%/bin/sstableupgrade
 %%DATADIR%%/bin/sstableutil
 %%DATADIR%%/bin/sstableverify
 %%DATADIR%%/bin/stop-server
 %%DATADIR%%/CHANGES.txt
 %%DATADIR%%/lib/airline-0.8.jar
 %%DATADIR%%/lib/antlr-runtime-3.5.2.jar
 %%DATADIR%%/lib/apache-cassandra-%%DISTVERSION%%.jar
-%%DATADIR%%/lib/asm-7.1.jar
-%%DATADIR%%/lib/caffeine-2.5.6.jar
-%%DATADIR%%/lib/cassandra-driver-core-3.11.0-shaded.jar
+%%DATADIR%%/lib/asm-9.1.jar
+%%DATADIR%%/lib/caffeine-2.9.2.jar
+%%DATADIR%%/lib/cassandra-driver-core-3.11.5-shaded.jar
 %%DATADIR%%/lib/cassandra-driver-internal-only-3.25.0.zip
+%%DATADIR%%/lib/checker-qual-3.10.0.jar
 %%DATADIR%%/lib/chronicle-bytes-2.20.111.jar
 %%DATADIR%%/lib/chronicle-core-2.20.126.jar
 %%DATADIR%%/lib/chronicle-queue-5.20.123.jar
 %%DATADIR%%/lib/chronicle-threads-2.20.111.jar
 %%DATADIR%%/lib/chronicle-wire-2.20.117.jar
 %%DATADIR%%/lib/commons-cli-1.1.jar
 %%DATADIR%%/lib/commons-codec-1.9.jar
-%%DATADIR%%/lib/commons-lang3-3.11.jar
+%%DATADIR%%/lib/commons-lang3-3.18.0.jar
 %%DATADIR%%/lib/commons-math3-3.2.jar
 %%DATADIR%%/lib/concurrent-trees-2.4.0.jar
 %%DATADIR%%/lib/ecj-4.6.1.jar
+%%DATADIR%%/lib/error_prone_annotations-2.5.1.jar
 %%DATADIR%%/lib/futures-2.1.6-py2.py3-none-any.zip
 %%DATADIR%%/lib/geomet-0.1.0.zip
 %%DATADIR%%/lib/guava-27.0-jre.jar
-%%DATADIR%%/lib/HdrHistogram-2.1.9.jar
+%%DATADIR%%/lib/HdrHistogram-2.1.12.jar
 %%DATADIR%%/lib/high-scale-lib-1.0.6.jar
 %%DATADIR%%/lib/hppc-0.8.1.jar
+%%DATADIR%%/lib/ipaddress-5.3.3.jar
 %%DATADIR%%/lib/j2objc-annotations-1.3.jar
-%%DATADIR%%/lib/jackson-annotations-2.13.2.jar
-%%DATADIR%%/lib/jackson-core-2.13.2.jar
-%%DATADIR%%/lib/jackson-databind-2.13.2.2.jar
+%%DATADIR%%/lib/jackson-annotations-2.19.2.jar
+%%DATADIR%%/lib/jackson-core-2.19.2.jar
+%%DATADIR%%/lib/jackson-databind-2.19.2.jar
+%%DATADIR%%/lib/jackson-datatype-jsr310-2.19.2.jar
 %%DATADIR%%/lib/jamm-0.3.2.jar
-%%DATADIR%%/lib/java-cup-runtime-11b-20160615.jar
 %%DATADIR%%/lib/javax.inject-1.jar
 %%DATADIR%%/lib/jbcrypt-0.4.jar
 %%DATADIR%%/lib/jcl-over-slf4j-1.7.25.jar
 %%DATADIR%%/lib/jcommander-1.30.jar
 %%DATADIR%%/lib/jctools-core-3.1.0.jar
-%%DATADIR%%/lib/jflex-1.8.2.jar
-%%DATADIR%%/lib/jna-5.6.0.jar
+%%DATADIR%%/lib/jna-5.9.0.jar
 %%DATADIR%%/lib/json-simple-1.1.jar
+%%DATADIR%%/lib/jsr305-2.0.2.jar
 %%DATADIR%%/lib/jvm-attach-api-1.5.jar
 %%DATADIR%%/lib/log4j-over-slf4j-1.7.25.jar
 %%DATADIR%%/lib/logback-classic-1.2.9.jar
 %%DATADIR%%/lib/logback-core-1.2.9.jar
-%%DATADIR%%/lib/lz4-java-1.8.0.jar
+%%DATADIR%%/lib/lz4-java-1.10.1.jar
 %%DATADIR%%/lib/metrics-core-3.1.5.jar
 %%DATADIR%%/lib/metrics-jvm-3.1.5.jar
 %%DATADIR%%/lib/metrics-logback-3.1.5.jar
 %%DATADIR%%/lib/mxdump-0.14.jar
-%%DATADIR%%/lib/netty.jar
 %%DATADIR%%/lib/netty-tcnative-boringssl-static-2.0.36.Final.jar
+%%DATADIR%%/lib/netty.jar
 %%DATADIR%%/lib/psjava-0.1.19.jar
+%%DATADIR%%/lib/pure_sasl-0.6.2-py2-none-any.zip
 %%DATADIR%%/lib/reporter-config-base-3.0.3.jar
 %%DATADIR%%/lib/reporter-config3-3.0.3.jar
 %%DATADIR%%/lib/six-1.12.0-py2.py3-none-any.zip
 %%DATADIR%%/lib/sjk-cli-0.14.jar
 %%DATADIR%%/lib/sjk-core-0.14.jar
 %%DATADIR%%/lib/sjk-json-0.14.jar
 %%DATADIR%%/lib/sjk-stacktrace-0.14.jar
 %%DATADIR%%/lib/slf4j-api-1.7.25.jar
 %%DATADIR%%/lib/snakeyaml-1.26.jar
 %%DATADIR%%/lib/snappy-java.jar
 %%DATADIR%%/lib/snowball-stemmer-1.3.0.581.1.jar
 %%DATADIR%%/lib/ST4-4.0.8.jar
 %%DATADIR%%/lib/stream-2.5.2.jar
-%%AMD64ONLY%%%%DATADIR%%/lib/zstd-jni-%%ZSTDJNI_VERSION%%-freebsd_amd64.jar
-%%I386ONLY%%%%DATADIR%%/lib/zstd-jni-%%ZSTDJNI_VERSION%%-freebsd_i386.jar
 %%DATADIR%%/LICENSE.txt
 %%DATADIR%%/NEWS.txt
 %%DATADIR%%/NOTICE.txt
 %%DATADIR%%/pylib/cqlshlib/__init__.py
+%%DATADIR%%/pylib/cqlshlib/authproviderhandling.py
 %%DATADIR%%/pylib/cqlshlib/copyutil.py
 %%DATADIR%%/pylib/cqlshlib/cql3handling.py
 %%DATADIR%%/pylib/cqlshlib/cqlhandling.py
 %%DATADIR%%/pylib/cqlshlib/cqlshhandling.py
 %%DATADIR%%/pylib/cqlshlib/displaying.py
 %%DATADIR%%/pylib/cqlshlib/formatting.py
 %%DATADIR%%/pylib/cqlshlib/helptopics.py
 %%DATADIR%%/pylib/cqlshlib/pylexotron.py
 %%DATADIR%%/pylib/cqlshlib/saferscanner.py
-%%DATADIR%%/pylib/cqlshlib/setup.cfg
+%%DATADIR%%/pylib/cqlshlib/serverversion.py
 %%DATADIR%%/pylib/cqlshlib/sslhandling.py
 %%DATADIR%%/pylib/cqlshlib/tracing.py
 %%DATADIR%%/pylib/cqlshlib/util.py
 %%DATADIR%%/pylib/cqlshlib/wcwidth.py
 %%DATADIR%%/pylib/README.asc
-%%DATADIR%%/pylib/pytest.ini
 %%DATADIR%%/pylib/requirements.txt
 %%DATADIR%%/pylib/setup.py
 %%DATADIR%%/tools/bin/auditlogviewer
 %%DATADIR%%/tools/bin/cassandra-stress
-%%DATADIR%%/tools/bin/cassandra-stressd
 %%DATADIR%%/tools/bin/cassandra.in.sh
 %%DATADIR%%/tools/bin/compaction-stress
 %%DATADIR%%/tools/bin/fqltool
 %%DATADIR%%/tools/bin/generatetokens
+%%DATADIR%%/tools/bin/hash_password
 %%DATADIR%%/tools/bin/jmxtool
 %%DATADIR%%/tools/bin/sstabledump
 %%DATADIR%%/tools/bin/sstableexpiredblockers
 %%DATADIR%%/tools/bin/sstablelevelreset
 %%DATADIR%%/tools/bin/sstablemetadata
 %%DATADIR%%/tools/bin/sstableofflinerelevel
 %%DATADIR%%/tools/bin/sstablerepairedset
 %%DATADIR%%/tools/bin/sstablesplit
 %%DATADIR%%/tools/cqlstress-counter-example.yaml
 %%DATADIR%%/tools/cqlstress-example.yaml
 %%DATADIR%%/tools/cqlstress-insanity-example.yaml
 %%DATADIR%%/tools/cqlstress-lwt-example.yaml
 %%DATADIR%%/tools/lib/fqltool.jar
 %%DATADIR%%/tools/lib/stress.jar
-%%ETCDIR%%/metrics-reporter-config-sample.yaml
 %%ETCDIR%%/README.txt
 %%ETCDIR%%/triggers/README.txt
 %%SIGAR%%%%DATADIR%%/lib/sigar.jar
 @sample %%ETCDIR%%/cassandra-env.sh.sample
 @sample %%ETCDIR%%/cassandra-jaas.config.sample
 @sample %%ETCDIR%%/cassandra-rackdc.properties.sample
 @sample %%ETCDIR%%/cassandra-topology.properties.sample
 @sample %%ETCDIR%%/cassandra.yaml.sample
 @sample %%ETCDIR%%/commitlog_archiving.properties.sample
 @sample %%ETCDIR%%/cqlshrc.sample
+@sample %%ETCDIR%%/credentials.sample
 @sample %%ETCDIR%%/hotspot_compiler.sample
 @sample %%ETCDIR%%/jvm-clients.options.sample
 @sample %%ETCDIR%%/jvm-server.options.sample
 @sample %%ETCDIR%%/jvm11-clients.options.sample
 @sample %%ETCDIR%%/jvm11-server.options.sample
 @sample %%ETCDIR%%/jvm8-clients.options.sample
 @sample %%ETCDIR%%/jvm8-server.options.sample
 @sample %%ETCDIR%%/logback-tools.xml.sample
 @sample %%ETCDIR%%/logback.xml.sample
+@sample %%ETCDIR%%/metrics-reporter-config.yaml.sample
 bin/cassandra
 bin/cqlsh
 bin/nodetool
 bin/sstableloader
 bin/sstablescrub
 bin/sstableupgrade
 bin/sstableutil
 bin/sstableverify