From f5535983ad956408a129f3b98f5edf230b1c3a0e Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Wed, 20 Aug 2025 10:31:48 +0200
Subject: [PATCH 1/3] Fix matrix tests

---
 plans/matrix.fmf | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/plans/matrix.fmf b/plans/matrix.fmf
index 3730502..f0d37c6 100644
--- a/plans/matrix.fmf
+++ b/plans/matrix.fmf
@@ -5,10 +5,20 @@ discover:
 execute:
   how: tmt
 
+prepare:
+  - how: install
+    exclude:
+      # These subpackages pull in packaged versioned Java through their dependencies
+      - ant-antlr
+      - ant-apache-regexp
+      - ant-apache-resolver
+      - ant-apache-xalan2
+      - ant-junit5
+
 /jdk21:
   environment:
     OPENJDK_VERSION: 21
-  prepare:
+  prepare+:
     - how: install
       exclude:
         - ant-openjdk25
@@ -33,7 +43,7 @@ execute:
 /jdk25:
   environment:
     OPENJDK_VERSION: 25
-  prepare:
+  prepare+:
     - how: install
       exclude:
         - ant-openjdk21
@@ -56,17 +66,11 @@ execute:
           dnf -y remove java-*-openjdk
 
 /unbound:
-  prepare:
+  prepare+:
     - how: install
       exclude:
         - ant-openjdk21
         - ant-openjdk25
-        # These subpackages pull in packaged Java through their dependencies
-        - ant-antlr
-        - ant-apache-regexp
-        - ant-apache-resolver
-        - ant-apache-xalan2
-        - ant-junit5
 
   /jlink:
     summary: Ant matrix tests - unbound jlink-based Java

From 3ca045714eee673b2484872ae2167665ca3de68e Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Wed, 3 Sep 2025 09:10:42 +0200
Subject: [PATCH 2/3] Switch matrix jlink tests to using Java 25

---
 plans/matrix.fmf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plans/matrix.fmf b/plans/matrix.fmf
index f0d37c6..a5a722c 100644
--- a/plans/matrix.fmf
+++ b/plans/matrix.fmf
@@ -80,7 +80,7 @@ prepare:
       - how: shell
         script: |
           test -d /opt/java && test -x /usr/local/bin/java && exit 0
-          dnf -y install java-21-openjdk-jmods
+          dnf -y install java-25-openjdk-jmods
           jlink --add-modules java.base,java.xml --output /opt/java
           ln -s /opt/java/bin/java /usr/local/bin/java
-          dnf -y remove java-21-openjdk-jmods
+          dnf -y remove java-25-openjdk-jmods

From 7d2f9833e4c0e0de784ba5412cf94f8f759fa584 Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek@redhat.com>
Date: Thu, 4 Sep 2025 11:26:20 +0200
Subject: [PATCH 3/3] manual bodhi update for jdk25 needed on selected pkgs