rpms/maven
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add OpenJDK 21 binding Related: RHEL-17126

Browse Source
This commit is contained in:
Marián Konček 2024-01-22 15:05:14 +01:00 committed by root
parent 041174e06d
commit 33232a0d41
11 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.maven.metadata Normal file
View File

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

2
gating.yaml
View File

@ -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-jdk8.functional}
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke-jdk11.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-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-jdk8.functional}
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages-jdk11.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-jdk17.functional}
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages-jdk21.functional}

22
maven.spec
View File

@ -7,7 +7,7 @@
Name: maven Name: maven
Epoch: 1 Epoch: 1
Version: 3.8.5 Version: 3.8.5
Release: 4%{?dist} Release: 5%{?dist}
Summary: Java project management and project comprehension tool Summary: Java project management and project comprehension tool
# maven itself is ASL 2.0 # maven itself is ASL 2.0
# bundled slf4j is MIT # bundled slf4j is MIT
@ -147,6 +147,18 @@ Conflicts: maven-jdk-binding
%description openjdk17 %description openjdk17
Configures Maven to run with OpenJDK 17. 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} %{?javadoc_package}
%prep %prep
@ -256,6 +268,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-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-11-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk11
echo JAVA_HOME=%{_jvmlibdir}/jre-17-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk17 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 %post
@ -301,7 +314,14 @@ if [[ $1 -eq 0 ]]; then update-alternatives --remove mvn %{homedir}/bin/mvn; fi
%files openjdk17 %files openjdk17
%config %{_javaconfdir}/maven.conf-openjdk17 %config %{_javaconfdir}/maven.conf-openjdk17
%files openjdk21
%config %{_javaconfdir}/maven.conf-openjdk21
%changelog %changelog
* Mon Jan 22 2024 Marián Konček <mkoncek@redhat.com> - 1:3.8.5-5
- Add OpenJDK 21 binding
- Related: RHEL-17126
* Thu Feb 02 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.8.5-4 * Thu Feb 02 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.8.5-4
- Turn hard dependency on java-devel into a weak dependencny - Turn hard dependency on java-devel into a weak dependencny
- Resolves: rhbz#2165591 - Resolves: rhbz#2165591

1
plans/javapackages-jdk11.fmf
View File

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

1
plans/javapackages-jdk17.fmf
View File

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

13
plans/javapackages-jdk21.fmf Normal file
View File

@ -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

1
plans/javapackages-jdk8.fmf
View File

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

1
plans/smoke-jdk11.fmf
View File

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

1
plans/smoke-jdk17.fmf
View File

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

9
plans/smoke-jdk21.fmf Normal file
View File

@ -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

1
plans/smoke-jdk8.fmf
View File

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