From 15a208f3a57aa59a3f3e7b1af2ce434e5637fa28 Mon Sep 17 00:00:00 2001 From: Helen Campbell Date: Thu, 15 Jun 2017 14:34:05 +0100 Subject: [PATCH 1/3] Release prep for 3.0.0 --- CHANGELOG.md | 19 ++++++++++--------- metadata.json | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea08ebd..a9ddea7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ -## Supported Release 2.1.0 +## Supported Release 3.0.0 ### Summary -This release adds fixes to restore the ability to install Oracle Java. It also -fixes the paths for the latest RHEL 7 1.7.0 and 1.8.0 OpenJDKs. +This release sees the addition of an upgrade to Puppet 4. It also adds fixes to restore the ability to install Oracle Java and fixes the paths for the latest RHEL 7 1.7.0 and 1.8.0 OpenJDKs. -### Added -- java::oracle parameter `url` -- java::oracle parameter `url_hash` +#### Features +- Addition of multiple Puppet 4 language features including data types, removal of validate_* function calls -### Fixed -- Let `java_default_home` fact work when /usr/bin/java doesn't exist -- Add puppet 4 parameter types +#### Bugfixes +- Allow a complete URL to be passed to the java::oracle class - [MODULES-5058](https://tickets.puppetlabs.com/browse/MODULES-5058) +- Update java::oracle class to work with new download URLs - [MODULES-5047](https://tickets.puppetlabs.com/browse/MODULES-5047) +- No returns nil if java_bin is not found - [MODULES-4368](https://tickets.puppetlabs.com/browse/MODULES-4368) +- Puppet linting fixes +- Let `java_default_home` fact work when /usr/bin/java doesn't exist - [MODULES-4368](https://tickets.puppetlabs.com/browse/MODULES-4368) - Use `/usr/lib/jvm/java-1.x.0` symlinks for `java_home` defaults. ## Supported Release 2.0.0 diff --git a/metadata.json b/metadata.json index 0e3362c..cd1bcdd 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppetlabs-java", - "version": "2.1.0", + "version": "3.0.0", "author": "puppetlabs", "summary": "Installs the correct Java package on various platforms.", "license": "Apache-2.0", From 8458b03bb5fbd0543e83930a9c8d9b164ccabec8 Mon Sep 17 00:00:00 2001 From: Hunter Haugen Date: Tue, 20 Jun 2017 16:22:10 -0700 Subject: [PATCH 2/3] (maint) Add url_hash tests --- spec/defines/oracle_spec.rb | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/spec/defines/oracle_spec.rb b/spec/defines/oracle_spec.rb index 7115657..9e05ee7 100644 --- a/spec/defines/oracle_spec.rb +++ b/spec/defines/oracle_spec.rb @@ -53,10 +53,29 @@ describe 'java::oracle', :type => :define do end context 'Pass URL to url parameter' do - let(:params) { {:ensure => 'present', :version_major => '8u131', :version_minor => 'b11', :java_se => 'jdk', :url => 'http://download.oracle.com/otn-pub/java/jdk/8u131-b11/d54c1d3a095b4ff2b6607d096fa80163/jdk-8u131-linux-x64.rpm'} } + let(:params) { { + :ensure => 'present', + :version_major => '8u131', + :version_minor => 'b11', + :java_se => 'jdk', + :url => 'http://download.oracle.com/otn-pub/java/jdk/8u131-b11/d54c1d3a095b4ff2b6607d096fa80163/jdk-8u131-linux-x64.rpm', + :url_hash => 'ignored', + } } let :title do 'jdk8' end - it { is_expected.to contain_archive('/tmp/jdk-8u131-linux-x64.rpm')} - end + it { is_expected.to contain_archive('/tmp/jdk-8u131-linux-x64.rpm').with_source('http://download.oracle.com/otn-pub/java/jdk/8u131-b11/d54c1d3a095b4ff2b6607d096fa80163/jdk-8u131-linux-x64.rpm') } + end + + context 'Pass a hash to url_hash parameter' do + let(:params) { { + :ensure => 'present', + :version_major => '8u131', + :version_minor => 'b11', + :java_se => 'jdk', + :url_hash => 'abcdef01234567890', + } } + let :title do 'jdk8' end + it { is_expected.to contain_archive('/tmp/jdk-8u131-linux-x64.rpm').with_source('http://download.oracle.com/otn-pub/java/jdk//8u131-b11/abcdef01234567890/jdk-8u131-linux-x64.rpm') } + end end context 'On CentOS 32-bit' do From b410ac08822f776e6807437b8cf0affb3398e021 Mon Sep 17 00:00:00 2001 From: Hunter Haugen Date: Wed, 21 Jun 2017 15:16:31 -0700 Subject: [PATCH 3/3] Revert "Release prep for 3.0.0" This reverts commit 15a208f3a57aa59a3f3e7b1af2ce434e5637fa28. --- CHANGELOG.md | 19 +++++++++---------- metadata.json | 2 +- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9ddea7..ea08ebd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,16 +1,15 @@ -## Supported Release 3.0.0 +## Supported Release 2.1.0 ### Summary -This release sees the addition of an upgrade to Puppet 4. It also adds fixes to restore the ability to install Oracle Java and fixes the paths for the latest RHEL 7 1.7.0 and 1.8.0 OpenJDKs. +This release adds fixes to restore the ability to install Oracle Java. It also +fixes the paths for the latest RHEL 7 1.7.0 and 1.8.0 OpenJDKs. -#### Features -- Addition of multiple Puppet 4 language features including data types, removal of validate_* function calls +### Added +- java::oracle parameter `url` +- java::oracle parameter `url_hash` -#### Bugfixes -- Allow a complete URL to be passed to the java::oracle class - [MODULES-5058](https://tickets.puppetlabs.com/browse/MODULES-5058) -- Update java::oracle class to work with new download URLs - [MODULES-5047](https://tickets.puppetlabs.com/browse/MODULES-5047) -- No returns nil if java_bin is not found - [MODULES-4368](https://tickets.puppetlabs.com/browse/MODULES-4368) -- Puppet linting fixes -- Let `java_default_home` fact work when /usr/bin/java doesn't exist - [MODULES-4368](https://tickets.puppetlabs.com/browse/MODULES-4368) +### Fixed +- Let `java_default_home` fact work when /usr/bin/java doesn't exist +- Add puppet 4 parameter types - Use `/usr/lib/jvm/java-1.x.0` symlinks for `java_home` defaults. ## Supported Release 2.0.0 diff --git a/metadata.json b/metadata.json index cd1bcdd..0e3362c 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppetlabs-java", - "version": "3.0.0", + "version": "2.1.0", "author": "puppetlabs", "summary": "Installs the correct Java package on various platforms.", "license": "Apache-2.0",