diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 2d2e031..cb6023d 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -23,12 +23,17 @@ jobs: - uses: actions/checkout@v4 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Set up JDK 21 - uses: actions/setup-java@v4 # https://github.com/actions/setup-java + - name: Set up JDK 22 + # TODO: Switch back to actions/setup-java@v4 once they support JDK 22 for temurin + #uses: actions/setup-java@v4 # https://github.com/actions/setup-java + #with: + # java-version: '22' + # distribution: 'temurin' + # cache: maven + uses: oracle-actions/setup-java@v1 # https://github.com/oracle-actions/setup-java with: - java-version: '21' - distribution: 'temurin' - cache: maven + website: jdk.java.net + release: 22 - name: Verify and Package with Maven run: ./mvnw --batch-mode --file pom.xml verify package diff --git a/Dockerfile b/Dockerfile index fbf2427..c8f1eec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ############################################################################### # Stage 1 (to create a "build" image) # ############################################################################### -FROM eclipse-temurin:21-jdk-alpine AS builder +FROM eclipse-temurin:22-jdk-alpine AS builder # Smoke test to verify if java is available. RUN java -version diff --git a/README.md b/README.md index 436ba18..a8aa65e 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Features: including a downsized JRE (built inside Docker via `jlink`) to minimize the size of the generated Docker image, which is **131MB**. - Supports [Docker BuildKit](https://docs.docker.com/build/) -- Java 21 (Eclipse Temurin) +- Java 22 (Eclipse Temurin) - [JUnit 5](https://github.com/junit-team/junit5) for testing, [Jacoco](https://github.com/jacoco/jacoco) for code coverage, [SpotBugs](https://github.com/spotbugs/spotbugs) for static code analysis @@ -130,7 +130,7 @@ $ just docker-image-create # Notes You can also build, test, package, and run the Java application locally -(without Docker) if you have JDK 21+ installed. You do not need to have Maven +(without Docker) if you have JDK 22+ installed. You do not need to have Maven installed, because this repository contains the [Maven Wrapper](https://github.com/apache/maven-wrapper) `mvnw` (use `mvnw.cmd` on Windows). diff --git a/pom.xml b/pom.xml index 5f622e8..0851397 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ UTF-8 UTF-8 - 21 + 22 ${java.version} true ${java.version}