STREAM-822: Add support for JDK 21

.github/workflows/ci-integration.yml

@@ -28,6 +28,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        java:
+          - '11'
+          - '21'
         cassandra:
           - cassandra_version: 3.0.27
             ccm_version: 3.0.27
@@ -62,10 +65,10 @@ jobs:
         run: |
           export JDK8_PATH=$JAVA_HOME
           echo "JDK8_PATH=$JDK8_PATH" >> $GITHUB_ENV
-      - name: Set up JDK 11
+      - name: Set up JDK ${{ matrix.java }}
         uses: actions/setup-java@v2
         with:
-          java-version: 11
+          java-version: ${{ matrix.java }}
           distribution: 'temurin'
       - name: Pre set up Python
         run: |
@@ -87,12 +90,13 @@ jobs:
       - name: Setup CCM private
         if: ${{ matrix.cassandra.is_dse }}
         env:
-          CLONE_RIPTANO_CCM_SECRET: ${{secrets.CLONE_RIPTANO_CCM_SECRET}}
+          CLONE_RIPTANO_CCM_SECRET: ${{secrets.CLONE_RIPTANO_CCM_PRIVATE_SECRET}}
         run: |
           #!/bin/bash
           set -e
           echo "Cloning the repo"
-          git clone https://${CLONE_RIPTANO_CCM_SECRET}:x-oauth-basic@github.com/riptano/ccm-private.git
+          echo $CLONE_RIPTANO_CCM_SECRET
+          git clone https://${CLONE_RIPTANO_CCM_SECRET}@github.com/riptano/ccm-private.git
           cd ccm-private
           echo "pip install requirements"
           pip install -r requirements.txt
@@ -111,7 +115,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-
 
-      - name: Build with JDK 11
+      - name: Build with JDK ${{ matrix.java }}
         run: mvn -B clean install -DskipTests
 
       - name: Run integration tests

.github/workflows/github-ci.yml

@@ -16,6 +16,7 @@ jobs:
       matrix:
         java:
           - '11'
+          - '21'
 
     steps:
       - uses: actions/checkout@v2

dist/pom.xml

@@ -88,7 +88,7 @@
                 <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                   <resource>META-INF/io.netty.versions.properties</resource>
                 </transformer>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
               </transformers>
             </configuration>
           </execution>

pom.xml

@@ -50,7 +50,7 @@
     <guava.version>25.1-jre</guava.version>
     <slf4j.version>1.7.36</slf4j.version>
     <logback.version>1.2.13</logback.version>
-    <junit.version>5.4.1</junit.version>
+    <junit.version>5.10.2</junit.version>
     <assertj.version>3.14.0</assertj.version>
     <mockito.version>2.18.3</mockito.version>
     <wiremock.version>2.25.0</wiremock.version>
@@ -270,11 +270,6 @@
         <artifactId>kafka-schema-registry-client-encryption-hcvault</artifactId>
         <version>${confluent.version}</version>
       </dependency>
-      <dependency>
-        <groupId>io.confluent</groupId>
-        <artifactId>kafka-schema-registry-client-encryption-hcvault</artifactId>
-        <version>${confluent.version}</version>
-      </dependency>
       <dependency>
         <groupId>com.amazonaws</groupId>
         <artifactId>aws-java-sdk-core</artifactId>
@@ -464,7 +459,7 @@ limitations under the License.]]></inlineHeader>
         <plugin>
           <groupId>org.jacoco</groupId>
           <artifactId>jacoco-maven-plugin</artifactId>
-          <version>0.8.6</version>
+          <version>0.8.12</version>
           <executions>
             <execution>
               <id>unit-tests-coverage</id>
@@ -659,17 +654,54 @@ limitations under the License.]]></inlineHeader>
     </plugins>
   </build>
   <profiles>
+    <!-- NEW: Separate profile specifically for Java 21+ -->
+    <profile>
+      <id>jdk21</id>
+      <activation>
+        <jdk>[21..)</jdk>
+      </activation>
+      <build>
+        <pluginManagement>
+          <plugins>
+            <plugin>
+              <artifactId>maven-compiler-plugin</artifactId>
+              <version>3.11.0</version>
+              <configuration>
+                <source>${java.version}</source>
+                <target>${java.version}</target>
+                <release>${java.release.version}</release>
+                <showDeprecation>true</showDeprecation>
+                <showWarnings>true</showWarnings>
+                <failOnWarning>false</failOnWarning>
+                <fork>false</fork>
+                <compilerArgs>
+                  <arg>-XDcompilePolicy=simple</arg>
+                  <arg>-Xplugin:ErrorProne</arg>
+                </compilerArgs>
+                <annotationProcessorPaths>
+                  <path>
+                    <groupId>com.google.errorprone</groupId>
+                    <artifactId>error_prone_core</artifactId>
+                    <version>2.28.0</version>
+                  </path>
+                </annotationProcessorPaths>
+              </configuration>
+            </plugin>
+          </plugins>
+        </pluginManagement>
+      </build>
+    </profile>
     <profile>
       <id>jdk11</id>
       <activation>
-        <jdk>[9..)</jdk>
+        <jdk>[9,21)</jdk>
       </activation>
       <build>
         <pluginManagement>
           <plugins>
             <plugin>
               <artifactId>maven-compiler-plugin</artifactId>
-              <version>3.8.1</version>
+              <version>3.11.0</version>
               <configuration>
                 <source>${java.version}</source>
                 <target>${java.version}</target>
@@ -687,7 +719,7 @@ limitations under the License.]]></inlineHeader>
                   <path>
                     <groupId>com.google.errorprone</groupId>
                     <artifactId>error_prone_core</artifactId>
-                    <version>2.4.0</version>
+                    <version>2.28.0</version>
                   </path>
                 </annotationProcessorPaths>
               </configuration>

sink/src/it/java/com/datastax/oss/kafka/sink/state/LifeCycleManagerIT.java

@@ -93,9 +93,10 @@ void should_build_dse_session_with_unresolved_contact_points_when_hostname_valid
       assertThat(set).isNotNull();
       // and endPoint uses unresolved DNS address
       EndPoint endPoint = getEndPoint(session);
-      assertThat(endPoint.toString())
-          .isEqualTo(String.format("%s:%d", contactPointDns, ccm.getBinaryPort()));
-      assertTrue(((InetSocketAddress) endPoint.resolve()).isUnresolved());
+      InetSocketAddress address = (InetSocketAddress) endPoint.resolve();
+      assertThat(address.getHostString()).isEqualTo(contactPointDns);
+      assertThat(address.getPort()).isEqualTo(ccm.getBinaryPort());
+      assertTrue(address.isUnresolved());
     }
   }
 
@@ -127,9 +128,10 @@ void should_build_dse_session_with_unresolved_contact_points_when_hostname_valid
       assertThat(set).isNotNull();
       // and endPoint uses unresolved IP address
       EndPoint endPoint = getEndPoint(session);
-      assertThat(endPoint.toString())
-          .isEqualTo(String.format("%s:%d", contactPointIp, ccm.getBinaryPort()));
-      assertTrue(((InetSocketAddress) endPoint.resolve()).isUnresolved());
+      InetSocketAddress address = (InetSocketAddress) endPoint.resolve();
+      assertThat(address.getHostString()).isEqualTo(contactPointIp);
+      assertThat(address.getPort()).isEqualTo(ccm.getBinaryPort());
+      assertTrue(address.isUnresolved());
     }
   }