Skip to content

(MODULES-11917) Default RHEL 10 to OpenJDK 21 #631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
imaqsood merged 1 commit into from
Aug 6, 2026
Merged

(MODULES-11917) Default RHEL 10 to OpenJDK 21 #631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,22 @@
'AlmaLinux', 'Rocky', 'RedHat', 'CentOS', 'OracleLinux', 'Scientific', 'OEL', 'SLC', 'CloudLinux': {
# See PR#160 / c8e46b5 for why >= 6.3 < 7.1
if (versioncmp($facts['os']['release']['full'], '7.1') < 0) {
$openjdk = '1.7.0'
$openjdk = '1.7.0'
$jdk_package = "java-${openjdk}-openjdk-devel"
$jre_package = "java-${openjdk}-openjdk"
$java_home = "/usr/lib/jvm/java-${openjdk}/"
} elsif (versioncmp($facts['os']['release']['full'], '10') >= 0) {
# RHEL 10 dropped java-1.8.0-openjdk; default to the current LTS.
$openjdk = '21'
$jdk_package = "java-${openjdk}-openjdk-devel"
$jre_package = "java-${openjdk}-openjdk"
$java_home = "/usr/lib/jvm/java-${openjdk}-openjdk/"
} else {
$openjdk = '1.8.0'
$openjdk = '1.8.0'
$jdk_package = "java-${openjdk}-openjdk-devel"
$jre_package = "java-${openjdk}-openjdk"
$java_home = "/usr/lib/jvm/java-${openjdk}/"
}
$jdk_package = "java-${openjdk}-openjdk-devel"
$jre_package = "java-${openjdk}-openjdk"
$java_home = "/usr/lib/jvm/java-${openjdk}/"
}
'Fedora': {
if (versioncmp($facts['os']['release']['full'], '21') < 0) {
Expand Down
7 changes: 7 additions & 0 deletions spec/classes/java_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@
it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.8.0/') }
end

context 'when selecting openjdk for RedHat 10' do
let(:facts) { { os: { family: 'RedHat', name: 'RedHat', release: { full: '10.0', major: '10' }, architecture: 'x86_64' } } }

it { is_expected.to contain_package('java').with_name('java-21-openjdk-devel') }
it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-21-openjdk/') }
end

context 'on Debian Buster (10.0)' do
let(:facts) { { os: { family: 'Debian', name: 'Debian', lsb: { distcodename: 'buster' }, release: { major: '10' }, architecture: 'amd64' } } }

Expand Down
Loading