CNDB-12154: Port latest commits from main to main-5.0

.build/build-rat.xml

@@ -71,6 +71,7 @@
                  <exclude name="test/data/**/*.sha1"/>
                  <exclude name="test/data/CASSANDRA-15313/lz4-jvm-crash-failure.txt"/>
                  <exclude name="test/data/jmxdump/cassandra-*-jmx.yaml"/>
+                 <exclude name=".github/**"/>
                  <!-- Documentation files -->
                  <exclude name=".github/pull_request_template.md"/>
                  <exclude NAME="doc/modules/**/*"/>

.build/parent-pom-template.xml

@@ -36,8 +36,8 @@
     </license>
   </licenses>
   <properties>
-    <bytebuddy.version>1.12.13</bytebuddy.version>
-    <byteman.version>4.0.20</byteman.version>
+    <bytebuddy.version>1.14.17</bytebuddy.version>
+    <byteman.version>4.0.23</byteman.version>
     <ohc.version>0.5.1</ohc.version>
 
     <!-- These are referenced in build.xml, so need to be propagated from there -->
@@ -930,7 +930,7 @@
       <dependency>
         <groupId>com.google.code.findbugs</groupId>
         <artifactId>jsr305</artifactId>
-        <version>2.0.2</version>
+        <version>3.0.0</version>
       </dependency>
       <dependency>
         <groupId>com.clearspring.analytics</groupId>
@@ -1235,7 +1235,7 @@
       <dependency>
         <groupId>io.github.jbellis</groupId>
         <artifactId>jvector</artifactId>
-        <version>3.0.0</version>
+        <version>4.0.0-beta.1</version>
       </dependency>
       <dependency>
         <groupId>com.carrotsearch.randomizedtesting</groupId>

.github/pull_request_template.md

@@ -1,25 +1,16 @@
-Thanks for sending a pull request! Here are some tips if you're new here:
-
- * Ensure you have added or run the [appropriate tests](https://cassandra.apache.org/_/development/testing.html) for your PR.
- * Be sure to keep the PR description updated to reflect all changes.
- * Write your PR title to summarize what this PR proposes.
- * If possible, provide a concise example to reproduce the issue for a faster review.
- * Read our [contributor guidelines](https://cassandra.apache.org/_/development/index.html)
- * If you're making a documentation change, see our [guide to documentation contribution](https://cassandra.apache.org/_/development/documentation.html)
-
-Commit messages should follow the following format:
+### What is the issue
+...
 
-```
-<One sentence description, usually Jira title or CHANGES.txt summary>
-
-<Optional lengthier description (context on patch)>
-
-patch by <Authors>; reviewed by <Reviewers> for CASSANDRA-#####
-
-Co-authored-by: Name1 <email1>
-Co-authored-by: Name2 <email2>
-
-```
-
-The [Cassandra Jira](https://issues.apache.org/jira/projects/CASSANDRA/issues/)
+### What does this PR fix and why was it fixed
+...
 
+### Checklist before you submit for review
+- [ ] Make sure there is a PR in the CNDB project updating the Converged Cassandra version
+- [ ] Use `NoSpamLogger` for log lines that may appear frequently in the logs
+- [ ] Verify test results on Butler
+- [ ] Test coverage for new/modified code is > 80%
+- [ ] Proper code formatting
+- [ ] Proper title for each commit staring with the project-issue number, like CNDB-1234
+- [ ] Each commit has a meaningful description
+- [ ] Each commit is not very long and contains related changes
+- [ ] Renames, moves and reformatting are in distinct commits

.gitignore

@@ -71,6 +71,7 @@ target/
 *.pyc
 *~
 *.bak
+*.log
 *.sw[o,p]
 *.tmp
 .DS_Store

CHANGES.txt

@@ -5,6 +5,8 @@
 Future version (tbd)
  * Require only MODIFY permission on base when updating table with MV (STAR-564)
 
+Merged from 5.0:
+ * Disable chronicle analytics (CASSANDRA-19656)
 
 5.0-beta2
  * Align buffer with commitlog segment size (CASSANDRA-19471)

NEWS.txt

@@ -274,6 +274,11 @@ Deprecation
       in a future release. A single native port can be used for both encrypted and unencrypted traffic; see CASSANDRA-10559.
       Cluster hosts running with dual native ports were not correctly identified in the system.peers tables and server-sent EVENTs,
       causing clients that encrypt traffic to fail to maintain correct connection pools. For more information, see CASSANDRA-19392.
+    - Chronicle Queue has changed the enums used for log rolling (cassandra.yaml -> full_query_logging_options:roll_cycle).
+    Older legacy options will still work for the foreseeable future but you will see warnings in logs and future dependency
+    upgrades may break your log rolling param. The default log rolling param will be changed with the next major release
+    from HOURLY to FAST_HOURLY, primarily different on how frequently indexes are built (256 in FAST_HOURLY vs. 16 in HOURLY).
+    For more info refer to: net.openhft.chronicle.queue.RollCycles
 
 4.1
 ===

bin/cassandra.in.sh

@@ -122,11 +122,16 @@ jvmver=`echo "$java_ver_output" | grep '[openjdk|java] version' | awk -F'"' 'NR=
 JVM_VERSION=${jvmver%_*}
 short=$(echo "${jvmver}" | cut -c1-2)
 
-JAVA_VERSION=17
+JAVA_VERSION=22
 if [ "$short" = "11" ]  ; then
      JAVA_VERSION=11
 elif [ "$JVM_VERSION" \< "17" ] ; then
-    echo "DSE DB 5.0 requires Java 11 or Java 17."
+    echo "DSE DB 5.0 requires Java 11 or higher."
+    exit 1;
+elif [ "$short" = "17" ]  ; then
+     JAVA_VERSION=17
+elif [ "$JVM_VERSION" \< "22" ] ; then
+    echo "DSE DB 5.0 requires Java 11 or higher."
     exit 1;
 fi
 
@@ -151,7 +156,9 @@ esac
 
 # Read user-defined JVM options from jvm-server.options file
 JVM_OPTS_FILE=$CASSANDRA_CONF/jvm${jvmoptions_variant:--clients}.options
-if [ $JAVA_VERSION -ge 17 ] ; then
+if [ $JAVA_VERSION -ge 22 ] ; then
+    JVM_DEP_OPTS_FILE=$CASSANDRA_CONF/jvm22${jvmoptions_variant:--clients}.options
+elif [ $JAVA_VERSION -ge 17 ] ; then
     JVM_DEP_OPTS_FILE=$CASSANDRA_CONF/jvm17${jvmoptions_variant:--clients}.options
 elif [ $JAVA_VERSION -ge 11 ] ; then
     JVM_DEP_OPTS_FILE=$CASSANDRA_CONF/jvm11${jvmoptions_variant:--clients}.options