SPECS/maven.spec

@@ -7,7 +7,7 @@
 Name:           maven
 Epoch:          1
 Version:        3.6.3
-Release:        15%{?dist}
+Release:        19%{?dist}
 Summary:        Java project management and project comprehension tool
 # maven itself is ASL 2.0
 # bundled slf4j is MIT
@@ -80,7 +80,7 @@ BuildRequires:  mvn(org.slf4j:slf4j-simple::sources:)
 
 Requires: %{name}-lib = %{epoch}:%{version}-%{release}
 Requires: %{name}-jdk-binding = %{epoch}:%{version}-%{release}
-Suggests: %{name}-openjdk11 = %{epoch}:%{version}-%{release}
+Suggests: %{name}-openjdk17 = %{epoch}:%{version}-%{release}
 
 Requires: which
 
@@ -143,6 +143,18 @@ Conflicts: maven-jdk-binding
 %description openjdk17
 Configures Maven to run with OpenJDK 17.
 
+%package openjdk21
+Summary:        OpenJDK 21 binding for Maven
+RemovePathPostfixes: -openjdk21
+Provides: maven-jdk-binding = %{epoch}:%{version}-%{release}
+Requires: maven = %{epoch}:%{version}-%{release}
+Requires: java-21-openjdk-headless
+Recommends: java-21-openjdk-devel
+Conflicts: maven-jdk-binding
+
+%description openjdk21
+Configures Maven to run with OpenJDK 21.
+
 %{?javadoc_package}
 
 %prep
@@ -151,10 +163,10 @@ Configures Maven to run with OpenJDK 17.
 find -name '*.java' -exec sed -i 's/\r//' {} +
 find -name 'pom.xml' -exec sed -i 's/\r//' {} +
 
-%patch1 -p1
+%patch -P 1 -p1
-%patch2 -p1
+%patch -P 2 -p1
-%patch3 -p1
+%patch -P 3 -p1
-%patch4 -p1
+%patch -P 4 -p1
 
 # not really used during build, but a precaution
 find -name '*.jar' -not -path '*/test/*' -delete
@@ -250,6 +262,7 @@ install -d -m 755 %{buildroot}%{_javaconfdir}/
 echo JAVA_HOME=%{_jvmlibdir}/jre-1.8.0-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk8
 echo JAVA_HOME=%{_jvmlibdir}/jre-11-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk11
 echo JAVA_HOME=%{_jvmlibdir}/jre-17-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk17
+echo JAVA_HOME=%{_jvmlibdir}/jre-21-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk21
 
 
 %post
@@ -295,7 +308,27 @@ if [[ $1 -eq 0 ]]; then update-alternatives --remove mvn %{homedir}/bin/mvn; fi
 %files openjdk17
 %config %{_javaconfdir}/maven.conf-openjdk17
 
+%files openjdk21
+%config %{_javaconfdir}/maven.conf-openjdk21
+
 %changelog
+* Sat Nov 23 2024 Marián Konček <mkoncek@redhat.com> - 1:3.6.3-19
+- Switch to Fedora tests
+
+* Thu Nov 21 2024 Marián Konček <mkoncek@redhat.com> - 1:3.6.3-18
+- Fix patch usage
+
+* Wed Nov 20 2024 Marián Konček <mkoncek@redhat.com> - 1:3.6.3-17
+- Rebuild with regenerated Requires on Java
+
+* Thu Oct 17 2024 Marián Konček <mkoncek@redhat.com> - 1:3.6.3-16
+- Suggest maven-openjdk17
+- Resolves: RHEL-62398
+
+* Thu Oct 17 2024 Marián Konček <mkoncek@redhat.com> - 1:3.6.3-16
+- Add maven-openjdk21
+- Resolves: RHEL-62407
+
 * Tue Jan 31 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.6.3-15
 - Add missing Requires on which
 - Resolves: rhbz#2165596