From ca4ffa814eef34a1a527475ccfc04a535690f69c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mari=C3=A1n=20Kon=C4=8Dek?= <mkoncek@redhat.com>
Date: Mon, 4 Nov 2024 09:13:40 +0100
Subject: [PATCH] Drop generated Requires on various Java versions

Related: RHEL-62409
---
 javapackages-config.json | 3 +--
 javapackages-tools.spec  | 6 +++++-
 plans/smoke.fmf          | 7 +++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/javapackages-config.json b/javapackages-config.json
index 1a419d9..22f0259 100644
--- a/javapackages-config.json
+++ b/javapackages-config.json
@@ -1,8 +1,7 @@
 {
     "maven.req": {
         "always_generate": [
-            "javapackages-filesystem",
-            "(java-headless or java-21-headless or java-17-headless or java-11-headless or java-1.8.0-headless)"
+            "javapackages-filesystem"
         ],
         "java_requires": {
             "skip": true
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 54570f6..d00732b 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -14,7 +14,7 @@
 
 Name:           javapackages-tools
 Version:        6.0.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Macros and scripts for Java packaging support
 License:        BSD
 URL:            https://github.com/fedora-java/javapackages
@@ -220,6 +220,10 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config
 %license LICENSE
 
 %changelog
+* Mon Nov 04 2024 Marián Konček <mkoncek@redhat.com> - 6.0.0-6
+- Drop generated Requires on various Java versions
+- Related: RHEL-62409
+
 * Mon Oct 21 2024 Marián Konček <mkoncek@redhat.com> - 6.0.0-5
 - Include java-21-headless in generated auto-requires
 - Related: RHEL-62409
diff --git a/plans/smoke.fmf b/plans/smoke.fmf
index 2f4ffaa..b62f940 100644
--- a/plans/smoke.fmf
+++ b/plans/smoke.fmf
@@ -1,10 +1,9 @@
 summary: Basic smoke tests
 discover:
   how: fmf
-  # FIXME
-  #url: https://src.fedoraproject.org/tests/javapackages-tools
-  url: https://src.fedoraproject.org/forks/mkoncek/tests/javapackages-tools
-  ref: c9s
+  url: https://src.fedoraproject.org/tests/javapackages-tools
+environment:
+  DEFAULT_OPENJDK_VERSION: "17"
 prepare:
   how: install
   exclude: