Skip to content

Commit

Permalink
Upgrade to Java 21 (#410)
Browse files Browse the repository at this point in the history
Separates a conversion to Java 21 from #398 and also handles errors
encountered in #369.
  • Loading branch information
bpkroth authored Dec 13, 2023
1 parent 65322e9 commit b4b3668
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 1 addition & 2 deletions docker/benchbase/devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -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/"

Expand Down
3 changes: 1 addition & 2 deletions docker/benchbase/fullimage/Dockerfile
Original file line number Diff line number Diff line change
@@ -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/"

Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 2 additions & 0 deletions src/test/java/com/oltpbenchmark/util/TestClassUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit b4b3668

Please sign in to comment.