Skip to content

Commit 3f603c5

Browse files
committed
build!: Upgrade to Java 25 to benefit from various optimizations
BREAKING CHANGE: ORT is now compiled to bytecode level 69, so programmatic users of ORT libraries have to use Java 25 as well. Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.org>
1 parent 5038f9f commit 3f603c5

8 files changed

Lines changed: 20 additions & 22 deletions

File tree

.env.versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ DOTNET_VERSION=6.0
1313
GLEAM_VERSION=1.13.0
1414
GO_VERSION=1.25.0
1515
HASKELL_STACK_VERSION=2.13.1
16-
JAVA_VERSION=21
16+
JAVA_VERSION=25
1717
LICENSEE_VERSION=9.18.0
1818
MIX_SBOM_VERSION=0.9.1
1919
NODEJS_VERSION=24.10.0

.github/workflows/build-and-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
2727
with:
2828
distribution: temurin
29-
java-version: 21
29+
java-version: 25
3030
- name: Setup Gradle
3131
uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
3232
- name: Build all classes
@@ -65,7 +65,7 @@ jobs:
6565
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
6666
with:
6767
distribution: temurin
68-
java-version: 21
68+
java-version: 25
6969
- name: Setup Gradle
7070
uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
7171
- name: Install Flox

.github/workflows/static-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
4242
with:
4343
distribution: temurin
44-
java-version: 21
44+
java-version: 25
4545
- name: Setup Gradle
4646
uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
4747
- name: Generate completions

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ For detailed information, see the documentation on the [ORT Website](https://oss
6464

6565
ORT is being continuously used on Linux, Windows and macOS by the [core development team](https://github.com/orgs/oss-review-toolkit/people), so these operating systems are considered to be well-supported.
6666

67-
To run the ORT binaries (also see [Installation from binaries](#from-binaries)) at least Java 21 is required.
67+
To run the ORT binaries (also see [Installation from binaries](#from-binaries)) at least Java 25 is required.
6868
Memory and CPU requirements vary depending on the size and type of project(s) to analyze / scan, but the general recommendation is to configure Java with 8 GiB of memory and to use a CPU with at least 4 cores.
6969

7070
```shell

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ kotlin.code.style = official
2727

2828
# The version of the JDK to use for building ORT.
2929
# Keep this aligned with `toolchainVersion` in `gradle/gradle-daemon-jvm.properties`.
30-
javaLanguageVersion = 21
30+
javaLanguageVersion = 25
3131

3232
# The version of the SPDX license list which is used to import license texts and generate SPDX enums. Must be a valid
3333
# tag, see https://github.com/spdx/license-list-data/tags.
Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
# The version of the JDK to use for running Gradle.
2-
# Keep this aligned with `javaLanguageVersion` in `gradle.properties`.
3-
toolchainVersion = 21
4-
5-
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ec7520a1e057cd116f9544c42142a16b/redirect
6-
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/4c4f879899012ff0a8b2e2117df03b0e/redirect
7-
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ec7520a1e057cd116f9544c42142a16b/redirect
8-
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/4c4f879899012ff0a8b2e2117df03b0e/redirect
9-
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/73bcfb608d1fde9fb62e462f834a3299/redirect
10-
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/846ee0d876d26a26f37aa1ce8de73224/redirect
11-
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ec7520a1e057cd116f9544c42142a16b/redirect
12-
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/4c4f879899012ff0a8b2e2117df03b0e/redirect
13-
toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/9482ddec596298c84656d31d16652665/redirect
14-
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/39701d92e1756bb2f141eb67cd4c660e/redirect
1+
#This file is generated by updateDaemonJvm
2+
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect
3+
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect
4+
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect
5+
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect
6+
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e1118b4c7c2858d28154d086dbff010e/redirect
7+
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/59a9771cad43219260d9aac9a8ec4d6a/redirect
8+
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect
9+
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/5ee463876563a46fff651cce1bc53a4c/redirect
10+
toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/a4c09dd2e2d7079373d30e524bbc2829/redirect
11+
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/8e1d9ee5d0f13e442218f6884a306da1/redirect
12+
toolchainVersion=25

website/docs/getting-started/runtime-requirements.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ sidebar_position: 2
66

77
ORT is being continuously used on Linux, Windows and macOS by the [core development team](https://github.com/orgs/oss-review-toolkit/people), so these operating systems are considered to be well-supported.
88

9-
To run the ORT binaries (also see [Installation from binaries](installation.md#from-binaries)) at least Java 21 is required.
9+
To run the ORT binaries (also see [Installation from binaries](installation.md#from-binaries)) at least Java 25 is required.
1010
Memory and CPU requirements vary depending on the size and type of project(s) to analyze / scan, but the general recommendation is to configure Java with 8 GiB of memory and to use a CPU with at least 4 cores.
1111

1212
```shell

website/docs/getting-started/tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ It will guide through the main steps for running ORT:
2424
ORT is tested to run on Linux, macOS, and Windows.
2525
This tutorial assumes that you are running on Linux, but it should be easy to adapt the commands to macOS or Windows.
2626

27-
In addition to Java (version >= 21), for some supported package managers and Version Control Systems, additional tools need to be installed.
27+
In addition to Java (version >= 25), for some supported package managers and Version Control Systems, additional tools need to be installed.
2828
In the context of this tutorial, the following tools are required:
2929

3030
* Git (any recent version will do)

0 commit comments

Comments
 (0)