JAVA-3078: Provide support for building with Java 11 and Java 17

Details: - Update to api-plumber-doclet 2.0.0 - Add org.jetbrains:annotations as additionalDependency for core-shaded - Refactor table summary tag as caption element to conform to HTML5 - Refactor <h3> usage to <h2> to conform to heading tag ordering for HTML5 - Explicitly define annotationProcessorPaths for mapper-processor, slf4j-nop and gremlin-core - [java11+] Upgrade errorprone to 2.19.1 - [java11+] Update custom javadoc leaks tag to full string: leaks-private-api - Add build-java-8 profile for compiling with java 8 - Add build-java-11 profile for compiling with java 11 - [java11+] Exclude many new error prone checks enabled by default in the new version (see JAVA-3102) - [java11+] Use release=8 instead of source/target=1.8 to automatically select correct bootstrap path - [java11+] Use fork=true with maven-compiler-plugin to pick up compilerArgs - [java11+] Load error-prone plugin using annotationProcessorPaths, per documentation guidance - Refactor Jenkinsfile to compile project with the Java version selected in the pipeline matrix - Remove test-jdk profiles and surefire/failsafe JVM overrides added in JAVA-3042 - Update org.apache.felix.framework to 7.0.1 to support java17 without forking new JVM (FELIX-6287) - Update commons-configuration2 in OSGi BundleOptions to 2.9.0 for java11 - [java11+] Set JAVA_HOME=JAVA8_HOME in CcmBridge if using DSE which only supports java8 - set --jvm_version when calling ccm start for dse that supports java11 (workaround DSP-23501) - update travis config to run full build + test with java 11 + 17

Author: hhughes

.travis.yml

@@ -7,14 +7,20 @@ matrix:
  # 8
  - env: JDK='OpenJDK 8'
  jdk: openjdk8
+ before_install:
+ # Require JDK8 for compiling
+ - jdk_switcher use openjdk8
+ - ./install-snapshots.sh
  # 11
  - env: JDK='OpenJDK 11'
- # switch to JDK 11 before running tests
- before_script: . $TRAVIS_BUILD_DIR/ci/install-jdk.sh -F 11 -L GPL
-before_install:
- # Require JDK8 for compiling
- - jdk_switcher use openjdk8
- - ./install-snapshots.sh
+ before_install:
+ - . $TRAVIS_BUILD_DIR/ci/install-jdk.sh -F 11 -L GPL
+ - ./install-snapshots.sh
+ # 17
+ - env: JDK='OpenJDK 17'
+ before_install:
+ - . $TRAVIS_BUILD_DIR/ci/install-jdk.sh -F 17 -L GPL
+ - ./install-snapshots.sh
 install: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
 script: mvn test -Djacoco.skip=true -Dmaven.test.failure.ignore=true -Dmaven.javadoc.skip=true -B -V
 cache:

Dockerfile

@@ -0,0 +1,26 @@
+# https://github.com/apache/cassandra-builds/blob/trunk/docker/testing/ubuntu2004_j11_w_dependencies.docker
+FROM apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest as base
+
+# install maven
+RUN sudo su -c 'apt-get update && apt-get install -y maven'
+
+FROM base as repo
+
+# checkout java-driver (special branch for now)
+RUN git clone --branch asf_cassandra_docker_image --single-branch https://github.com/datastax/java-driver.git
+
+FROM repo as install
+
+WORKDIR /home/cassandra/java-driver
+
+# build java-driver
+RUN mvn -V -DskipTests install
+
+FROM install as test
+
+# manually set JAVA_HOME which is not configued by default in the base image
+ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-arm64
+
+# activate python3.8+ccm and run java-driver tests
+# use cassandra 4.0.11 to work around CASSANDRA-17581
+RUN . /home/cassandra/env3.8/bin/activate && mvn -V verify -Dccm.version=4.0.11

Jenkinsfile

