RickRongen/puppetlabs-java
1
0
Fork 0
Code Releases Activity

Update default version & java 8 version from 8u192 to 8u201 (#347)

Browse Source 
* Update default version & java 8 version from 8u192 to 8u201
This commit is contained in:
Valentin
2019-02-25 12:46:52 +01:00
committed by Eimhin Laverty
parent 3d8f80e4d9
commit 5509042cd1
3 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/oracle.pp
View File

@@ -172,16 +172,16 @@ define java::oracle (
$release_hash = undef $release_hash = undef
} }
'8' : { '8' : {
$release_major = '8u192' $release_major = '8u201'
$release_minor = 'b12' $release_minor = 'b09'
$install_path = "${java_se}1.8.0_192" $install_path = "${java_se}1.8.0_201"
$release_hash = '750e1c8617c5452694857ad95c3ee230' $release_hash = '42970487e3af4f5aa5bca3f542482c60'
} }
default : { default : {
$release_major = '8u192' $release_major = '8u201'
$release_minor = 'b12' $release_minor = 'b09'
$install_path = "${java_se}1.8.0_192" $install_path = "${java_se}1.8.0_201"
$release_hash = '750e1c8617c5452694857ad95c3ee230' $release_hash = '42970487e3af4f5aa5bca3f542482c60'
} }
} }
} }

6
spec/acceptance/install_spec.rb
View File

