Upgrade to Java 21

ponder-lab · Aug 3, 2024 · cd44f2a · cd44f2a
1 parent d34f259
commit cd44f2a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 17 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,25 +6,16 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        java: [jdk11, jdk18, graalvm]
+        java: [jdk21]
       fail-fast: false
     steps:
       - name: Check out the repository
         uses: actions/checkout@v2
-      - name: Test in Linux JDK 11
-        if: matrix.os == 'ubuntu-latest' && matrix.java == 'jdk11'
+      - name: Test in Linux JDK 21
+        if: matrix.os == 'ubuntu-latest' && matrix.java == 'jdk21'
         run: docker compose -f docker/Linux-JDK11/docker-compose.yml up --build --exit-code-from cantaloupe
-      - name: Test in Linux JDK 18
-        if: matrix.os == 'ubuntu-latest' && matrix.java == 'jdk18'
-        run: docker compose -f docker/Linux-JDK18/docker-compose.yml up --build --exit-code-from cantaloupe
-      - name: Test in Linux GraalVM
-        if: matrix.os == 'ubuntu-latest' && matrix.java == 'graalvm'
-        run: docker compose -f docker/Linux-GraalVM20/docker-compose.yml up --build --exit-code-from cantaloupe
-      - name: Test in Windows JDK 11
-        if: matrix.os == 'windows-latest' && matrix.java == 'jdk11'
+      - name: Test in Windows JDK 21
+        if: matrix.os == 'windows-latest' && matrix.java == 'jdk21'
         run: docker-compose -f docker/Windows-JDK11/docker-compose.yml up --build --exit-code-from cantaloupe
-      - name: Test in Windows JDK 18
-        if: matrix.os == 'windows-latest' && matrix.java == 'jdk18'
-        run: docker-compose -f docker/Windows-JDK18/docker-compose.yml up --build --exit-code-from cantaloupe
       # TODO: Windows+GraalVM
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,7 +10,7 @@ jobs:
     steps:
       - uses: actions/setup-java@v1
         with:
-          java-version: '11'
+          java-version: '21'
           java-package: jdk
           architecture: x64
       - name: Checkout Code

diff --git a/pom.xml b/pom.xml
@@ -11,8 +11,8 @@
     <inceptionYear>2015</inceptionYear>
 
     <properties>
-        <maven.compile.source>11</maven.compile.source>
-        <maven.compile.target>11</maven.compile.target>
+        <maven.compile.source>21</maven.compile.source>
+        <maven.compile.target>21</maven.compile.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <jetty.version>11.0.5</jetty.version>