Drop OpenJDK 17 subpackage
Resolves: RHEL-51273
This commit is contained in:
parent
c4e2a95265
commit
28407eccf6
@ -4,8 +4,6 @@ product_versions:
|
|||||||
decision_contexts:
|
decision_contexts:
|
||||||
- osci_compose_gate
|
- osci_compose_gate
|
||||||
rules:
|
rules:
|
||||||
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/jdk17/full.functional}
|
|
||||||
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/jdk21/full.functional}
|
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/jdk21/full.functional}
|
||||||
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/jdk17/headless.functional}
|
|
||||||
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/jdk21/headless.functional}
|
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/jdk21/headless.functional}
|
||||||
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages.functional}
|
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages.functional}
|
||||||
|
20
maven.spec
20
maven.spec
@ -111,18 +111,6 @@ Provides: bundled(slf4j) = %{bundled_slf4j_version}
|
|||||||
%description lib
|
%description lib
|
||||||
Core part of Apache Maven that can be used as a library.
|
Core part of Apache Maven that can be used as a library.
|
||||||
|
|
||||||
%package openjdk17
|
|
||||||
Summary: OpenJDK 17 binding for Maven
|
|
||||||
RemovePathPostfixes: -openjdk17
|
|
||||||
Provides: %{name}-jdk-binding = %{epoch}:%{version}-%{release}
|
|
||||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
|
||||||
Requires: java-17-openjdk-headless
|
|
||||||
Recommends: java-17-openjdk-devel
|
|
||||||
Conflicts: %{name}-jdk-binding
|
|
||||||
|
|
||||||
%description openjdk17
|
|
||||||
Configures Maven to run with OpenJDK 17.
|
|
||||||
|
|
||||||
%package openjdk21
|
%package openjdk21
|
||||||
Summary: OpenJDK 21 binding for Maven
|
Summary: OpenJDK 21 binding for Maven
|
||||||
RemovePathPostfixes: -openjdk21
|
RemovePathPostfixes: -openjdk21
|
||||||
@ -238,7 +226,6 @@ ln -s %{homedir}/bin/mvnDebug.1.gz %{buildroot}%{_mandir}/man1/mvnDebug%{maven_v
|
|||||||
|
|
||||||
# JDK bindings
|
# JDK bindings
|
||||||
install -d -m 755 %{buildroot}%{_javaconfdir}/
|
install -d -m 755 %{buildroot}%{_javaconfdir}/
|
||||||
echo JAVA_HOME=%{_jvmlibdir}/jre-17-openjdk >%{buildroot}%{_javaconfdir}/maven%{?maven_version_suffix}.conf-openjdk17
|
|
||||||
echo JAVA_HOME=%{_jvmlibdir}/jre-21-openjdk >%{buildroot}%{_javaconfdir}/maven%{?maven_version_suffix}.conf-openjdk21
|
echo JAVA_HOME=%{_jvmlibdir}/jre-21-openjdk >%{buildroot}%{_javaconfdir}/maven%{?maven_version_suffix}.conf-openjdk21
|
||||||
|
|
||||||
|
|
||||||
@ -276,13 +263,14 @@ if [[ $1 -eq 0 ]]; then update-alternatives --remove mvn %{homedir}/bin/mvn; fi
|
|||||||
%{_mandir}/man1/mvnDebug%{maven_version_suffix}.1.gz
|
%{_mandir}/man1/mvnDebug%{maven_version_suffix}.1.gz
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%files openjdk17
|
|
||||||
%config %{_javaconfdir}/maven%{?maven_version_suffix}.conf-openjdk17
|
|
||||||
|
|
||||||
%files openjdk21
|
%files openjdk21
|
||||||
%config %{_javaconfdir}/maven%{?maven_version_suffix}.conf-openjdk21
|
%config %{_javaconfdir}/maven%{?maven_version_suffix}.conf-openjdk21
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Aug 05 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.9.6-8
|
||||||
|
- Drop OpenJDK 17 subpackage
|
||||||
|
- Resolves: RHEL-51273
|
||||||
|
|
||||||
* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 1:3.9.6-8
|
* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 1:3.9.6-8
|
||||||
- Bump release for Aug 2024 java mass rebuild
|
- Bump release for Aug 2024 java mass rebuild
|
||||||
|
|
||||||
|
@ -3,9 +3,5 @@ discover:
|
|||||||
how: fmf
|
how: fmf
|
||||||
url: https://src.fedoraproject.org/tests/javapackages
|
url: https://src.fedoraproject.org/tests/javapackages
|
||||||
ref: c10s
|
ref: c10s
|
||||||
prepare:
|
|
||||||
how: install
|
|
||||||
exclude:
|
|
||||||
- maven-openjdk17
|
|
||||||
execute:
|
execute:
|
||||||
how: tmt
|
how: tmt
|
||||||
|
@ -5,37 +5,9 @@ discover:
|
|||||||
execute:
|
execute:
|
||||||
how: tmt
|
how: tmt
|
||||||
|
|
||||||
/jdk17:
|
|
||||||
environment:
|
|
||||||
OPENJDK_VERSION: 17
|
|
||||||
prepare:
|
|
||||||
- how: install
|
|
||||||
exclude:
|
|
||||||
- maven-openjdk21
|
|
||||||
|
|
||||||
/full:
|
|
||||||
summary: Maven matrix tests - OpenJDK 17 full
|
|
||||||
discover+:
|
|
||||||
filter: tag:jdk17 & tier:0,1
|
|
||||||
|
|
||||||
/headless:
|
|
||||||
summary: Maven matrix tests - OpenJDK 17 headless
|
|
||||||
discover+:
|
|
||||||
filter: tag:jre17 & tier:0,1
|
|
||||||
environment+:
|
|
||||||
OPENJDK_HEADLESS: "true"
|
|
||||||
prepare+:
|
|
||||||
- how: shell
|
|
||||||
script: |
|
|
||||||
dnf -y remove java-*-openjdk
|
|
||||||
|
|
||||||
/jdk21:
|
/jdk21:
|
||||||
environment:
|
environment:
|
||||||
OPENJDK_VERSION: 21
|
OPENJDK_VERSION: 21
|
||||||
prepare:
|
|
||||||
- how: install
|
|
||||||
exclude:
|
|
||||||
- maven-openjdk17
|
|
||||||
|
|
||||||
/full:
|
/full:
|
||||||
summary: Maven matrix tests - OpenJDK 21 full
|
summary: Maven matrix tests - OpenJDK 21 full
|
||||||
|
Loading…
Reference in New Issue
Block a user