Skip to content

Update to Java 25 #7246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
optionsome wants to merge 1 commit into
base: dev-2.x
Choose a base branch
from
+26 −26
Open

Update to Java 25 #7246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions .github/workflows/cibuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ jobs:
node-version: 18

# Java setup step completes very fast, no need to run in a preconfigured docker container
- name: Set up JDK 21
uses: actions/setup-java@v4
- name: Set up JDK 25
uses: actions/setup-java@v5
with:
java-version: 21
java-version: 25
distribution: temurin
cache: maven

Expand Down Expand Up @@ -82,10 +82,10 @@ jobs:
runs-on: windows-latest
steps:
- uses: actions/checkout@v4
- name: Set up JDK 21
uses: actions/setup-java@v4
- name: Set up JDK 25
uses: actions/setup-java@v5
with:
java-version: 21
java-version: 25
distribution: temurin
cache: maven
# on windows there are frequent failures caused by page files being too small
Expand Down Expand Up @@ -199,10 +199,10 @@ jobs:
run: |
yarn install
yarn generate
- name: Set up JDK 21
uses: actions/setup-java@v4
- name: Set up JDK 25
uses: actions/setup-java@v5
with:
java-version: 21
java-version: 25
distribution: temurin
cache: maven
- name: Compile Java code
Expand All @@ -218,10 +218,10 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up JDK 21
uses: actions/setup-java@v4
- name: Set up JDK 25
uses: actions/setup-java@v5
with:
java-version: 21
java-version: 25
distribution: temurin
cache: maven
- uses: actions/setup-node@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integration-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
- name: Checkout code
uses: actions/checkout@v5

- name: Set up JDK 21
- name: Set up JDK 25
uses: actions/setup-java@v5
with:
java-version: 21
java-version: 25
distribution: temurin
cache: maven

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/performance-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,17 +73,17 @@ jobs:

- name: Set up JDK
if: matrix.profile == 'core' || github.ref == 'refs/heads/dev-2.x'
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
java-version: 21
java-version: 25
distribution: temurin
timeout-minutes: 5

- name: Set up Maven
if: matrix.profile == 'core' || github.ref == 'refs/heads/dev-2.x'
uses: stCarolas/setup-maven@v5
with:
maven-version: 3.8.2
maven-version: 3.9.12

- name: Build jar
if: matrix.profile == 'core' || github.ref == 'refs/heads/dev-2.x'
Expand Down
4 changes: 2 additions & 2 deletions CLAUDE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co

OpenTripPlanner (OTP) is an open source multi-modal trip planner focusing on travel by scheduled public transportation combined with bicycling, walking, and mobility services. This is OTP2 (dev-2.x branch), the second major version under active development.

**Tech Stack:** Java 21, Maven, GraphQL API, GTFS/NeTEx transit data, OpenStreetMap
**Tech Stack:** Java 25, Maven, GraphQL API, GTFS/NeTEx transit data, OpenStreetMap

## Essential Build Commands

Expand Down Expand Up @@ -237,7 +237,7 @@ Dashboard: https://otp-performance.leonard.io/
## Project Structure Notes

- Maven multi-module project
- Java 21 target
- Java 25 target
- Serialization version ID tracked in `pom.xml` property `otp.serialization.version.id`
- Shaded JAR output: `otp-shaded/target/otp-shaded-VERSION.jar`
- Client code: `client/src/` (MapLibre-based JavaScript client for testing)
Expand Down
6 changes: 3 additions & 3 deletions doc/user/Basic-Tutorial.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ take a few minutes!
## Get Java

As a Java program, OTP must be run within a Java virtual machine (JVM), which is provided as part of
the Java runtime (JRE) or Java development kit (JDK). OTP2 is compatible with Java 21 or later. We
recommend running on Java 21 rather than a later version, as it is a long-term support release.
Run `java -version` to check that you have version 21 or newer of the JVM installed. If you do not,
the Java runtime (JRE) or Java development kit (JDK). OTP2 is compatible with Java 25 or later. We
recommend running on Java 25 rather than a later version, as it is a long-term support release.
Run `java -version` to check that you have version 25 or newer of the JVM installed. If you do not,
you will need to install a recent OpenJDK or Oracle Java package for your operating system.

## Get OTP
Expand Down
2 changes: 1 addition & 1 deletion doc/user/Getting-OTP.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ You should only need the following software:

- Git, a version control system

- Java Development Kit, preferably version 21
- Java Development Kit, preferably version 25

- Maven, a build and dependency management system

Expand Down
2 changes: 1 addition & 1 deletion doc/user/Version-Comparison.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ the EU profile, and generalization to the EU profile should be feasible once it
| Elevation data | TIFF and NED | TIFF and NED |
| One-to-many routing,<br> isochrones and scripting | yes | no |
| Isochrones | yes | yes |
| Java version | 8+ | 21+ |
| Java version | 8+ | 25+ |
| Multiple regions per server | yes | no |
| Hot reloading of graphs | yes | no |
| Street (OSM) routing algorithm | Generalized cost A* | Generalized cost A* |
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
<version>3.14.1</version>
<configuration>
<!-- Target Java version -->
<release>21</release>
<release>25</release>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -407,7 +407,7 @@
</ports>
</container>
<from>
<image>eclipse-temurin:24-jre</image>
<image>eclipse-temurin:25-jre</image>
<platforms>
<platform>
<architecture>amd64</architecture>
Expand Down
Loading