Merge branch 'cassandra-4.0' into cassandra-4.1

Author: smiklosovic

CHANGES.txt

@@ -1,5 +1,7 @@
 4.1.11
  * Redact security-sensitive information in system_views.settings (CASSANDRA-20856)
+Merged from 4.0:
+ * update shaded cassandra-driver-core to 3.11.5 (CASSANDRA-20904)
 
 
 4.1.10

build.xml

@@ -689,7 +689,7 @@
           <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"/>

test/unit/org/apache/cassandra/tools/nodetool/ClientStatsTest.java

@@ -165,7 +165,7 @@ public void testClientStatsAll()
         tool.assertOnCleanExit();
         String stdout = tool.getStdout();
         assertThat(stdout).containsPattern("Address +SSL +Cipher +Protocol +Version +User +Keyspace +Requests +Driver-Name +Driver-Version");
-        assertThat(stdout).containsPattern("/127.0.0.1:[0-9]+ false undefined undefined [0-9]+ +anonymous +[0-9]+ +DataStax Java Driver 3.11.0");
+        assertThat(stdout).containsPattern("/127.0.0.1:[0-9]+ false undefined undefined [0-9]+ +anonymous +[0-9]+ +DataStax Java Driver 3.11.5");
         assertThat(stdout).contains("Total connected clients: 2");
         assertThat(stdout).contains("User      Connections");
         assertThat(stdout).contains("anonymous 2");
@@ -178,9 +178,9 @@ public void testClientStatsClientOptions()
         tool.assertOnCleanExit();
         String stdout = tool.getStdout();
         assertThat(stdout).containsPattern("Address +SSL +Cipher +Protocol +Version +User +Keyspace +Requests +Driver-Name +Driver-Version +Client-Options");
-        assertThat(stdout).containsPattern("/127.0.0.1:[0-9]+ false undefined undefined [0-9]+ +anonymous +[0-9]+ +DataStax Java Driver 3.11.0");
+        assertThat(stdout).containsPattern("/127.0.0.1:[0-9]+ false undefined undefined [0-9]+ +anonymous +[0-9]+ +DataStax Java Driver 3.11.5");
         assertThat(stdout).containsPattern("DRIVER_NAME=DataStax Java Driver");
-        assertThat(stdout).containsPattern("DRIVER_VERSION=3.11.0");
+        assertThat(stdout).containsPattern("DRIVER_VERSION=3.11.5");
         assertThat(stdout).containsPattern("CQL_VERSION=3.0.0");
         assertThat(stdout).contains("Total connected clients: 2");
         assertThat(stdout).contains("User      Connections");