Rebuild to regenerate auto-requires

Related: RHEL-17126

.maven.metadata

@@ -0,0 +1 @@
+976a947711e82f11f47c7b128dd8df903642075b apache-maven-3.8.5-src.tar.gz

gating.yaml

@@ -8,6 +8,8 @@ rules:
   - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke-jdk8.functional}
   - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke-jdk11.functional}
   - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke-jdk17.functional}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke-jdk21.functional}
   - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages-jdk8.functional}
   - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages-jdk11.functional}
   - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages-jdk17.functional}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages-jdk21.functional}

maven.spec

@@ -7,7 +7,7 @@
 Name:           maven
 Epoch:          1
 Version:        3.8.5
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        Java project management and project comprehension tool
 # maven itself is ASL 2.0
 # bundled slf4j is MIT
@@ -144,6 +144,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
@@ -253,6 +265,7 @@ install -d -m 755 %{buildroot}%{_javaconfdir}/
 echo JAVA_HOME=%{_jvmlibdir}/java-1.8.0-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk8
 echo JAVA_HOME=%{_jvmlibdir}/java-11-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk11
 echo JAVA_HOME=%{_jvmlibdir}/java-17-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk17
+echo JAVA_HOME=%{_jvmlibdir}/java-21-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk21
 
 
 %post
@@ -298,7 +311,17 @@ 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
+* Mon Feb 05 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.8.5-5
+- Rebuild to regenerate auto-requires
+
+* Mon Jan 22 2024 Marián Konček <mkoncek@redhat.com> - 1:3.8.5-4
+- Add OpenJDK 21 binding
+- Related: RHEL-17126
+
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.8.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

plans/javapackages-jdk11.fmf

@@ -5,6 +5,7 @@ prepare:
   exclude:
     - maven-openjdk8
     - maven-openjdk17
+    - maven-openjdk21
 discover:
     how: fmf
     url: https://pagure.io/javapackages-validator-tests

plans/javapackages-jdk17.fmf

@@ -5,6 +5,7 @@ prepare:
   exclude:
     - maven-openjdk8
     - maven-openjdk11
+    - maven-openjdk21
 discover:
     how: fmf
     url: https://pagure.io/javapackages-validator-tests

plans/javapackages-jdk21.fmf

@@ -0,0 +1,13 @@
+summary:
+    Run javapackages-specific tests - OpenJDK 21
+prepare:
+  how: install
+  exclude:
+    - maven-openjdk8
+    - maven-openjdk11
+    - maven-openjdk17
+discover:
+    how: fmf
+    url: https://pagure.io/javapackages-validator-tests
+execute:
+    how: tmt

plans/javapackages-jdk8.fmf

@@ -5,6 +5,7 @@ prepare:
   exclude:
     - maven-openjdk11
     - maven-openjdk17
+    - maven-openjdk21
 discover:
     how: fmf
     url: https://pagure.io/javapackages-validator-tests

plans/smoke-jdk11.fmf

@@ -4,5 +4,6 @@ prepare:
   exclude:
     - maven-openjdk8
     - maven-openjdk17
+    - maven-openjdk21
 execute:
   script: mvn -V dependency:get -Dartifact=junit:junit:4.12 && stat $HOME/.m2/repository/junit/junit/4.12/junit-4.12.jar

plans/smoke-jdk17.fmf

@@ -4,5 +4,6 @@ prepare:
   exclude:
     - maven-openjdk8
     - maven-openjdk11
+    - maven-openjdk21
 execute:
   script: mvn -V dependency:get -Dartifact=junit:junit:4.12 && stat $HOME/.m2/repository/junit/junit/4.12/junit-4.12.jar

plans/smoke-jdk21.fmf

@@ -0,0 +1,9 @@
+summary: Basic smoke test - OpenJDK 21
+prepare:
+  how: install
+  exclude:
+    - maven-openjdk8
+    - maven-openjdk11
+    - maven-openjdk17
+execute:
+  script: mvn -V dependency:get -Dartifact=junit:junit:4.12 && stat $HOME/.m2/repository/junit/junit/4.12/junit-4.12.jar

plans/smoke-jdk8.fmf

@@ -4,5 +4,6 @@ prepare:
   exclude:
     - maven-openjdk11
     - maven-openjdk17
+    - maven-openjdk21
 execute:
   script: mvn -V dependency:get -Dartifact=junit:junit:4.12 && stat $HOME/.m2/repository/junit/junit/4.12/junit-4.12.jar