From 01b3b0e6ec14fd6d844e9c84227514a5d53bc503 Mon Sep 17 00:00:00 2001
From: Michael Barry <msbarry@users.noreply.github.com>
Date: Wed, 25 Oct 2023 20:48:05 -0400
Subject: [PATCH] Use java 21 (#124)

---
 .github/workflows/maven.yml       | 19 +++++++------------
 .github/workflows/performance.yml |  2 +-
 .github/workflows/snapshot.yml    |  2 +-
 README.md                         |  2 +-
 pom.xml                           | 10 +++++-----
 5 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 9df74c73..1904de23 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -17,10 +17,10 @@ jobs:
     steps:
       - name: Checkout this PR planetiler-openmaptiles repo
         uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
       - name: Ensure code formatted with mvn spotless:apply
@@ -33,12 +33,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest, macos-latest, windows-latest ]
-        jdk: [ 17 ]
-        include:
-          - os: ubuntu-latest
-            jdk: 18
-          - os: ubuntu-latest
-            jdk: 19
+        jdk: [ 21 ]
     runs-on: ${{ matrix.os }}
     timeout-minutes: 15
     steps:
@@ -66,10 +61,10 @@ jobs:
     steps:
       - name: Checkout this PR planetiler-openmaptiles repo
         uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
       - run: ./scripts/regenerate-openmaptiles.sh
@@ -88,7 +83,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
       - name: Build this branch
@@ -127,7 +122,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
       - name: Build and test this branch
diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml
index 5ae3f433..eb6d8b37 100644
--- a/.github/workflows/performance.yml
+++ b/.github/workflows/performance.yml
@@ -45,7 +45,7 @@ jobs:
       - name: 'Set up JDK'
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
       - uses: actions/setup-node@v4
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
index 227d8e1d..4fe12506 100644
--- a/.github/workflows/snapshot.yml
+++ b/.github/workflows/snapshot.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
       - name: Login to Docker Hub
diff --git a/README.md b/README.md
index 6f383863..90ae11ff 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ Using pre-built docker image:
 docker run -v "$(pwd)/data":/data openmaptiles/planetiler-openmaptiles:latest --force --download --area=monaco
 ```
 
-Or to build from source, after [installing Java 17+](https://adoptium.net/installation.html):
+Or to build from source, after [installing Java 21+](https://adoptium.net/installation.html):
 
 ```bash
 # Build the project (use mvnw.cmd on windows):
diff --git a/pom.xml b/pom.xml
index e7532362..0f26a9be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,8 +7,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>17</maven.compiler.source>
-    <maven.compiler.target>17</maven.compiler.target>
+    <maven.compiler.source>21</maven.compiler.source>
+    <maven.compiler.target>21</maven.compiler.target>
     <planetiler.version>0.7-SNAPSHOT</planetiler.version>
     <junit.version>5.10.0</junit.version>
 
@@ -140,7 +140,7 @@
         </executions>
       </plugin>
 
-      <!-- require building with jdk 17 -->
+      <!-- require building with jdk 21 -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
@@ -154,7 +154,7 @@
             <configuration>
               <rules>
                 <requireJavaVersion>
-                  <version>17</version>
+                  <version>21</version>
                 </requireJavaVersion>
               </rules>
             </configuration>
@@ -209,7 +209,7 @@
         <configuration>
           <from>
             <image>
-              eclipse-temurin:17-jre
+              eclipse-temurin:21-jre
             </image>
             <platforms>
               <platform>