Switch to OpenJDK 21 as default JDK/JRE

Resolves: RHEL-49822
This commit is contained in:
Marian Koncek 2024-02-16 15:14:53 +01:00 committed by Mikolaj Izdebski
parent 41d8d30ec8
commit 7b49716980

View File

@ -9,8 +9,8 @@
%global python_prefix python3 %global python_prefix python3
%global python_interpreter %{?__python3}%{!?__python3:dummy} %global python_interpreter %{?__python3}%{!?__python3:dummy}
%global default_jdk %{_prefix}/lib/jvm/java-17-openjdk %global default_jdk %{_prefix}/lib/jvm/java-21-openjdk
%global default_jre %{_prefix}/lib/jvm/jre-17-openjdk %global default_jre %{_prefix}/lib/jvm/jre-21-openjdk
%global maven_home %{_usr}/share/xmvn %global maven_home %{_usr}/share/xmvn
@ -47,7 +47,7 @@ Requires: coreutils
Requires: findutils Requires: findutils
Requires: which Requires: which
# default JRE # default JRE
Requires: java-17-openjdk-headless Requires: java-21-openjdk-headless
Provides: jpackage-utils = %{version}-%{release} Provides: jpackage-utils = %{version}-%{release}
@ -103,7 +103,7 @@ packaging in Linux distributions
Summary: Non-essential macros and scripts for Java packaging support Summary: Non-essential macros and scripts for Java packaging support
Requires: javapackages-common = %{version}-%{release} Requires: javapackages-common = %{version}-%{release}
# Java build systems don't have hard requirement on java-devel, so it should be there # Java build systems don't have hard requirement on java-devel, so it should be there
Requires: java-17-openjdk-devel Requires: java-21-openjdk-devel
Requires: xmvn-tools Requires: xmvn-tools
%if %{with xmvn_generator} %if %{with xmvn_generator}
Requires: xmvn-generator Requires: xmvn-generator
@ -257,6 +257,10 @@ ln -s %{_datadir}/java-utils %{buildroot}%{_usr}/share/java-utils
%license LICENSE %license LICENSE
%changelog %changelog
* Mon Aug 05 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.2.0-10
- Switch to OpenJDK 21 as default JDK/JRE
- Resolves: RHEL-49822
* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 6.2.0-10 * Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 6.2.0-10
- Bump release for Aug 2024 java mass rebuild - Bump release for Aug 2024 java mass rebuild