@@ -87,9 +87,9 @@ bogus_alternative = "class { 'java':\n"\
oracle_enabled = false oracle_enabled = false
oracle_version_major = '8' oracle_version_major = '8'
oracle_version_minor = '192' oracle_version_minor = '201'
oracle_version_build = '12' oracle_version_build = '09'
oracle_hash = '750e1c8617c5452694857ad95c3ee230' oracle_hash = '42970487e3af4f5aa5bca3f542482c60'
install_oracle_jre = <<EOL install_oracle_jre = <<EOL
java::oracle { java::oracle {

80
spec/defines/oracle_spec.rb
View File

@@ -1,6 +1,6 @@
require 'spec_helper' require 'spec_helper'
oracle_url = 'http://download.oracle.com/otn-pub/java/jdk/8u192-b12/750e1c8617c5452694857ad95c3ee230/jdk-8u192-linux-x64.tar.gz' oracle_url = 'http://download.oracle.com/otn-pub/java/jdk/8u201-b09/42970487e3af4f5aa5bca3f542482c60/jdk-8u201-linux-x64.tar.gz'
describe 'java::oracle', type: :define do describe 'java::oracle', type: :define do
context 'with CentOS 64-bit' do context 'with CentOS 64-bit' do
@@ -28,9 +28,9 @@ describe 'java::oracle', type: :define do
let(:params) { { ensure: 'present', version: '8', java_se: 'jdk' } } let(:params) { { ensure: 'present', version: '8', java_se: 'jdk' } }
let(:title) { 'jdk8' } let(:title) { 'jdk8' }
it { is_expected.to contain_archive('/tmp/jdk-8u192-linux-x64.rpm') } it { is_expected.to contain_archive('/tmp/jdk-8u201-linux-x64.rpm') }
it { is_expected.to contain_exec('Install Oracle java_se jdk 8 8u192 b12').with_command('rpm --force -iv /tmp/jdk-8u192-linux-x64.rpm') } it { is_expected.to contain_exec('Install Oracle java_se jdk 8 8u201 b09').with_command('rpm --force -iv /tmp/jdk-8u201-linux-x64.rpm') }
it { is_expected.to contain_exec('Install Oracle java_se jdk 8 8u192 b12').that_requires('Archive[/tmp/jdk-8u192-linux-x64.rpm]') } it { is_expected.to contain_exec('Install Oracle java_se jdk 8 8u201 b09').that_requires('Archive[/tmp/jdk-8u201-linux-x64.rpm]') }
end end
context 'when Oracle Java SE 6 JRE' do context 'when Oracle Java SE 6 JRE' do
@@ -55,27 +55,27 @@ describe 'java::oracle', type: :define do
let(:params) { { ensure: 'present', version: '8', java_se: 'jre' } } let(:params) { { ensure: 'present', version: '8', java_se: 'jre' } }
let(:title) { 'jre8' } let(:title) { 'jre8' }
it { is_expected.to contain_archive('/tmp/jre-8u192-linux-x64.rpm') } it { is_expected.to contain_archive('/tmp/jre-8u201-linux-x64.rpm') }
it { is_expected.to contain_exec('Install Oracle java_se jre 8 8u192 b12').with_command('rpm --force -iv /tmp/jre-8u192-linux-x64.rpm') } it { is_expected.to contain_exec('Install Oracle java_se jre 8 8u201 b09').with_command('rpm --force -iv /tmp/jre-8u201-linux-x64.rpm') }
it { is_expected.to contain_exec('Install Oracle java_se jre 8 8u192 b12').that_requires('Archive[/tmp/jre-8u192-linux-x64.rpm]') } it { is_expected.to contain_exec('Install Oracle java_se jre 8 8u201 b09').that_requires('Archive[/tmp/jre-8u201-linux-x64.rpm]') }
end end
context 'when passing URL to url parameter' do context 'when passing URL to url parameter' do
let(:params) do let(:params) do
{ {
ensure: 'present', ensure: 'present',
version_major: '8u192', version_major: '8u201',
version_minor: 'b12', version_minor: 'b09',
java_se: 'jdk', java_se: 'jdk',
url: 'http://download.oracle.com/otn-pub/java/jdk/8u192-b12/750e1c8617c5452694857ad95c3ee230/jdk-8u192-linux-x64.rpm', url: 'http://download.oracle.com/otn-pub/java/jdk/8u201-b09/42970487e3af4f5aa5bca3f542482c60/jdk-8u201-linux-x64.rpm',
url_hash: 'ignored', url_hash: 'ignored',
} }
end end
let(:title) { 'jdk8' } let(:title) { 'jdk8' }
it { it {
is_expected.to contain_archive('/tmp/jdk-8u192-linux-x64.rpm') is_expected.to contain_archive('/tmp/jdk-8u201-linux-x64.rpm')
.with_source('http://download.oracle.com/otn-pub/java/jdk/8u192-b12/750e1c8617c5452694857ad95c3ee230/jdk-8u192-linux-x64.rpm') .with_source('http://download.oracle.com/otn-pub/java/jdk/8u201-b09/42970487e3af4f5aa5bca3f542482c60/jdk-8u201-linux-x64.rpm')
} }
end end
@@ -83,17 +83,17 @@ describe 'java::oracle', type: :define do
let(:params) do let(:params) do
{ {
ensure: 'present', ensure: 'present',
version_major: '8u192', version_major: '8u201',
version_minor: 'b12', version_minor: 'b09',
java_se: 'jdk', java_se: 'jdk',
url_hash: '750e1c8617c5452694857ad95c3ee230', url_hash: '42970487e3af4f5aa5bca3f542482c60',
} }
end end
let(:title) { 'jdk8' } let(:title) { 'jdk8' }
it { it {
is_expected.to contain_archive('/tmp/jdk-8u192-linux-x64.rpm') is_expected.to contain_archive('/tmp/jdk-8u201-linux-x64.rpm')
.with_source('http://download.oracle.com/otn-pub/java/jdk//8u192-b12/750e1c8617c5452694857ad95c3ee230/jdk-8u192-linux-x64.rpm') .with_source('http://download.oracle.com/otn-pub/java/jdk//8u201-b09/42970487e3af4f5aa5bca3f542482c60/jdk-8u201-linux-x64.rpm')
} }
end end
@@ -101,10 +101,10 @@ describe 'java::oracle', type: :define do
let(:params) do let(:params) do
{ {
ensure: 'present', ensure: 'present',
version_major: '8u192', version_major: '8u201',
version_minor: 'b12', version_minor: 'b09',
java_se: 'jdk', java_se: 'jdk',
url_hash: '750e1c8617c5452694857ad95c3ee230', url_hash: '42970487e3af4f5aa5bca3f542482c60',
} }
end end
let(:title) { 'jdk8' } let(:title) { 'jdk8' }
@@ -202,9 +202,9 @@ describe 'java::oracle', type: :define do
let(:params) { { ensure: 'present', version: '8', java_se: 'jdk' } } let(:params) { { ensure: 'present', version: '8', java_se: 'jdk' } }
let(:title) { 'jdk8' } let(:title) { 'jdk8' }
it { is_expected.to contain_archive('/tmp/jdk-8u192-linux-i586.rpm') } it { is_expected.to contain_archive('/tmp/jdk-8u201-linux-i586.rpm') }
it { is_expected.to contain_exec('Install Oracle java_se jdk 8 8u192 b12').with_command('rpm --force -iv /tmp/jdk-8u192-linux-i586.rpm') } it { is_expected.to contain_exec('Install Oracle java_se jdk 8 8u201 b09').with_command('rpm --force -iv /tmp/jdk-8u201-linux-i586.rpm') }
it { is_expected.to contain_exec('Install Oracle java_se jdk 8 8u192 b12').that_requires('Archive[/tmp/jdk-8u192-linux-i586.rpm]') } it { is_expected.to contain_exec('Install Oracle java_se jdk 8 8u201 b09').that_requires('Archive[/tmp/jdk-8u201-linux-i586.rpm]') }
end end
context 'when selecting Oracle Java SE 6 JRE on RedHat family, 32-bit' do context 'when selecting Oracle Java SE 6 JRE on RedHat family, 32-bit' do
@@ -229,19 +229,19 @@ describe 'java::oracle', type: :define do
let(:params) { { ensure: 'present', version: '8', java_se: 'jre' } } let(:params) { { ensure: 'present', version: '8', java_se: 'jre' } }
let(:title) { 'jdk8' } let(:title) { 'jdk8' }
it { is_expected.to contain_archive('/tmp/jre-8u192-linux-i586.rpm') } it { is_expected.to contain_archive('/tmp/jre-8u201-linux-i586.rpm') }
it { is_expected.to contain_exec('Install Oracle java_se jre 8 8u192 b12').with_command('rpm --force -iv /tmp/jre-8u192-linux-i586.rpm') } it { is_expected.to contain_exec('Install Oracle java_se jre 8 8u201 b09').with_command('rpm --force -iv /tmp/jre-8u201-linux-i586.rpm') }
it { is_expected.to contain_exec('Install Oracle java_se jre 8 8u192 b12').that_requires('Archive[/tmp/jre-8u192-linux-i586.rpm]') } it { is_expected.to contain_exec('Install Oracle java_se jre 8 8u201 b09').that_requires('Archive[/tmp/jre-8u201-linux-i586.rpm]') }
end end
context 'when installing multiple versions' do context 'when installing multiple versions' do
let(:params) do let(:params) do
{ {
ensure: 'present', ensure: 'present',
version_major: '8u192', version_major: '8u201',
version_minor: 'b12', version_minor: 'b09',
java_se: 'jdk', java_se: 'jdk',
url_hash: '750e1c8617c5452694857ad95c3ee230', url_hash: '42970487e3af4f5aa5bca3f542482c60',
} }
end end
let(:title) { 'jdk8' } let(:title) { 'jdk8' }
@@ -308,9 +308,9 @@ describe 'java::oracle', type: :define do
let(:params) { { ensure: 'present', version: '8', java_se: 'jdk' } } let(:params) { { ensure: 'present', version: '8', java_se: 'jdk' } }
let(:title) { 'jdk8' } let(:title) { 'jdk8' }
it { is_expected.to contain_archive('/tmp/jdk-8u192-linux-x64.tar.gz') } it { is_expected.to contain_archive('/tmp/jdk-8u201-linux-x64.tar.gz') }
it { is_expected.to contain_exec('Install Oracle java_se jdk 8 8u192 b12').with_command('tar -zxf /tmp/jdk-8u192-linux-x64.tar.gz -C /usr/lib/jvm') } it { is_expected.to contain_exec('Install Oracle java_se jdk 8 8u201 b09').with_command('tar -zxf /tmp/jdk-8u201-linux-x64.tar.gz -C /usr/lib/jvm') }
it { is_expected.to contain_exec('Install Oracle java_se jdk 8 8u192 b12').that_requires('Archive[/tmp/jdk-8u192-linux-x64.tar.gz]') } it { is_expected.to contain_exec('Install Oracle java_se jdk 8 8u201 b09').that_requires('Archive[/tmp/jdk-8u201-linux-x64.tar.gz]') }
end end
context 'with Oracle Java SE 6 JRE' do context 'with Oracle Java SE 6 JRE' do
@@ -335,26 +335,26 @@ describe 'java::oracle', type: :define do
let(:params) { { ensure: 'present', version: '8', java_se: 'jre' } } let(:params) { { ensure: 'present', version: '8', java_se: 'jre' } }
let(:title) { 'jre8' } let(:title) { 'jre8' }
it { is_expected.to contain_archive('/tmp/jre-8u192-linux-x64.tar.gz') } it { is_expected.to contain_archive('/tmp/jre-8u201-linux-x64.tar.gz') }
it { is_expected.to contain_exec('Install Oracle java_se jre 8 8u192 b12').with_command('tar -zxf /tmp/jre-8u192-linux-x64.tar.gz -C /usr/lib/jvm') } it { is_expected.to contain_exec('Install Oracle java_se jre 8 8u201 b09').with_command('tar -zxf /tmp/jre-8u201-linux-x64.tar.gz -C /usr/lib/jvm') }
it { is_expected.to contain_exec('Install Oracle java_se jre 8 8u192 b12').that_requires('Archive[/tmp/jre-8u192-linux-x64.tar.gz]') } it { is_expected.to contain_exec('Install Oracle java_se jre 8 8u201 b09').that_requires('Archive[/tmp/jre-8u201-linux-x64.tar.gz]') }
end end
context 'when passing URL to url parameter' do context 'when passing URL to url parameter' do
let(:params) { { ensure: 'present', version_major: '8u192', version_minor: 'b12', java_se: 'jdk', url: oracle_url.to_s } } let(:params) { { ensure: 'present', version_major: '8u201', version_minor: 'b09', java_se: 'jdk', url: oracle_url.to_s } }
let(:title) { 'jdk8' } let(:title) { 'jdk8' }
it { is_expected.to contain_archive('/tmp/jdk-8u192-linux-x64.tar.gz') } it { is_expected.to contain_archive('/tmp/jdk-8u201-linux-x64.tar.gz') }
end end
context 'when installing multiple versions' do context 'when installing multiple versions' do
let(:params) do let(:params) do
{ {
ensure: 'present', ensure: 'present',
version_major: '8u192', version_major: '8u201',
version_minor: 'b12', version_minor: 'b09',
java_se: 'jdk', java_se: 'jdk',
url_hash: '750e1c8617c5452694857ad95c3ee230', url_hash: '42970487e3af4f5aa5bca3f542482c60',
} }
end end
let(:title) { 'jdk8' } let(:title) { 'jdk8' }