From e13aca838fb88ede6ed6dbec27e8c472d67ce569 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 23 Jan 2020 13:26:15 +0100
Subject: [PATCH] Add OpenJDK 8 toolchain configuration

---
 javapackages-tools.spec | 20 +++++++++++++++++++-
 toolchains-openjdk8.xml | 11 +++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 toolchains-openjdk8.xml

diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 6ba6494..5fce799 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -24,7 +24,7 @@
 
 Name:           javapackages-tools
 Version:        5.3.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Macros and scripts for Java packaging support
 License:        BSD
 URL:            https://github.com/fedora-java/javapackages
@@ -32,6 +32,7 @@ BuildArch:      noarch
 
 Source0:        https://github.com/fedora-java/javapackages/archive/%{version}.tar.gz
 Source1:        module-config.xml
+Source2:        toolchains-openjdk8.xml
 
 Patch1:         0001-Move-python-modules-under-java-utils-directory.patch
 Patch2:         0002-Enable-namespaced-dependency-generation.patch
@@ -126,6 +127,14 @@ Summary:        Configuration files for building maven-3.6 module
 %description -n javapackages-config-maven-3.6
 This package provides configuration files for building maven-3.6 module.
 
+%package -n maven-local-openjdk8
+Summary:        OpenJDK 8 toolchain for XMvn
+Requires:       maven-local
+Requires:       java-1.8.0-openjdk-devel
+
+%description -n maven-local-openjdk8
+OpenJDK 8 toolchain for XMvn
+
 %prep
 %setup -q -n javapackages-%{version}
 %patch1 -p1
@@ -162,6 +171,9 @@ rm -rf %{buildroot}%{_bindir}/gradle-local
 rm -rf %{buildroot}%{_datadir}/gradle-local
 rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7
 
+mkdir -p %{buildroot}%{_datadir}/xmvn/conf/
+cp -p %{SOURCE2} %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml
+
 %check
 ./check
 
@@ -180,7 +192,13 @@ rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7
 %files -n javapackages-config-maven-3.6
 %{_datadir}/xmvn/config.d
 
+%files -n maven-local-openjdk8
+%{_datadir}/xmvn/conf
+
 %changelog
+* Thu Jan 23 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.1-7
+- Add OpenJDK 8 toolchain configuration
+
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.1-6
 - Mass rebuild for javapackages-tools 201902
 
diff --git a/toolchains-openjdk8.xml b/toolchains-openjdk8.xml
new file mode 100644
index 0000000..25d130f
--- /dev/null
+++ b/toolchains-openjdk8.xml
@@ -0,0 +1,11 @@
+<toolchains>
+  <toolchain>
+    <type>jdk</type>
+    <provides>
+      <xmvn>xmvn</xmvn>
+    </provides>
+    <configuration>
+      <jdkHome>/usr/lib/jvm/java-1.8.0-openjdk</jdkHome>
+    </configuration>
+  </toolchain>
+</toolchains>