From dbf65476f360be1f32147dd2233bdd7f4f85d37c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mari=C3=A1n=20Kon=C4=8Dek?= <mkoncek@redhat.com>
Date: Mon, 29 Sep 2025 13:52:42 +0200
Subject: [PATCH] Add maven-openjdk25 binding

Resolves: RHEL-100678
---
 gating.yaml      |  2 ++
 maven.spec       |  6 +++++-
 plans/matrix.fmf | 29 ++++++++++++++++++++++++++++-
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/gating.yaml b/gating.yaml
index 54c4549..636273a 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -6,5 +6,7 @@ decision_contexts:
 rules:
   - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/jdk21/full.functional}
   - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/jdk21/headless.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/jdk25/full.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/jdk25/headless.functional}
   - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/unbound/jlink.functional}
   - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages.functional}
diff --git a/maven.spec b/maven.spec
index 78a24c8..e0ccb84 100644
--- a/maven.spec
+++ b/maven.spec
@@ -7,7 +7,7 @@
 Name:           maven
 Epoch:          1
 Version:        3.9.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Java project management and project comprehension tool
 # maven itself is Apache-2.0
 # bundled slf4j is MIT
@@ -218,6 +218,7 @@ install -d -m 755 %{buildroot}%{_javaconfdir}/
 ln -sf %{_jpbindingdir}/maven%{?maven_version_suffix}.conf %{buildroot}%{_javaconfdir}/maven%{?maven_version_suffix}.conf
 echo JAVA_HOME=%{_jvmdir}/jre-21-openjdk >%{buildroot}%{_javaconfdir}/maven%{?maven_version_suffix}-openjdk21.conf
 %jp_binding --verbose --variant openjdk21 --ghost maven%{?maven_version_suffix}.conf --target %{_javaconfdir}/maven%{?maven_version_suffix}-openjdk21.conf --provides %{name}-jdk-binding --requires java-21-openjdk-headless --recommends java-21-openjdk-devel
+%jp_binding --verbose --variant openjdk25 --ghost maven%{?maven_version_suffix}.conf --target %{_javaconfdir}/maven%{?maven_version_suffix}-openjdk25.conf --provides %{name}-jdk-binding --requires java-25-openjdk-headless --recommends java-25-openjdk-devel
 touch %{buildroot}%{_javaconfdir}/maven%{?maven_version_suffix}-unbound.conf
 %jp_binding --verbose --variant unbound --ghost maven%{?maven_version_suffix}.conf --target %{_javaconfdir}/maven%{?maven_version_suffix}-unbound.conf --provides %{name}-jdk-binding
 
@@ -257,6 +258,9 @@ if [[ $1 -eq 0 ]]; then update-alternatives --remove mvn %{homedir}/bin/mvn; fi
 %endif
 
 %changelog
+* Mon Sep 29 2025 Marián Konček <mkoncek@redhat.com> - 1:3.9.9-2
+- Add maven-openjdk25 binding
+
 * Wed Dec 18 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.9.9-1
 - Update to upstream version 3.9.9
 
diff --git a/plans/matrix.fmf b/plans/matrix.fmf
index 1cbe89c..65e7abe 100644
--- a/plans/matrix.fmf
+++ b/plans/matrix.fmf
@@ -11,10 +11,11 @@ environment:
 
 /jdk21:
   environment+:
-    OPENJDK_VERSION: 21
+    OPENJDK_VERSION: "21"
   prepare:
     - how: install
       exclude:
+        - maven-openjdk25
         - maven-unbound
 
   /full:
@@ -33,11 +34,37 @@ environment:
         script: |
           dnf -y remove java-*-openjdk
 
+/jdk25:
+  environment+:
+    OPENJDK_VERSION: "25"
+  prepare:
+    - how: install
+      exclude:
+        - maven-openjdk21
+        - maven-unbound
+
+  /full:
+    summary: Maven matrix tests - OpenJDK 25 full
+    discover+:
+      filter: tag:jdk25 & tier:0,1
+
+  /headless:
+    summary: Maven matrix tests - OpenJDK 25 headless
+    discover+:
+      filter: tag:jre25 & tier:0,1
+    environment+:
+      OPENJDK_HEADLESS: "true"
+    prepare+:
+      - how: shell
+        script: |
+          dnf -y remove java-*-openjdk
+
 /unbound:
   prepare:
     - how: install
       exclude:
         - maven-openjdk21
+        - maven-openjdk25
 
   /jlink:
     summary: Maven matrix tests - unbound jlink-based Java