Merge branch '3.x' (at 3.11.4) into scylla-3.x

Update to 3.11.4 from upstream repo.

Jenkinsfile

@@ -140,25 +140,6 @@ ${status} after ${currentBuild.durationString - ' and counting'}"""
   }
 }
 
-def submitCIMetrics(buildType) {
-  long durationMs = currentBuild.duration
-  long durationSec = durationMs / 1000
-  long nowSec = (currentBuild.startTimeInMillis + durationMs) / 1000
-  def branchNameNoPeriods = env.BRANCH_NAME.replaceAll('\\.', '_')
-  def durationMetric = "okr.ci.java.${env.DRIVER_METRIC_TYPE}.${buildType}.${branchNameNoPeriods} ${durationSec} ${nowSec}"
-
-  timeout(time: 1, unit: 'MINUTES') {
-    withCredentials([string(credentialsId: 'lab-grafana-address', variable: 'LAB_GRAFANA_ADDRESS'),
-                     string(credentialsId: 'lab-grafana-port', variable: 'LAB_GRAFANA_PORT')]) {
-      withEnv(["DURATION_METRIC=${durationMetric}"]) {
-        sh label: 'Send runtime metrics to labgrafana', script: '''#!/bin/bash -le
-          echo "${DURATION_METRIC}" | nc -q 5 ${LAB_GRAFANA_ADDRESS} ${LAB_GRAFANA_PORT}
-        '''
-      }
-    }
-  }
-}
-
 def describePerCommitStage() {
   script {
     currentBuild.displayName = "Per-Commit build"
@@ -182,7 +163,9 @@ def describeAdhocAndScheduledTestingStage() {
 
 // branch pattern for cron
 // should match 3.x, 4.x, 4.5.x, etc
-def branchPatternCron = ~"((\\d+(\\.[\\dx]+)+))"
+def branchPatternCron() {
+  ~"((\\d+(\\.[\\dx]+)+))"
+}
 
 pipeline {
   agent none
@@ -327,7 +310,7 @@ pipeline {
 
   triggers {
     // schedules only run against release branches (i.e. 3.x, 4.x, 4.5.x, etc.)
-    parameterizedCron(branchPatternCron.matcher(env.BRANCH_NAME).matches() ? """
+    parameterizedCron(branchPatternCron().matcher(env.BRANCH_NAME).matches() ? """
       # Every weeknight (Monday - Friday) around 3:00 AM
       ### JDK8 tests against 2.1, 3.0, 3.11 and 4.0
       H 3 * * 1-5 %CI_SCHEDULE=WEEKNIGHTS;CI_SCHEDULE_SERVER_VERSIONS=2.1 3.0 3.11 4.0;CI_SCHEDULE_JABBA_VERSION=1.8;CI_SCHEDULE_TEST_PROFILE=long
@@ -428,11 +411,6 @@ pipeline {
         }
       }
       post {
-        always {
-          node('master') {
-            submitCIMetrics('commit')
-          }
-        }
         aborted {
           notifySlack('aborted')
         }

README.md

@@ -6,7 +6,7 @@ not yet have been released. You can find the documentation for the latest
 version through the [Java driver
 docs](https://docs.scylladb.com/using-scylla/scylla-java-driver/) or via the release tags,
 [e.g.
-3.11.2.0](https://github.com/scylladb/java-driver/releases/tag/3.11.2.0).*
+3.11.4.0](https://github.com/scylladb/java-driver/releases/tag/3.11.4.0).*
 
 A modern, [feature-rich](manual/) and highly tunable Java client
 library for Apache Cassandra (2.1+) and using exclusively Cassandra's binary protocol 
@@ -62,7 +62,7 @@ it in your application using the following Maven dependency
 <dependency>
   <groupId>com.scylladb</groupId>
   <artifactId>scylla-driver-core</artifactId>
-  <version>3.11.2.0</version>
+  <version>3.11.4.0</version>
 </dependency>
 ```
 
@@ -72,7 +72,7 @@ Note that the object mapper is published as a separate artifact:
 <dependency>
   <groupId>com.scylladb</groupId>
   <artifactId>scylla-driver-mapping</artifactId>
-  <version>3.11.2.0</version>
+  <version>3.11.4.0</version>
 </dependency>
 ```
 
@@ -82,7 +82,7 @@ The 'extras' module is also published as a separate artifact:
 <dependency>
   <groupId>com.scylladb</groupId>
   <artifactId>scylla-driver-extras</artifactId>
-  <version>3.11.2.0</version>
+  <version>3.11.4.0</version>
 </dependency>
 ```
 
@@ -92,7 +92,7 @@ to avoid the explicit dependency to Netty.
 
 ## Compatibility
 
-The Java client driver 3.11.2.0 ([branch 3.x](https://github.com/scylladb/java-driver/tree/3.x)) is compatible with 
+The Java client driver 3.11.4.0 ([branch scylla-3.x](https://github.com/scylladb/java-driver/tree/scylla-3.x)) is compatible with 
 Scylla and Apache Cassandra 2.1, 2.2, 3.0+.
 
 UDT and tuple support is available only when using Apache Cassandra 2.1 or higher.

changelog/README.md

@@ -5,6 +5,15 @@
   3.x versions get published.
 -->
 
+### 3.11.4
+- [improvement] JAVA-3079: Upgrade Netty to 4.1.94, 3.x edition
+- [improvement] JAVA-3082: Fix maven build for Apple-silicon
+- [improvement] PR 1671: Fix LatencyAwarePolicy scale docstring
+
+### 3.11.3
+- [improvement] JAVA-3023: Upgrade Netty to 4.1.77, 3.x edition
+
+
 ### 3.11.2
 - [improvement] JAVA-3008: Upgrade Netty to 4.1.75, 3.x edition
 - [improvement] JAVA-2984: Upgrade Jackson to resolve high-priority CVEs

driver-core/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>com.scylladb</groupId>
         <artifactId>scylla-driver-parent</artifactId>
-        <version>3.11.2.6-SNAPSHOT</version>
+        <version>3.11.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>scylla-driver-core</artifactId>
@@ -129,7 +129,7 @@
 
         <dependency>
             <groupId>io.netty</groupId>
-            <artifactId>netty-tcnative</artifactId>
+            <artifactId>${netty-tcnative.artifact}</artifactId>
             <classifier>${os.detected.classifier}</classifier>
             <scope>test</scope>
         </dependency>

driver-core/src/main/java/com/datastax/driver/core/policies/LatencyAwarePolicy.java

@@ -709,7 +709,7 @@ public Builder withExclusionThreshold(double exclusionThreshold) {
      *
      * <pre>{@code d = (t - t') / scale
      * alpha = 1 - (ln(d+1) / d)
-     * avg = alpha * l + (1 - alpha * prev)}</pre>
+     * avg = alpha * l + (1 - alpha) * prev}</pre>
      *
      * Typically, with a {@code scale} of 100 milliseconds (the default), if a new latency is
      * measured and the previous measure is 10 millisecond old (so {@code d=0.1}), then {@code

driver-dist/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>com.scylladb</groupId>
         <artifactId>scylla-driver-parent</artifactId>
-        <version>3.11.2.6-SNAPSHOT</version>
+        <version>3.11.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>scylla-driver-dist</artifactId>

driver-examples/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>com.scylladb</groupId>
         <artifactId>scylla-driver-parent</artifactId>
-        <version>3.11.2.6-SNAPSHOT</version>
+        <version>3.11.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>scylla-driver-examples</artifactId>

driver-extras/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>com.scylladb</groupId>
         <artifactId>scylla-driver-parent</artifactId>
-        <version>3.11.2.6-SNAPSHOT</version>
+        <version>3.11.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>scylla-driver-extras</artifactId>

driver-mapping/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>com.scylladb</groupId>
         <artifactId>scylla-driver-parent</artifactId>
-        <version>3.11.2.6-SNAPSHOT</version>
+        <version>3.11.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>scylla-driver-mapping</artifactId>

driver-tests/osgi/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>com.scylladb</groupId>
         <artifactId>scylla-driver-tests-parent</artifactId>
-        <version>3.11.2.6-SNAPSHOT</version>
+        <version>3.11.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>scylla-driver-tests-osgi</artifactId>

driver-tests/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>com.scylladb</groupId>
         <artifactId>scylla-driver-parent</artifactId>
-        <version>3.11.2.6-SNAPSHOT</version>
+        <version>3.11.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>scylla-driver-tests-parent</artifactId>

driver-tests/shading/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>com.scylladb</groupId>
         <artifactId>scylla-driver-tests-parent</artifactId>
-        <version>3.11.2.6-SNAPSHOT</version>
+        <version>3.11.4.0-SNAPSHOT</version>
     </parent>
 
     <packaging>pom</packaging>

driver-tests/shading/shaded/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>com.scylladb</groupId>
         <artifactId>scylla-driver-tests-shading</artifactId>
-        <version>3.11.2.6-SNAPSHOT</version>
+        <version>3.11.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>scylla-driver-tests-shading-shaded</artifactId>

driver-tests/shading/unshaded/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>com.scylladb</groupId>
         <artifactId>scylla-driver-tests-shading</artifactId>
-        <version>3.11.2.6-SNAPSHOT</version>
+        <version>3.11.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>scylla-driver-tests-shading-unshaded</artifactId>

driver-tests/stress/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>com.scylladb</groupId>
         <artifactId>scylla-driver-tests-parent</artifactId>
-        <version>3.11.2.6-SNAPSHOT</version>
+        <version>3.11.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>scylla-driver-tests-stress</artifactId>

faq/README.md

@@ -289,7 +289,7 @@ version is available, you may want to reach out to the maintainer of that tool t
 an update with compatibility to this driver version.
 
 
-[Blobs.java]: https://github.com/datastax/java-driver/tree/3.11.2/driver-examples/src/main/java/com/datastax/driver/examples/datatypes/Blobs.java
+[Blobs.java]: https://github.com/datastax/java-driver/tree/3.11.4/driver-examples/src/main/java/com/datastax/driver/examples/datatypes/Blobs.java
 [CASSANDRA-7304]: https://issues.apache.org/jira/browse/CASSANDRA-7304
 [Parameters and Binding]: ../manual/statements/prepared/#parameters-and-binding
 [Mapper options]: ../manual/object_mapper/using/#mapper-options

manual/compression/README.md

@@ -88,4 +88,4 @@ cluster = Cluster.builder()
     .build();
 ```
 
-[pom]: https://repo1.maven.org/maven2/com/scylladb/scylla-driver-parent/3.11.2.0/scylla-driver-parent-3.11.2.0.pom
+[pom]: https://repo1.maven.org/maven2/com/scylladb/scylla-driver-parent/3.11.4.0/scylla-driver-parent-3.11.4.0.pom

manual/custom_codecs/extras/README.md

@@ -13,7 +13,7 @@ The module is published as a separate Maven artifact:
 <dependency>
   <groupId>com.scylladb</groupId>
   <artifactId>scylla-driver-extras</artifactId>
-  <version>3.11.2.0</version>
+  <version>3.11.4.0</version>
 </dependency>
 ```
 

manual/metrics/README.md

@@ -38,7 +38,7 @@ To do this in a maven project:
 <dependency>
   <groupId>com.scylladb</groupId>
   <artifactId>scylla-driver-core</artifactId>
-  <version>3.11.2.0</version>
+  <version>3.11.4.0</version>
   <exclusions>
     <exclusion>
       <groupId>io.dropwizard.metrics</groupId>

manual/object_mapper/README.md

@@ -11,7 +11,7 @@ The mapper is published as a separate Maven artifact:
 <dependency>
   <groupId>com.scylladb</groupId>
   <artifactId>scylla-driver-mapping</artifactId>
-  <version>3.11.2.0</version>
+  <version>3.11.4.0</version>
 </dependency>
 ```
 

manual/shaded_jar/README.md

@@ -12,7 +12,7 @@ package name:
 <dependency>
   <groupId>com.scylladb</groupId>
   <artifactId>scylla-driver-core</artifactId>
-  <version>3.11.2.0</version>
+  <version>3.11.4.0</version>
   <classifier>shaded</classifier>
   <!-- Because the shaded JAR uses the original POM, you still need
        to exclude this dependency explicitly: -->
@@ -32,7 +32,7 @@ non-shaded JAR:
 <dependency>
   <groupId>com.scylladb</groupId>
   <artifactId>scylla-driver-core</artifactId>
-  <version>3.11.2.0</version>
+  <version>3.11.4.0</version>
   <classifier>shaded</classifier>
   <exclusions>
     <exclusion>
@@ -44,7 +44,7 @@ non-shaded JAR:
 <dependency>
   <groupId>com.scylladb</groupId>
   <artifactId>scylla-driver-mapping</artifactId>
-  <version>3.11.2.0</version>
+  <version>3.11.4.0</version>
   <exclusions>
     <exclusion>
       <groupId>com.scylladb</groupId>

pom.xml

@@ -25,7 +25,7 @@
 
     <groupId>com.scylladb</groupId>
     <artifactId>scylla-driver-parent</artifactId>
-    <version>3.11.2.6-SNAPSHOT</version>
+    <version>3.11.4.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Java Driver for Scylla and Apache Cassandra</name>
     <description>
@@ -55,8 +55,9 @@
         <slf4j.version>1.7.25</slf4j.version>
         <slf4j-log4j12.version>1.7.25</slf4j-log4j12.version>
         <guava.version>19.0</guava.version>
-        <netty.version>4.1.75.Final</netty.version>
-        <netty-tcnative.version>2.0.50.Final</netty-tcnative.version>
+        <netty.version>4.1.94.Final</netty.version>
+        <netty-tcnative.artifact>netty-tcnative</netty-tcnative.artifact>
+        <netty-tcnative.version>2.0.61.Final</netty-tcnative.version>
         <metrics.version>3.2.2</metrics.version>
         <snappy.version>1.1.2.6</snappy.version>
         <lz4.version>1.4.1</lz4.version>
@@ -361,7 +362,7 @@
 
             <dependency>
                 <groupId>io.netty</groupId>
-                <artifactId>netty-tcnative</artifactId>
+                <artifactId>${netty-tcnative.artifact}</artifactId>
                 <version>${netty-tcnative.version}</version>
                 <classifier>${os.detected.classifier}</classifier>
             </dependency>
@@ -670,7 +671,7 @@
                         </execution>
                     </executions>
                     <configuration>
-                        <comparisonVersion>3.11.0.1</comparisonVersion>
+                        <comparisonVersion>3.11.2.5</comparisonVersion>
                         <ignoredDifferencesFile>../clirr-ignores.xml</ignoredDifferencesFile>
                         <excludes>
                             <exclude>com/datastax/shaded/**</exclude>
@@ -1077,6 +1078,24 @@
                 <test.osgi.skip>true</test.osgi.skip>
             </properties>
         </profile>
+
+        <profile>
+            <id>apple-silicon-dev</id>
+            <activation>
+                <os>
+                    <name>mac os x</name>
+                    <family>mac</family>
+                    <arch>aarch64</arch>
+                </os>
+            </activation>
+            <properties>
+                <!-- https://netty.io/wiki/forked-tomcat-native.html netty on apple-silicon requires the boringssl variant of tc-native -->
+                <netty-tcnative.artifact>netty-tcnative-boringssl-static</netty-tcnative.artifact>
+                <!-- https://github.com/jnr/jffi/pull/116 apple-silicon requires signed jffi binaries, added in 1.3.8 (jnr-ffi 2.2.10+) -->
+                <jnr-ffi.version>2.2.10</jnr-ffi.version>
+            </properties>
+
+        </profile>
     </profiles>
 
     <distributionManagement>