@@ -19,36 +19,13 @@ def initializeEnvironment() {
  env.MAVEN_HOME = "${env.HOME}/.mvn/apache-maven-3.3.9"
  env.PATH = "${env.MAVEN_HOME}/bin:${env.PATH}"
 
- /*
- * As of JAVA-3042 JAVA_HOME is always set to JDK8 and this is currently necessary for mvn compile and DSE Search/Graph.
- * To facilitate testing with JDK11/17 we feed the appropriate JAVA_HOME into the maven build via commandline.
- *
- * Maven command-line flags:
- * - -DtestJavaHome=/path/to/java/home: overrides JAVA_HOME for surefire/failsafe tests, defaults to environment JAVA_HOME.
- * - -Ptest-jdk-N: enables profile for running tests with a specific JDK version (substitute N for 8/11/17).
- *
- * Note test-jdk-N is also automatically loaded based off JAVA_HOME SDK version so testing with an older SDK is not supported.
- *
- * Environment variables:
- * - JAVA_HOME: Path to JDK used for mvn (all steps except surefire/failsafe), Cassandra, DSE.
- * - JAVA8_HOME: Path to JDK8 used for Cassandra/DSE if ccm determines JAVA_HOME is not compatible with the chosen backend.
- * - TEST_JAVA_HOME: PATH to JDK used for surefire/failsafe testing.
- * - TEST_JAVA_VERSION: TEST_JAVA_HOME SDK version number [8/11/17], used to configure test-jdk-N profile in maven (see above)
- */
-
  env.JAVA_HOME = sh(label: 'Get JAVA_HOME',script: '''#!/bin/bash -le
  . ${JABBA_SHELL}
  jabba which ${JABBA_VERSION}''', returnStdout: true).trim()
  env.JAVA8_HOME = sh(label: 'Get JAVA8_HOME',script: '''#!/bin/bash -le
  . ${JABBA_SHELL}
  jabba which 1.8''', returnStdout: true).trim()
 
- env.TEST_JAVA_HOME = sh(label: 'Get TEST_JAVA_HOME',script: '''#!/bin/bash -le
- . ${JABBA_SHELL}
- jabba which ${JABBA_VERSION}''', returnStdout: true).trim()
- env.TEST_JAVA_VERSION = sh(label: 'Get TEST_JAVA_VERSION',script: '''#!/bin/bash -le
- echo "${JABBA_VERSION##*.}"''', returnStdout: true).trim()
-
  sh label: 'Download Apache CassandraⓇ or DataStax Enterprise',script: '''#!/bin/bash -le
  . ${JABBA_SHELL}
  jabba use 1.8
@@ -77,23 +54,21 @@ ENVIRONMENT_EOF
  set +o allexport
 
  . ${JABBA_SHELL}
- jabba use 1.8
+ jabba use ${JABBA_VERSION}
 
  java -version
  mvn -v
  printenv | sort
  '''
 }
 
