rpms/javapackages-tools
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Switch to OpenJDK 17 as default JDK/JRE

Browse Source
This commit is contained in:
Mikolaj Izdebski 2021-11-02 15:26:46 +01:00
parent f5fddac664
commit e1003859aa
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
javapackages-config.json
View File

@ -2,7 +2,7 @@
"maven.req": { "maven.req": {
"always_generate": [ "always_generate": [
"javapackages-filesystem", "javapackages-filesystem",
"(java-headless or java-11-headless)" "(java-headless or java-17-headless)"
], ],
"java_requires": { "java_requires": {
"skip": true "skip": true

13
javapackages-tools.spec
View File

@ -13,12 +13,12 @@
%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-11-openjdk %global default_jdk %{_prefix}/lib/jvm/java-17-openjdk
%global default_jre %{_prefix}/lib/jvm/jre-11-openjdk %global default_jre %{_prefix}/lib/jvm/jre-17-openjdk
Name: javapackages-tools Name: javapackages-tools
Version: 6.0.0 Version: 6.0.0
Release: 6%{?dist} Release: 7%{?dist}
Summary: Macros and scripts for Java packaging support Summary: Macros and scripts for Java packaging support
License: BSD License: BSD
URL: https://github.com/fedora-java/javapackages URL: https://github.com/fedora-java/javapackages
@ -50,7 +50,7 @@ Requires: coreutils
Requires: findutils Requires: findutils
Requires: which Requires: which
# default JRE # default JRE
Requires: java-11-openjdk-headless Requires: java-17-openjdk-headless
Provides: jpackage-utils = %{version}-%{release} Provides: jpackage-utils = %{version}-%{release}
# These could be generated automatically, but then we would need to # These could be generated automatically, but then we would need to
@ -112,7 +112,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-generators = %{version}-%{release} Requires: javapackages-generators = %{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-11-openjdk-devel Requires: java-17-openjdk-devel
%if %{with bootstrap} %if %{with bootstrap}
Requires: javapackages-bootstrap Requires: javapackages-bootstrap
%else %else
@ -228,6 +228,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config
%license LICENSE %license LICENSE
%changelog %changelog
* Thu Jan 27 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0-7
- Switch to OpenJDK 17 as default JDK/JRE
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-6 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild