From b4b36683afdf79dd8bf70b95199b874c68218975 Mon Sep 17 00:00:00 2001
From: Brian Kroth <bpkroth@users.noreply.github.com>
Date: Wed, 13 Dec 2023 10:15:06 -0600
Subject: [PATCH] Upgrade to Java 21 (#410)

Separates a conversion to Java 21 from #398 and also handles errors
encountered in #369.
---
 .github/workflows/maven.yml                             | 4 ++--
 docker/benchbase/devcontainer/Dockerfile                | 3 +--
 docker/benchbase/fullimage/Dockerfile                   | 3 +--
 pom.xml                                                 | 8 ++++----
 src/test/java/com/oltpbenchmark/util/TestClassUtil.java | 2 ++
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 07bcd3a51..9b74ebf40 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -32,8 +32,8 @@ on:
         type: string
 
 env:
-  POM_VERSION: 2021-SNAPSHOT
-  JAVA_VERSION: 17
+  POM_VERSION: 2023-SNAPSHOT
+  JAVA_VERSION: 21
   ERRORS_THRESHOLD: 0.01
 
 jobs:
diff --git a/docker/benchbase/devcontainer/Dockerfile b/docker/benchbase/devcontainer/Dockerfile
index 49e3867b3..c44afa4d7 100644
--- a/docker/benchbase/devcontainer/Dockerfile
+++ b/docker/benchbase/devcontainer/Dockerfile
@@ -1,6 +1,5 @@
 # For the devcontainer we need a full JDK.
-#FROM --platform=linux maven:3.8.5-eclipse-temurin-17 AS devcontainer
-FROM maven:3.9.3-eclipse-temurin-17 AS devcontainer
+FROM maven:3.9.5-eclipse-temurin-21 AS devcontainer
 
 LABEL org.opencontainers.image.source = "https://github.com/cmu-db/benchbase/"
 
diff --git a/docker/benchbase/fullimage/Dockerfile b/docker/benchbase/fullimage/Dockerfile
index 9c87736ec..3ce9e7be7 100644
--- a/docker/benchbase/fullimage/Dockerfile
+++ b/docker/benchbase/fullimage/Dockerfile
@@ -1,8 +1,7 @@
 # TODO: Use a multi-stage build to build the fullimage from the devcontainer.
 
 # Use a smaller base image that only has the jre, not the full jdk.
-#FROM --platform=linux eclipse-temurin:17-jre AS fullimage
-FROM eclipse-temurin:17-jre AS fullimage
+FROM eclipse-temurin:21-jre AS fullimage
 
 LABEL org.opencontainers.image.source = "https://github.com/cmu-db/benchbase/"
 
diff --git a/pom.xml b/pom.xml
index 1dc6cf5fd..05dc0846c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,16 +5,16 @@
 
     <groupId>com.oltpbenchmark</groupId>
     <artifactId>benchbase</artifactId>
-    <version>2021-SNAPSHOT</version>
+    <version>2023-SNAPSHOT</version>
     <name>BenchBase</name>
     <description>BenchBase is a Multi-DBMS SQL Benchmarking Framework via JDBC https://github.com/cmu-db/benchbase</description>
     <url>https://github.com/cmu-db/benchbase</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>17</java.version>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <java.version>21</java.version>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <buildDirectory>${project.basedir}/target</buildDirectory>
         <!--
             Provids a way to limit which assembly package formats we produce.
diff --git a/src/test/java/com/oltpbenchmark/util/TestClassUtil.java b/src/test/java/com/oltpbenchmark/util/TestClassUtil.java
index 450bd8b62..3f1741d17 100644
--- a/src/test/java/com/oltpbenchmark/util/TestClassUtil.java
+++ b/src/test/java/com/oltpbenchmark/util/TestClassUtil.java
@@ -123,6 +123,8 @@ public void testGetInterfaces() {
                 Collection.class,
                 List.class,
                 RandomAccess.class,
+                // New in Java 21:
+                SequencedCollection.class,
         };
         Collection<Class<?>> results = ClassUtil.getInterfaces(target_class);
         // System.err.println(target_class + " => " + results);