-def buildDriver(jabbaVersion) {
- withEnv(["BUILD_JABBA_VERSION=${jabbaVersion}"]) {
- sh label: 'Build driver', script: '''#!/bin/bash -le
- . ${JABBA_SHELL}
- jabba use ${BUILD_JABBA_VERSION}
+def buildDriver() {
+ sh label: 'Build driver', script: '''#!/bin/bash -le
+ . ${JABBA_SHELL}
+ jabba use ${JABBA_VERSION}
 
- mvn -B -V install -DskipTests -Dmaven.javadoc.skip=true
- '''
- }
+ mvn -B -V install -DskipTests -Dmaven.javadoc.skip=true
+ '''
 }
 
 def executeTests() {
@@ -104,13 +79,7 @@ def executeTests() {
  set +o allexport
 
  . ${JABBA_SHELL}
- jabba use 1.8
-
- if [ "${JABBA_VERSION}" != "1.8" ]; then
- SKIP_JAVADOCS=true
- else
- SKIP_JAVADOCS=false
- fi
+ jabba use ${JABBA_VERSION}
 
  INTEGRATION_TESTS_FILTER_ARGUMENT=""
  if [ ! -z "${INTEGRATION_TESTS_FILTER}" ]; then
@@ -119,11 +88,8 @@ def executeTests() {
  printenv | sort
 
  mvn -B -V ${INTEGRATION_TESTS_FILTER_ARGUMENT} -T 1 verify \
- -Ptest-jdk-${TEST_JAVA_VERSION} \
- -DtestJavaHome=${TEST_JAVA_HOME} \
  -DfailIfNoTests=false \
  -Dmaven.test.failure.ignore=true \
- -Dmaven.javadoc.skip=${SKIP_JAVADOCS} \
  -Dccm.version=${CCM_CASSANDRA_VERSION} \
  -Dccm.dse=${CCM_IS_DSE} \
  -Dproxy.path=${HOME}/proxy \
@@ -459,7 +425,7 @@ pipeline {
  }
  stage('Build-Driver') {
  steps {
- buildDriver('default')
+ buildDriver()
  }
  }
  stage('Execute-Tests') {
@@ -573,8 +539,7 @@ pipeline {
  }
  stage('Build-Driver') {
  steps {
- // Jabba default should be a JDK8 for now
- buildDriver('default')
+ buildDriver()
  }
  }
  stage('Execute-Tests') {

ci/install-jdk.sh

@@ -200,6 +200,7 @@ function determine_url() {
  10-BCL) url="${ORACLE}/10.0.2+13/19aef61b38124481863b1413dce1855f/jdk-10.0.2_${os}_bin.tar.gz"; return;;
  11-GPL) url="${DOWNLOAD}/GA/jdk11/13/GPL/openjdk-11.0.1_${os}_bin.tar.gz"; return;;
  11-BCL) url="${ORACLE}/11.0.1+13/90cf5d8f270a4347a95050320eef3fb7/jdk-11.0.1_${os}_bin.tar.gz"; return;;
+ 17-GPL) url="${DOWNLOAD}/GA/jdk17.0.2/dfd4a8d0985749f896bed50d7138ee7f/8/GPL/openjdk-17.0.2_${os}_bin.tar.gz"; return;;
  esac
 
  # EA or RC build?

core-shaded/pom.xml

@@ -283,6 +283,11 @@
  <artifactId>esri-geometry-api</artifactId>
  <version>1.2.1</version>
  </additionalDependency>
+ <additionalDependency>
+ <groupId>org.jetbrains</groupId>
+ <artifactId>annotations</artifactId>
+ <version>24.0.1</version>
+ </additionalDependency>
  </additionalDependencies>
  </configuration>
  </execution>

core/pom.xml

@@ -248,7 +248,6 @@
  <plugin>
  <artifactId>maven-surefire-plugin</artifactId>
  <configuration>
- <jvm>${testing.jvm}/bin/java</jvm>
  <argLine>${mockitoopens.argline}</argLine>
  <threadCount>1</threadCount>
  <properties>

core/src/main/java/com/datastax/oss/driver/api/core/CqlIdentifier.java

@@ -41,7 +41,8 @@
  *
  * Examples:
  *
- * <table summary="examples">
+ * <table>
+ * <caption>examples</caption>
  * <tr><th>Create statement</th><th>Case-sensitive?</th><th>CQL id</th><th>Internal id</th></tr>
  * <tr><td>CREATE TABLE t(foo int PRIMARY KEY)</td><td>No</td><td>foo</td><td>foo</td></tr>
  * <tr><td>CREATE TABLE t(Foo int PRIMARY KEY)</td><td>No</td><td>foo</td><td>foo</td></tr>

core/src/main/java/com/datastax/oss/driver/api/core/paging/OffsetPager.java

@@ -44,7 +44,7 @@
  * a reasonable trade-off if the cardinality stays low. This class provides a way to emulate this
  * behavior on the client side.
  *
- * <h3>Performance considerations</h3>
+ * <h2>Performance considerations</h2>
  *
  * For each page that you want to retrieve:
  *
@@ -69,7 +69,7 @@
  * OffsetPager.Page&lt;Row&gt; page5 = pager.getPage(rs, 5);
  * </pre>
  *
- * <h3>Establishing application-level guardrails</h3>
+ * <h2>Establishing application-level guardrails</h2>
  *
  * Linear performance should be fine for the values typically encountered in real-world
  * applications: for example, if the page size is 25 and users never go past page 10, the worst case
@@ -79,7 +79,7 @@
  * maximum, so that an attacker can't inject a large value that could potentially fetch millions of
  * rows.
  *
- * <h3>Relation with protocol-level paging</h3>
+ * <h2>Relation with protocol-level paging</h2>
  *
  * Protocol-level paging refers to the ability to split large response into multiple network chunks:
  * see {@link Statement#setPageSize(int)} and {@code basic.request.page-size} in the configuration.

integration-tests/pom.xml

@@ -219,6 +219,37 @@
  </dependencies>
  <build>
  <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>process-test-annotations</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ <configuration>
+ <annotationProcessorPaths>
+ <path>
+ <groupId>com.datastax.oss</groupId>
+ <artifactId>java-driver-mapper-processor</artifactId>
+ <version>${project.version}</version>
+ </path>
+ <path>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-nop</artifactId>
+ <version>${slf4j.version}</version>
+ </path>
+ <path>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>gremlin-core</artifactId>
+ <version>${tinkerpop.version}</version>
+ </path>
+ </annotationProcessorPaths>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-failsafe-plugin</artifactId>
@@ -229,7 +260,6 @@
  <goal>integration-test</goal>
  </goals>
  <configuration>
- <jvm>${testing.jvm}/bin/java</jvm>
  <groups>com.datastax.oss.driver.categories.ParallelizableTests</groups>
  <parallel>classes</parallel>
  <threadCountClasses>8</threadCountClasses>
@@ -246,7 +276,6 @@
  <excludedGroups>com.datastax.oss.driver.categories.ParallelizableTests, com.datastax.oss.driver.categories.IsolatedTests</excludedGroups>
  <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-serial.xml</summaryFile>
  <skipITs>${skipSerialITs}</skipITs>
- <jvm>${testing.jvm}/bin/java</jvm>
  </configuration>
  </execution>
  <execution>
@@ -262,7 +291,6 @@
  <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-isolated.xml</summaryFile>
  <skipITs>${skipIsolatedITs}</skipITs>
  <argLine>${blockhound.argline}</argLine>
- <jvm>${testing.jvm}/bin/java</jvm>
  </configuration>
  </execution>
  <execution>

mapper-runtime/pom.xml

@@ -122,7 +122,6 @@
  <plugin>
  <artifactId>maven-surefire-plugin</artifactId>
  <configuration>
- <jvm>${testing.jvm}/bin/java</jvm>
  <threadCount>1</threadCount>
  <properties>
  <!-- tell TestNG not to run jUnit tests -->