Skip to content

Commit b4b3668

Browse files
authored
Upgrade to Java 21 (#410)
Separates a conversion to Java 21 from #398 and also handles errors encountered in #369.
1 parent 65322e9 commit b4b3668

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

.github/workflows/maven.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ on:
3232
type: string
3333

3434
env:
35-
POM_VERSION: 2021-SNAPSHOT
36-
JAVA_VERSION: 17
35+
POM_VERSION: 2023-SNAPSHOT
36+
JAVA_VERSION: 21
3737
ERRORS_THRESHOLD: 0.01
3838

3939
jobs:

docker/benchbase/devcontainer/Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# For the devcontainer we need a full JDK.
2-
#FROM --platform=linux maven:3.8.5-eclipse-temurin-17 AS devcontainer
3-
FROM maven:3.9.3-eclipse-temurin-17 AS devcontainer
2+
FROM maven:3.9.5-eclipse-temurin-21 AS devcontainer
43

54
LABEL org.opencontainers.image.source = "https://github.com/cmu-db/benchbase/"
65

docker/benchbase/fullimage/Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
# TODO: Use a multi-stage build to build the fullimage from the devcontainer.
22

33
# Use a smaller base image that only has the jre, not the full jdk.
4-
#FROM --platform=linux eclipse-temurin:17-jre AS fullimage
5-
FROM eclipse-temurin:17-jre AS fullimage
4+
FROM eclipse-temurin:21-jre AS fullimage
65

76
LABEL org.opencontainers.image.source = "https://github.com/cmu-db/benchbase/"
87

pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55

66
<groupId>com.oltpbenchmark</groupId>
77
<artifactId>benchbase</artifactId>
8-
<version>2021-SNAPSHOT</version>
8+
<version>2023-SNAPSHOT</version>
99
<name>BenchBase</name>
1010
<description>BenchBase is a Multi-DBMS SQL Benchmarking Framework via JDBC https://github.com/cmu-db/benchbase</description>
1111
<url>https://github.com/cmu-db/benchbase</url>
1212

1313
<properties>
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
15-
<java.version>17</java.version>
16-
<maven.compiler.source>17</maven.compiler.source>
17-
<maven.compiler.target>17</maven.compiler.target>
15+
<java.version>21</java.version>
16+
<maven.compiler.source>21</maven.compiler.source>
17+
<maven.compiler.target>21</maven.compiler.target>
1818
<buildDirectory>${project.basedir}/target</buildDirectory>
1919
<!--
2020
Provids a way to limit which assembly package formats we produce.

src/test/java/com/oltpbenchmark/util/TestClassUtil.java

+2
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,8 @@ public void testGetInterfaces() {
123123
Collection.class,
124124
List.class,
125125
RandomAccess.class,
126+
// New in Java 21:
127+
SequencedCollection.class,
126128
};
127129
Collection<Class<?>> results = ClassUtil.getInterfaces(target_class);
128130
// System.err.println(target_class + " => " + results);

0 commit comments

Comments
 (0)