From 45c1b008de2ca27247714a5cbef520fe20531031 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Wed, 20 Sep 2023 17:38:25 +0200
Subject: [PATCH] Add support for OpenJDK 21

---
 javapackages-config.json |  2 +-
 javapackages-tools.spec  | 20 +++++++++++++++++++-
 toolchains-openjdk21.xml | 11 +++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 toolchains-openjdk21.xml

diff --git a/javapackages-config.json b/javapackages-config.json
index d78ebe1..1a419d9 100644
--- a/javapackages-config.json
+++ b/javapackages-config.json
@@ -2,7 +2,7 @@
     "maven.req": {
         "always_generate": [
             "javapackages-filesystem",
-            "(java-headless or java-17-headless or java-11-headless or java-1.8.0-headless)"
+            "(java-headless or java-21-headless or java-17-headless or java-11-headless or java-1.8.0-headless)"
         ],
         "java_requires": {
             "skip": true
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index cd25901..c396adf 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -16,7 +16,7 @@
 
 Name:           javapackages-tools
 Version:        6.2.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Macros and scripts for Java packaging support
 License:        BSD-3-Clause
 URL:            https://github.com/fedora-java/javapackages
@@ -28,6 +28,7 @@ Source3:        javapackages-config.json
 Source8:        toolchains-openjdk8.xml
 Source11:       toolchains-openjdk11.xml
 Source17:       toolchains-openjdk17.xml
+Source21:       toolchains-openjdk21.xml
 
 BuildRequires:  coreutils
 BuildRequires:  which
@@ -161,6 +162,15 @@ Requires:       java-17-openjdk-devel
 %description -n maven-local-openjdk17
 OpenJDK 17 toolchain for XMvn
 
+%package -n maven-local-openjdk21
+Summary:        OpenJDK 21 toolchain for XMvn
+RemovePathPostfixes: -openjdk21
+Requires:       maven-local
+Requires:       java-21-openjdk-devel
+
+%description -n maven-local-openjdk21
+OpenJDK 21 toolchain for XMvn
+
 %prep
 %setup -q -n javapackages-%{version}
 
@@ -187,6 +197,7 @@ mkdir -p %{buildroot}%{maven_home}/conf/
 cp -p %{SOURCE8} %{buildroot}%{maven_home}/conf/toolchains.xml-openjdk8
 cp -p %{SOURCE11} %{buildroot}%{maven_home}/conf/toolchains.xml-openjdk11
 cp -p %{SOURCE17} %{buildroot}%{maven_home}/conf/toolchains.xml-openjdk17
+cp -p %{SOURCE21} %{buildroot}%{maven_home}/conf/toolchains.xml-openjdk21
 
 install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config.json
 
@@ -223,10 +234,17 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config
 %dir %{maven_home}/conf
 %{maven_home}/conf/toolchains.xml-openjdk17
 
+%files -n maven-local-openjdk21
+%dir %{maven_home}/conf
+%{maven_home}/conf/toolchains.xml-openjdk21
+
 %files -n %{python_prefix}-javapackages -f files-python
 %license LICENSE
 
 %changelog
+* Wed Sep 20 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.2.0-4
+- Add support for OpenJDK 21
+
 * Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.2.0-3
 - Convert License tag to SPDX format
 
diff --git a/toolchains-openjdk21.xml b/toolchains-openjdk21.xml
new file mode 100644
index 0000000..6235342
--- /dev/null
+++ b/toolchains-openjdk21.xml
@@ -0,0 +1,11 @@
+<toolchains>
+  <toolchain>
+    <type>jdk</type>
+    <provides>
+      <xmvn>xmvn</xmvn>
+    </provides>
+    <configuration>
+      <jdkHome>/usr/lib/jvm/java-21-openjdk</jdkHome>
+    </configuration>
+  </toolchain>
+</toolchains>