diff --git a/.github/actions/setup-gradle/action.yml b/.github/actions/setup-gradle/action.yml index 337bd155c92..6a0b5726f9a 100644 --- a/.github/actions/setup-gradle/action.yml +++ b/.github/actions/setup-gradle/action.yml @@ -9,7 +9,7 @@ inputs: javaVersion: description: Java version required: false - default: '25' + default: '26' runs: using: composite diff --git a/.github/workflows/binaries.yml b/.github/workflows/binaries.yml index 6602d66c364..e8bbf401af8 100644 --- a/.github/workflows/binaries.yml +++ b/.github/workflows/binaries.yml @@ -550,7 +550,7 @@ jobs: SED_I=(-i) [[ '${{ startsWith(matrix.os, 'macos') }}' == 'true' ]] && SED_I=(-i '') - sed "${SED_I[@]}" "s/JavaLanguageVersion.of(25)/JavaLanguageVersion.of(${{ needs.conditions.outputs.jdkVersion }})/" build-logic/src/main/kotlin/org.jabref.gradle.feature.compile.gradle.kts + sed "${SED_I[@]}" "s/JavaLanguageVersion.of(26)/JavaLanguageVersion.of(${{ needs.conditions.outputs.jdkVersion }})/" build-logic/src/main/kotlin/org.jabref.gradle.feature.compile.gradle.kts sed "${SED_I[@]}" "s/AMAZON/ORACLE/" build-logic/src/main/kotlin/org.jabref.gradle.feature.compile.gradle.kts sed "${SED_I[@]}" "s|val javafx = .*|val javafx = \"${{ needs.conditions.outputs.javafxVersion }}\"|" versions/build.gradle.kts diff --git a/.github/workflows/tests-code.yml b/.github/workflows/tests-code.yml index 50ed1ce2c69..edf999dc721 100644 --- a/.github/workflows/tests-code.yml +++ b/.github/workflows/tests-code.yml @@ -258,6 +258,11 @@ jobs: submodules: 'true' show-progress: 'false' - uses: ./.github/actions/setup-gradle + - name: Install at-spi2-core + uses: awalsh128/cache-apt-pkgs-action@latest + with: + packages: at-spi2-core + version: 1.0 - name: Run ${{ matrix.module }} tests run: xvfb-run --auto-servernum gradle :${{ matrix.module }}:check -x checkstyleJmh -x checkstyleMain -x checkstyleTest -x modernizer env: @@ -405,7 +410,7 @@ jobs: if: steps.changed-jablib-files.outputs.any_changed != 'true' uses: actions/setup-java@v5 with: - java-version: '25' + java-version: '26' distribution: 'corretto' check-latest: true @@ -461,7 +466,7 @@ jobs: - name: Setup JDK uses: actions/setup-java@v5 with: - java-version: '25' + java-version: '26' distribution: 'corretto' check-latest: true - name: Modify ${{ matrix.script }} to include changed classes @@ -517,7 +522,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v5 with: - java-version: 25 + java-version: 26 distribution: 'corretto' cache: maven check-latest: true diff --git a/.jbang/JabKitLauncher.java b/.jbang/JabKitLauncher.java index 0c861e2260c..e85a694a25d 100755 --- a/.jbang/JabKitLauncher.java +++ b/.jbang/JabKitLauncher.java @@ -2,7 +2,8 @@ //DESCRIPTION jabkit - mange BibTeX files using JabRef -//JAVA 25+ +//JAVA 26+ +//DEPS org.openjfx:jdk-jsobject:26 //RUNTIME_OPTIONS --enable-native-access=ALL-UNNAMED // raw is for https://github.com/unicode-org/icu/pull/2127 diff --git a/.jbang/JabLsLauncher.java b/.jbang/JabLsLauncher.java index a210272dc23..a677b0e7a19 100755 --- a/.jbang/JabLsLauncher.java +++ b/.jbang/JabLsLauncher.java @@ -2,7 +2,7 @@ //DESCRIPTION jabls - start a bibtex languageserver -//JAVA 25+ +//JAVA 26+ //RUNTIME_OPTIONS --enable-native-access=ALL-UNNAMED // raw is for https://github.com/unicode-org/icu/pull/2127 diff --git a/.jbang/JabSrvLauncher.java b/.jbang/JabSrvLauncher.java index 87778e16ed9..c714009e868 100755 --- a/.jbang/JabSrvLauncher.java +++ b/.jbang/JabSrvLauncher.java @@ -2,7 +2,7 @@ //DESCRIPTION jabsrv - serve BibTeX files using JabRef -//JAVA 25+ +//JAVA 26+ //RUNTIME_OPTIONS --enable-native-access=ALL-UNNAMED // raw is for https://github.com/unicode-org/icu/pull/2127 diff --git a/.moderne/moderne.yml b/.moderne/moderne.yml index 7159802fb6f..646431377e9 100644 --- a/.moderne/moderne.yml +++ b/.moderne/moderne.yml @@ -1,3 +1,3 @@ specs: specs.moderne.ai/v1/cli java: - selectedJdk: '25' + selectedJdk: '26' diff --git a/.sdkmanrc b/.sdkmanrc index cbd82e17bff..bf8a87a3555 100644 --- a/.sdkmanrc +++ b/.sdkmanrc @@ -1,2 +1,2 @@ -java=25.0.2-amzn +java=26-amzn #visualvm=2.1.10 diff --git a/build-logic/src/main/kotlin/org.jabref.gradle.base.dependency-rules.gradle.kts b/build-logic/src/main/kotlin/org.jabref.gradle.base.dependency-rules.gradle.kts index 0605f581954..4b2452c811f 100644 --- a/build-logic/src/main/kotlin/org.jabref.gradle.base.dependency-rules.gradle.kts +++ b/build-logic/src/main/kotlin/org.jabref.gradle.base.dependency-rules.gradle.kts @@ -38,19 +38,8 @@ listOf("javafx-base", "javafx-controls", "javafx-fxml", "javafx-graphics", "java } fun addJfxTarget(jfxModule: String, name: String, os: String, arch: String) { - if (jfxModule == "javafx-web" && name.isNotEmpty()) { - // Special treatment of 'javafx-web' for the time being due to https://bugs.openjdk.org/browse/JDK-8342623. - // Can be remove once Java 26 is the minimum version JabRef is built with. - dependencies.components.withModule("org.openjfx:$jfxModule") { - params(name, os, arch, 11) - } - dependencies.components.withModule("org.openjfx:$jfxModule") { - params(name, os, arch, 26) - } - } else { - jvmDependencyConflicts.patch.module("org.openjfx:$jfxModule") { - addTargetPlatformVariant(name, os, arch) - } + jvmDependencyConflicts.patch.module("org.openjfx:$jfxModule") { + addTargetPlatformVariant(name, os, arch) } } 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 57a5ab3ba6d..0906090ea47 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 @@ -18,7 +18,7 @@ java { // - jablib-examples/jbang/*.java // - jablib-examples/maven3/*/pom.xml // - Dockerfile.* (first line) - languageVersion = JavaLanguageVersion.of(25) + languageVersion = JavaLanguageVersion.of(26) // 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 @@ -28,7 +28,7 @@ java { } tasks.withType().configureEach { - options.release = 25 + options.release = 26 // See https://docs.gradle.org/current/userguide/performance.html#a_run_the_compiler_as_a_separate_process options.isFork = true } diff --git a/build-support/src/main/java/CitationStyleCatalogGenerator.java b/build-support/src/main/java/CitationStyleCatalogGenerator.java index 422f1c82ea0..bb9c8d4783f 100644 --- a/build-support/src/main/java/CitationStyleCatalogGenerator.java +++ b/build-support/src/main/java/CitationStyleCatalogGenerator.java @@ -1,4 +1,4 @@ -//JAVA 25+ +//JAVA 26+ //RUNTIME_OPTIONS --enable-native-access=ALL-UNNAMED //DEPS org.jspecify:jspecify:1.0.0 diff --git a/build-support/src/main/java/JournalListMvGenerator.java b/build-support/src/main/java/JournalListMvGenerator.java index 07fdfce8125..31fcffee384 100644 --- a/build-support/src/main/java/JournalListMvGenerator.java +++ b/build-support/src/main/java/JournalListMvGenerator.java @@ -1,4 +1,4 @@ -//JAVA 25+ +//JAVA 26+ //RUNTIME_OPTIONS --enable-native-access=ALL-UNNAMED //DEPS com.h2database:h2:2.4.240 diff --git a/build-support/src/main/java/LtwaListMvGenerator.java b/build-support/src/main/java/LtwaListMvGenerator.java index 5535cdb1ae1..cf3fb3d3369 100644 --- a/build-support/src/main/java/LtwaListMvGenerator.java +++ b/build-support/src/main/java/LtwaListMvGenerator.java @@ -1,4 +1,4 @@ -//JAVA 25+ +//JAVA 26+ //RUNTIME_OPTIONS --enable-native-access=ALL-UNNAMED //DEPS com.h2database:h2:2.4.240 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 4e38d6d7597..da6044f01e2 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-25** as the project SDK (continue reading if this option is not available). +Click on "Project" on the left side. Then, select **temurin-26** 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 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". +If you do not have access to this JDK, download it by clicking on "Download JDK..." In the dialog that opens, select version 26, 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/jablib-examples/jbang/doi_to_bibtex.java b/jablib-examples/jbang/doi_to_bibtex.java index 42506dd6d8f..dfa1d456547 100644 --- a/jablib-examples/jbang/doi_to_bibtex.java +++ b/jablib-examples/jbang/doi_to_bibtex.java @@ -11,7 +11,7 @@ //DESCRIPTION Converts a DOI to BibTeX -//JAVA 25+ +//JAVA 26+ //RUNTIME_OPTIONS --enable-native-access=ALL-UNNAMED //FILES tinylog.properties=tinylog.properties // see https://github.com/gradlex-org/extra-java-module-info/issues/237 why we include e-adr here diff --git a/jablib-examples/jbang/ieee_pdf_references_to_bibtex.java b/jablib-examples/jbang/ieee_pdf_references_to_bibtex.java index 2a2e7a58cc6..2d959e6dfc2 100644 --- a/jablib-examples/jbang/ieee_pdf_references_to_bibtex.java +++ b/jablib-examples/jbang/ieee_pdf_references_to_bibtex.java @@ -10,7 +10,7 @@ //DESCRIPTION Opens the given PDF file, parses the references and outputs BibTeX -//JAVA 25+ +//JAVA 26+ //RUNTIME_OPTIONS --enable-native-access=ALL-UNNAMED //FILES tinylog.properties=tinylog.properties diff --git a/jablib-examples/maven3/doi-to-bibtex/pom.xml b/jablib-examples/maven3/doi-to-bibtex/pom.xml index 450b9fbad5b..40cecdd9593 100644 --- a/jablib-examples/maven3/doi-to-bibtex/pom.xml +++ b/jablib-examples/maven3/doi-to-bibtex/pom.xml @@ -11,7 +11,7 @@ UTF-8 - 24 + 26 diff --git a/jitpack.yml b/jitpack.yml index ebdbf20b9ae..efc593c70ce 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -1,5 +1,5 @@ jdk: - - openjdk25 + - openjdk26 install: - ./gradlew :versions:publishToMavenLocal - ./gradlew :jablib:publishToMavenLocal