diff --git a/SOURCES/toolchains-openjdk11.xml b/SOURCES/toolchains-openjdk11.xml
new file mode 100644
index 0000000..77e2202
--- /dev/null
+++ b/SOURCES/toolchains-openjdk11.xml
@@ -0,0 +1,11 @@
+
+
+ jdk
+
+ xmvn
+
+
+ /usr/lib/jvm/java-11-openjdk
+
+
+
diff --git a/SOURCES/toolchains-openjdk17.xml b/SOURCES/toolchains-openjdk17.xml
new file mode 100644
index 0000000..1302dce
--- /dev/null
+++ b/SOURCES/toolchains-openjdk17.xml
@@ -0,0 +1,11 @@
+
+
+ jdk
+
+ xmvn
+
+
+ /usr/lib/jvm/java-17-openjdk
+
+
+
diff --git a/SPECS/javapackages-tools.spec b/SPECS/javapackages-tools.spec
index 5881d3e..8a700b7 100644
--- a/SPECS/javapackages-tools.spec
+++ b/SPECS/javapackages-tools.spec
@@ -14,16 +14,19 @@
Name: javapackages-tools
Version: 6.0.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Macros and scripts for Java packaging support
License: BSD
URL: https://github.com/fedora-java/javapackages
BuildArch: noarch
Source0: https://github.com/fedora-java/javapackages/archive/%{version}.tar.gz
-Source2: toolchains-openjdk8.xml
Source3: javapackages-config.json
+Source8: toolchains-openjdk8.xml
+Source11: toolchains-openjdk11.xml
+Source17: toolchains-openjdk17.xml
+
BuildRequires: coreutils
BuildRequires: which
BuildRequires: make
@@ -125,12 +128,31 @@ RPM dependency generators to support Java packaging.
%package -n maven-local-openjdk8
Summary: OpenJDK 8 toolchain for XMvn
+RemovePathPostfixes: -openjdk8
Requires: maven-local
Requires: java-1.8.0-openjdk-devel
%description -n maven-local-openjdk8
OpenJDK 8 toolchain for XMvn
+%package -n maven-local-openjdk11
+Summary: OpenJDK 11 toolchain for XMvn
+RemovePathPostfixes: -openjdk11
+Requires: maven-local
+Requires: java-11-openjdk-devel
+
+%description -n maven-local-openjdk11
+OpenJDK 11 toolchain for XMvn
+
+%package -n maven-local-openjdk17
+Summary: OpenJDK 17 toolchain for XMvn
+RemovePathPostfixes: -openjdk17
+Requires: maven-local
+Requires: java-17-openjdk-devel
+
+%description -n maven-local-openjdk17
+OpenJDK 17 toolchain for XMvn
+
%prep
%setup -q -n javapackages-%{version}
@@ -157,7 +179,9 @@ rm -rf %{buildroot}%{_sysconfdir}/ant.d
%endif
mkdir -p %{buildroot}%{_datadir}/xmvn/conf/
-cp -p %{SOURCE2} %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml
+cp -p %{SOURCE8} %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml-openjdk8
+cp -p %{SOURCE11} %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml-openjdk11
+cp -p %{SOURCE17} %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml-openjdk17
install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config.json
@@ -181,12 +205,24 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config
%endif
%files -n maven-local-openjdk8
-%{_datadir}/xmvn/conf
+%dir %{_datadir}/xmvn/conf
+%{_datadir}/xmvn/conf/toolchains.xml-openjdk8
+
+%files -n maven-local-openjdk11
+%dir %{_datadir}/xmvn/conf
+%{_datadir}/xmvn/conf/toolchains.xml-openjdk11
+
+%files -n maven-local-openjdk17
+%dir %{_datadir}/xmvn/conf
+%{_datadir}/xmvn/conf/toolchains.xml-openjdk17
%files -n %{python_prefix}-javapackages -f files-python
%license LICENSE
%changelog
+* Tue Nov 02 2021 Mikolaj Izdebski - 6.0.0-3
+- Implement OpenJDK 11 and 17 toolchains
+
* Mon Aug 09 2021 Mohan Boddu - 6.0.0-2
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688