SOURCES/0001-Move-python-modules-under-java-utils-directory.patch

@@ -1,7 +1,7 @@
 From 760c3e7a568295ded8229b06e651915c78475ccd Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Fri, 26 Apr 2019 00:50:00 +0200
-Subject: [PATCH 1/3] Move python modules under java-utils directory
+Subject: [PATCH 1/4] Move python modules under java-utils directory
 
 ---
  depgenerators/javadoc.req        | 3 +++

SOURCES/0002-Enable-namespaced-dependency-generation.patch

@@ -1,7 +1,7 @@
 From 48f5467fea8006cf0fe091d28fd879e6aed5a4b1 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Fri, 28 Jun 2019 14:53:26 +0200
-Subject: [PATCH 2/3] Enable namespaced dependency generation
+Subject: [PATCH 2/4] Enable namespaced dependency generation
 
 ---
  depgenerators/fileattrs/javadoc.attr | 2 +-

SOURCES/0003-Fix-use-of-illegal-characters-in-rpmfc-generator-nam.patch

@@ -1,7 +1,7 @@
 From 0b0f93a4bc050a67e6885a647270a716f3d9cdce Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Mon, 2 Sep 2019 18:10:01 +0200
-Subject: [PATCH 3/3] Fix use of illegal characters in rpmfc generator names
+Subject: [PATCH 3/4] Fix use of illegal characters in rpmfc generator names
 
 ---
  configure-base.sh                    |  2 +-

SOURCES/0004-test-Don-t-try-to-kill-PID-1-during-tests.patch

@@ -0,0 +1,29 @@
+From 16808487796822c5477d1ba0478bd2b0ca884818 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Mon, 18 May 2020 09:11:31 +0200
+Subject: [PATCH 4/4] [test] Don't try to kill PID 1 during tests
+
+Normally PID 1 should not be killable, but when running tests in
+container this is actually possible.
+---
+ test/test_common.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/test_common.py b/test/test_common.py
+index 9bdc4675..67370422 100644
+--- a/test/test_common.py
++++ b/test/test_common.py
+@@ -163,8 +163,8 @@ def call_rpmgen(rpmgen_name, filelist_prefix, filelist, env=None,
+     except OSError:
+         pass
+     for line in stdin:
+-        # FIXME this PID is a temporary hack
+-        ret = call_script(scriptpath, ["--cachedir", "/tmp", "--rpm-pid", "1"],
++        _, dummy_pid, _ = util.execute_command("echo $$")
++        ret = call_script(scriptpath, ["--cachedir", "/tmp", "--rpm-pid", dummy_pid],
+                           stdin=line, extra_env=env)
+     try:
+         shutil.rmtree("/tmp/.javapackages_cache/")
+-- 
+2.25.4
+

SOURCES/javapackages-config.json

@@ -0,0 +1,19 @@
+{
+    "maven.req": {
+        "always_generate": [
+            "javapackages-filesystem",
+            "(java-headless or java-11-headless)"
+        ],
+        "java_requires": {
+            "skip": true
+        },
+        "java_devel_requires": {
+            "skip": true
+        }
+    },
+    "javadoc.req": {
+        "always_generate": [
+            "javapackages-filesystem"
+        ]
+    }
+}

SPECS/javapackages-tools.spec

@@ -24,7 +24,7 @@
 
 Name:           javapackages-tools
 Version:        5.3.1
-Release:        7%{?dist}
+Release:        11%{?dist}
 Summary:        Macros and scripts for Java packaging support
 License:        BSD
 URL:            https://github.com/fedora-java/javapackages
@@ -33,10 +33,12 @@ BuildArch:      noarch
 Source0:        https://github.com/fedora-java/javapackages/archive/%{version}.tar.gz
 Source1:        module-config.xml
 Source2:        toolchains-openjdk8.xml
+Source3:        javapackages-config.json
 
 Patch1:         0001-Move-python-modules-under-java-utils-directory.patch
 Patch2:         0002-Enable-namespaced-dependency-generation.patch
 Patch3:         0003-Fix-use-of-illegal-characters-in-rpmfc-generator-nam.patch
+Patch4:         0004-test-Don-t-try-to-kill-PID-1-during-tests.patch
 
 BuildRequires:  coreutils
 BuildRequires:  which
@@ -59,8 +61,6 @@ Provides:       jpackage-utils = %{version}-%{release}
 # depend on javapackages-local for dependency generator.
 Provides:       mvn(com.sun:tools) = SYSTEM
 Provides:       mvn(sun.jdk:jconsole) = SYSTEM
-# XXX temp provide
-Provides:       java-headless = 1:11
 
 %description
 This package provides macros and scripts to support Java packaging.
@@ -115,8 +115,6 @@ Requires:       %{python_prefix}-lxml
 Requires:       %{python_prefix}-six
 Obsoletes:      %{python_prefix}-javapackages < %{version}-%{release}
 Obsoletes:      python-javapackages < %{version}-%{release}
-# XXX temp provide
-Provides:       java-devel = 1:11
 
 %description -n javapackages-local
 This package provides non-essential macros and scripts to support Java packaging.
@@ -140,6 +138,7 @@ OpenJDK 8 toolchain for XMvn
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 sed -i '/^manpage /d' build
 sed -i '/${mandir}/d' install
@@ -174,6 +173,8 @@ rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7
 mkdir -p %{buildroot}%{_datadir}/xmvn/conf/
 cp -p %{SOURCE2} %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml
 
+install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config.json
+
 %check
 ./check
 
@@ -196,6 +197,18 @@ cp -p %{SOURCE2} %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml
 %{_datadir}/xmvn/conf
 
 %changelog
+* Thu Jul 02 2020 Marian Koncek <mkoncek@redhat.com> - 5.3.1-11
+- Drop temporary Java 11 provides
+
+* Tue Jun 23 2020 Marian Koncek <mkoncek@redhat.com> - 5.3.1-10
+- Undo drop temporary Java 11 provides
+
+* Thu May 28 2020 Marian Koncek <mkoncek@redhat.com> - 5.3.1-9
+- Drop temporary Java 11 provides
+
+* Mon May 25 2020 Marian Koncek <mkoncek@redhat.com> - 5.3.1-8
+- Make built packages require JDK 8 or 11
+
 * Thu Jan 23 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.1-7
 - Add OpenJDK 8 toolchain configuration