From efe96e765d97d80ee99cc4b74633ef4733441263 Mon Sep 17 00:00:00 2001
From: AlmaLinux RelEng Bot <eabdullin@almalinux.org>
Date: Mon, 30 Mar 2026 10:44:43 -0400
Subject: [PATCH] import CS maven-3.6.3-23.el9

---
 SPECS/maven.spec | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/SPECS/maven.spec b/SPECS/maven.spec
index 0aa7e33..f7733f7 100644
--- a/SPECS/maven.spec
+++ b/SPECS/maven.spec
@@ -8,7 +8,7 @@
 Name:           maven
 Epoch:          1
 Version:        3.6.3
-Release:        22%{?dist}
+Release:        23%{?dist}
 Summary:        Java project management and project comprehension tool
 # maven itself is ASL 2.0
 # bundled slf4j is MIT
@@ -181,6 +181,22 @@ Configures Maven to run with OpenJDK 21.
 %dir %{_jpbindingdir}/maven.conf.d
 %{_jpbindingdir}/maven.conf.d/openjdk21
 
+%package openjdk25
+Summary:        OpenJDK 25 binding for Maven
+Provides:       maven-jdk-binding = %{epoch}:%{version}-%{release}
+Requires:       java-25-openjdk-headless
+Recommends:     java-25-openjdk-devel
+Requires:       javapackages-tools >= 6.4.0
+Requires(meta): maven = %{epoch}:%{version}-%{release}
+
+%description openjdk25
+Configures Maven to run with OpenJDK 25.
+
+%files openjdk25
+%ghost %{_jpbindingdir}/maven.conf
+%dir %{_jpbindingdir}/maven.conf.d
+%{_jpbindingdir}/maven.conf.d/openjdk25
+
 %package unbound
 Summary:        Unbound Maven binding
 Provides:       maven-jdk-binding = %{epoch}:%{version}-%{release}
@@ -308,10 +324,12 @@ echo JAVA_HOME=%{_jvmdir}/jre-1.8.0-openjdk >%{buildroot}%{_javaconfdir}/maven%{
 echo JAVA_HOME=%{_jvmdir}/jre-11-openjdk >%{buildroot}%{_javaconfdir}/maven%{?maven_version_suffix}-openjdk11.conf
 echo JAVA_HOME=%{_jvmdir}/jre-17-openjdk >%{buildroot}%{_javaconfdir}/maven%{?maven_version_suffix}-openjdk17.conf
 echo JAVA_HOME=%{_jvmdir}/jre-21-openjdk >%{buildroot}%{_javaconfdir}/maven%{?maven_version_suffix}-openjdk21.conf
+echo JAVA_HOME=%{_jvmdir}/jre-25-openjdk >%{buildroot}%{_javaconfdir}/maven%{?maven_version_suffix}-openjdk25.conf
 %jp_binding --verbose --variant openjdk8 --ghost maven%{?maven_version_suffix}.conf --target %{_javaconfdir}/maven%{?maven_version_suffix}-openjdk8.conf --provides %{name}-jdk-binding --requires java-1.8.0-openjdk-headless --recommends java-1.8.0-openjdk-devel
 %jp_binding --verbose --variant openjdk11 --ghost maven%{?maven_version_suffix}.conf --target %{_javaconfdir}/maven%{?maven_version_suffix}-openjdk11.conf --provides %{name}-jdk-binding --requires java-11-openjdk-headless --recommends java-11-openjdk-devel
 %jp_binding --verbose --variant openjdk17 --ghost maven%{?maven_version_suffix}.conf --target %{_javaconfdir}/maven%{?maven_version_suffix}-openjdk17.conf --provides %{name}-jdk-binding --requires java-17-openjdk-headless --recommends java-17-openjdk-devel
 %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
 
@@ -355,6 +373,9 @@ if [[ $1 -eq 0 ]]; then update-alternatives --remove mvn %{homedir}/bin/mvn; fi
 %license LICENSE NOTICE
 
 %changelog
+* Thu Dec 04 2025 Marián Konček <mkoncek@redhat.com> - 1:3.6.3-23
+- Add maven-openjdk25 binding
+
 * Thu Dec 12 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.3-22
 - Implement new non-conflicting Java bindings
 - Resolves: RHEL-54068, RHEL-54070, RHEL-54071, RHEL-54072