Force use of Java version 21

Regardless of $JAVA_HOME, gradle will try to find a JDK with the version
specified as toolchain->languageVersion. This lets the build fail if no
JDK 20 is installed.

For now, stick to a single valid JDK version. The best option is JDK 21
which is currently available as jdk-openjdk in the Arch repositories.

Thanks a lot to Pavlov and vanja_z, providing all the information
required to fix this issue.

3 files changed, 13 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bdc609b12f7e..73a119bfbe2a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
 pkgbase = jabref
 	pkgdesc = Graphical Java application for managing BibTeX and biblatex (.bib) databases
 	pkgver = 5.10
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.jabref.org/
 	arch = any
 	license = MIT
-	makedepends = java-environment>=20
-	depends = archlinux-java-run>=7
-	depends = java-runtime>=20
+	makedepends = java-environment=21
+	depends = archlinux-java-run>=10
+	depends = java-runtime=21
 	optdepends = python: browser extension
 	options = !strip
 	options = !emptydirs
@@ -15,7 +15,7 @@ pkgbase = jabref
 	source = jabref.sh
 	source = jabref.desktop
 	sha256sums = f6560e584f48f537fd580c8caac19925ea54c74d8d05bdb230b0daf2132c4b7e
-	sha256sums = f5e977628bc224f63ae4b05d8aaf13786c384478a70cda8a708cef8316892874
+	sha256sums = f8b9b6cb92c1a564a8bbf379819ad4c11cff5f760b346e1003928fd48fd38a1c
 	sha256sums = b0e3ed5cde4072a2d10de887b50217c03bbe30a1ea9b39bea1255ea80db15b77
 
 pkgname = jabref
diff --git a/PKGBUILD b/PKGBUILD
index 86e8b0770e47..df0b1c7ed981 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,20 +8,20 @@
 
 pkgname=jabref
 pkgver=5.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Graphical Java application for managing BibTeX and biblatex (.bib) databases"
 arch=(any)
 url="https://www.jabref.org/"
 license=(MIT)
-depends=('archlinux-java-run>=7' 'java-runtime>=20')
-makedepends=('java-environment>=20')
+depends=('archlinux-java-run>=10' 'java-runtime=21')
+makedepends=('java-environment=21')
 optdepends=('python: browser extension')
 options=(!strip !emptydirs)
 source=(${pkgname}-${pkgver}.tar.gz::https://github.com/JabRef/jabref/archive/v${pkgver}.tar.gz
         jabref.sh
         jabref.desktop)
 sha256sums=('f6560e584f48f537fd580c8caac19925ea54c74d8d05bdb230b0daf2132c4b7e'
-            'f5e977628bc224f63ae4b05d8aaf13786c384478a70cda8a708cef8316892874'
+            'f8b9b6cb92c1a564a8bbf379819ad4c11cff5f760b346e1003928fd48fd38a1c'
             'b0e3ed5cde4072a2d10de887b50217c03bbe30a1ea9b39bea1255ea80db15b77')
 
 # Note on supported Java versions:
@@ -37,6 +37,8 @@ prepare() {
   cp -r buildres/csl/csl-styles/* src/main/resources/csl-styles/
   cp -r buildres/csl/csl-locales/* src/main/resources/csl-locales/
 
+  # gradle will use the specified Java version regardless of JAVA_HOME
+  sed -i 's/languageVersion = JavaLanguageVersion.of(20)/languageVersion = JavaLanguageVersion.of(21)/' build.gradle
 }
 
 build() {
@@ -45,7 +47,7 @@ build() {
   mkdir -p "${srcdir}"/gradle
   export GRADLE_USER_HOME=${srcdir}/gradle
 
-  export JAVA_HOME=$(archlinux-java-run -a 20 -f jdk -j)
+  export JAVA_HOME=$(archlinux-java-run -a 21 -b 21 -f jdk -j)
   echo "Using JDK from $JAVA_HOME to build JabRef."
 
   #/usr/bin/gradle \
diff --git a/jabref.sh b/jabref.sh
index f0ebf7941218..3b1345bf5e4c 100644
--- a/jabref.sh
+++ b/jabref.sh
@@ -14,7 +14,7 @@
 
 ROOT=/usr/share/java/jabref
 
-/usr/bin/archlinux-java-run -a 20 -- \
+/usr/bin/archlinux-java-run -a 21 -b 21 -- \
 --add-modules javafx.controls,javafx.fxml,javafx.swing,javafx.web \
 --add-exports javafx.controls/com.sun.javafx.scene.control=org.controlsfx.controls \
 --add-exports org.controlsfx.controls/impl.org.controlsfx.skin=org.jabref \