diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index b5d66d8eea5..506d08f1968 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -31,10 +31,10 @@ // Install java. // See https://github.com/devcontainers/features/tree/main/src/java#options for details. "ghcr.io/devcontainers/features/java:1": { - "version": "24.0.2-amzn", + "version": "latest", "installGradle": true, - "gradleVersion": "8.14.3", - "jdkDistro": "Corretto" + "gradleVersion": "latest", + "jdkDistro": "Temurin" } } } diff --git a/.github/workflows/binaries.yml b/.github/workflows/binaries.yml index 256a6d1bf97..9e7613da1a1 100644 --- a/.github/workflows/binaries.yml +++ b/.github/workflows/binaries.yml @@ -195,8 +195,8 @@ jobs: - name: Setup JDK uses: actions/setup-java@v5 with: - java-version: '24' - distribution: 'corretto' + java-version: 25 + distribution: 'temurin' check-latest: true - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 5021d0bdc3d..647755cd169 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -92,8 +92,8 @@ jobs: - name: Setup JDK uses: actions/setup-java@v5 with: - java-version: '24' - distribution: 'corretto' + java-version: 25 + distribution: 'temurin' check-latest: true - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 diff --git a/.github/workflows/run-openrewrite.yml b/.github/workflows/run-openrewrite.yml index d160804bf99..d8bde962653 100644 --- a/.github/workflows/run-openrewrite.yml +++ b/.github/workflows/run-openrewrite.yml @@ -33,8 +33,8 @@ jobs: - name: Set up JDK uses: actions/setup-java@v5 with: - java-version: 24 - distribution: 'corretto' + java-version: 25 + distribution: 'temurin' check-latest: true - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 diff --git a/.github/workflows/sbom-pr.yml b/.github/workflows/sbom-pr.yml index 8b13a5cbd38..ed5cda813d2 100644 --- a/.github/workflows/sbom-pr.yml +++ b/.github/workflows/sbom-pr.yml @@ -21,8 +21,8 @@ jobs: - name: Set up JDK uses: actions/setup-java@v5 with: - distribution: 'corretto' - java-version: '24' + distribution: 'temurin' + java-version: 25 check-latest: true cache: 'gradle' diff --git a/.github/workflows/tests-code-fetchers.yml b/.github/workflows/tests-code-fetchers.yml index 44c5e7cb53a..54f564e3f26 100644 --- a/.github/workflows/tests-code-fetchers.yml +++ b/.github/workflows/tests-code-fetchers.yml @@ -56,8 +56,8 @@ jobs: - name: Set up JDK uses: actions/setup-java@v5 with: - java-version: 24 - distribution: 'corretto' + java-version: 25 + distribution: 'temurin' check-latest: true - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 diff --git a/.github/workflows/tests-code.yml b/.github/workflows/tests-code.yml index 6bc013d675d..14d4caed376 100644 --- a/.github/workflows/tests-code.yml +++ b/.github/workflows/tests-code.yml @@ -52,8 +52,8 @@ jobs: - name: Set up JDK uses: actions/setup-java@v5 with: - java-version: 24 - distribution: 'corretto' + java-version: 25 + distribution: 'temurin' check-latest: true - name: Run checkstyle reporter uses: dbelyaev/action-checkstyle@master @@ -92,8 +92,8 @@ jobs: - name: Set up JDK uses: actions/setup-java@v5 with: - java-version: 24 - distribution: 'corretto' + java-version: 25 + distribution: 'temurin' check-latest: true - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 @@ -139,8 +139,8 @@ jobs: - name: Set up JDK uses: actions/setup-java@v5 with: - java-version: 24 - distribution: 'corretto' + java-version: 25 + distribution: 'temurin' check-latest: true - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 @@ -257,8 +257,8 @@ jobs: - name: Set up JDK uses: actions/setup-java@v5 with: - java-version: 24 - distribution: 'corretto' + java-version: 25 + distribution: 'temurin' check-latest: true - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 @@ -293,8 +293,8 @@ jobs: - name: Set up JDK uses: actions/setup-java@v5 with: - java-version: 24 - distribution: 'corretto' + java-version: 25 + distribution: 'temurin' check-latest: true - name: Generate JBang cache key id: cache-key @@ -342,8 +342,8 @@ jobs: - name: Set up JDK uses: actions/setup-java@v5 with: - java-version: 24 - distribution: 'corretto' + java-version: 25 + distribution: 'temurin' check-latest: true - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 @@ -392,8 +392,8 @@ jobs: - name: Set up JDK uses: actions/setup-java@v5 with: - java-version: 24 - distribution: 'corretto' + java-version: 25 + distribution: 'temurin' check-latest: true - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 @@ -441,8 +441,8 @@ jobs: - name: Set up JDK uses: actions/setup-java@v5 with: - java-version: 24 - distribution: 'corretto' + java-version: 25 + distribution: 'temurin' check-latest: true - name: Generate JBang cache key id: cache-key @@ -482,8 +482,8 @@ jobs: - name: Set up JDK uses: actions/setup-java@v5 with: - java-version: 24 - distribution: 'corretto' + java-version: 25 + distribution: 'temurin' check-latest: true - name: Generate JBang cache key id: cache-key @@ -559,8 +559,8 @@ jobs: if: github.ref == 'refs/heads/main' uses: actions/setup-java@v5 with: - java-version: 24 - distribution: 'corretto' + java-version: 25 + distribution: 'temurin' check-latest: true - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 @@ -605,8 +605,8 @@ jobs: - name: Set up JDK uses: actions/setup-java@v5 with: - java-version: 24 - distribution: 'corretto' + java-version: 25 + distribution: 'temurin' check-latest: true - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 diff --git a/.moderne/moderne.yml b/.moderne/moderne.yml index 970c3c0479c..7159802fb6f 100644 --- a/.moderne/moderne.yml +++ b/.moderne/moderne.yml @@ -1,3 +1,3 @@ specs: specs.moderne.ai/v1/cli java: - selectedJdk: '24' + selectedJdk: '25' diff --git a/.sdkmanrc b/.sdkmanrc index 580d16babba..26ac25ebe80 100644 --- a/.sdkmanrc +++ b/.sdkmanrc @@ -1,2 +1,2 @@ -java=24.0.2-amzn +java=25-tem #visualvm=2.1.10 diff --git a/build-logic/src/main/kotlin/org.jabref.gradle.feature.compile.gradle.kts b/build-logic/src/main/kotlin/org.jabref.gradle.feature.compile.gradle.kts index 12bf831596e..3e381ab59ba 100644 --- a/build-logic/src/main/kotlin/org.jabref.gradle.feature.compile.gradle.kts +++ b/build-logic/src/main/kotlin/org.jabref.gradle.feature.compile.gradle.kts @@ -12,17 +12,15 @@ java { // - .github/workflows/binaries*.yml // - .github/workflows/publish.yml // - .github/workflows/tests*.yml - // - .github/workflows/update-gradle-wrapper.yml // - docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-12-build.md // - .sdkmanrc - languageVersion = JavaLanguageVersion.of(24) + languageVersion = JavaLanguageVersion.of(25) // See https://docs.gradle.org/current/javadoc/org/gradle/jvm/toolchain/JvmVendorSpec.html for a full list - // Temurin does not ship jmods, thus we need to use another JDK -- see https://github.com/actions/setup-java/issues/804 // We also need a JDK without JavaFX, because we patch JavaFX due to modularity issues - vendor = JvmVendorSpec.AMAZON + vendor = JvmVendorSpec.ADOPTIUM } } tasks.withType().configureEach { - options.release = 24 + options.release = 25 } diff --git a/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-12-build.md b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-12-build.md index c83acd5434d..56a4257e143 100644 --- a/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-12-build.md +++ b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-12-build.md @@ -33,13 +33,13 @@ Go to "File > Project Structure" or press Ctrl+Shift+ ![Open Project Structure](12-02-open-project-settings.png) {% endfigure %} -Click on "Project" on the left side. Then, select **temurin-24** as the project SDK (continue reading if this option is not available). +Click on "Project" on the left side. Then, select **temurin-25** as the project SDK (continue reading if this option is not available). {% figure caption:"Project Structure - Project SDK" %} ![Project Structure - Project SDK](12-03-project-sdk.png) {% endfigure %} -If you do not have the access to this JDK, download it by clicking on "Download JDK..." In the dialog that opens, select version 24, vendor "Eclipse Temurin (AdoptOpenJDK HotSpot)", and click "Download". +If you do not have the access to this JDK, download it by clicking on "Download JDK..." In the dialog that opens, select version 25, vendor "Eclipse Temurin (AdoptOpenJDK HotSpot)", and click "Download". {% figure caption:"Dropdown to select Download JDK" %} ![Dropdown to select Download JDK](12-04-download-jdk.png) diff --git a/jitpack.yml b/jitpack.yml index f42f228e421..ebdbf20b9ae 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -1,5 +1,5 @@ jdk: - - openjdk24 + - openjdk25 install: - ./gradlew :versions:publishToMavenLocal - ./gradlew :jablib:publishToMavenLocal