Skip to content

Commit

Permalink
Use java 21 (#124)
Browse files Browse the repository at this point in the history
  • Loading branch information
msbarry authored Oct 26, 2023
1 parent f885ed7 commit 01b3b0e
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 20 deletions.
19 changes: 7 additions & 12 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/performance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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>
Expand All @@ -154,7 +154,7 @@
<configuration>
<rules>
<requireJavaVersion>
<version>17</version>
<version>21</version>
</requireJavaVersion>
</rules>
</configuration>
Expand Down Expand Up @@ -209,7 +209,7 @@
<configuration>
<from>
<image>
eclipse-temurin:17-jre
eclipse-temurin:21-jre
</image>
<platforms>
<platform>
Expand Down

0 comments on commit 01b3b0e

Please sign in to comment.