Showing with 21 additions and 10 deletions.
  1. +14 −1 CHANGELOG.md
  2. +5 −7 metadata.json
  3. +1 −1 spec/acceptance/pkcs12_spec.rb
  4. +1 −1 spec/spec_helper_acceptance_local.rb
15 changes: 14 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,24 @@

All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).

## [v4.4.0](https://github.com/puppetlabs/puppetlabs-java_ks/tree/v4.4.0) (2022-10-03)

[Full Changelog](https://github.com/puppetlabs/puppetlabs-java_ks/compare/v4.3.1...v4.4.0)

### Added

- pdksync - \(GH-cat-11\) Certify Support for Ubuntu 22.04 [\#408](https://github.com/puppetlabs/puppetlabs-java_ks/pull/408) ([david22swan](https://github.com/david22swan))
- pdksync - \(GH-cat-12\) Add Support for Redhat 9 [\#404](https://github.com/puppetlabs/puppetlabs-java_ks/pull/404) ([david22swan](https://github.com/david22swan))

### Fixed

- \(MAINT\) Drop support for Solaris 10, Windows Server 2008 R2 and Windows 7+8.1 [\#410](https://github.com/puppetlabs/puppetlabs-java_ks/pull/410) ([jordanbreen28](https://github.com/jordanbreen28))

## [v4.3.1](https://github.com/puppetlabs/puppetlabs-java_ks/tree/v4.3.1) (2022-05-24)

[Full Changelog](https://github.com/puppetlabs/puppetlabs-java_ks/compare/v4.3.0...v4.3.1)

### Added
### Fixed

- Don't require certificate or private key params when ensure: absent [\#399](https://github.com/puppetlabs/puppetlabs-java_ks/pull/399) ([tparkercbn](https://github.com/tparkercbn))

Expand Down
12 changes: 5 additions & 7 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "puppetlabs-java_ks",
"version": "4.3.1",
"version": "4.4.0",
"author": "puppetlabs",
"summary": "Manage arbitrary Java keystore files",
"license": "Apache-2.0",
Expand All @@ -16,7 +16,8 @@
"operatingsystemrelease": [
"6",
"7",
"8"
"8",
"9"
]
},
{
Expand Down Expand Up @@ -59,13 +60,13 @@
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [
"18.04",
"20.04"
"20.04",
"22.04"
]
},
{
"operatingsystem": "Solaris",
"operatingsystemrelease": [
"10",
"11"
]
},
Expand All @@ -78,13 +79,10 @@
{
"operatingsystem": "Windows",
"operatingsystemrelease": [
"2008 R2",
"2012",
"2012 R2",
"2016",
"2019",
"7",
"8.1",
"10"
]
},
Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/pkcs12_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@

idempotent_apply(pp)

expectations = if os[:family] == 'windows' || (os[:family] == 'ubuntu' && os[:release] == '20.04') ||
expectations = if os[:family] == 'windows' || (os[:family] == 'ubuntu' && ['20.04', '22.04'].include?(os[:release])) ||
(os[:family] == 'debian' && os[:release] =~ %r{^11})
[
%r{Alias name: leaf cert},
Expand Down
2 changes: 1 addition & 1 deletion spec/spec_helper_acceptance_local.rb
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ class { 'java': }
@keytool_path = "C:/Program Files/Java/jdk1.#{java_major}.0_#{java_minor}/bin/"
@resource_path = "['C:/Program Files/Java/jdk1.#{java_major}.0_#{java_minor}/bin/']"
when 'ubuntu'
@ensure_ks = 'present' if os[:release] == '20.04'
@ensure_ks = 'present' if ['20.04', '22.04'].include?(os[:release])
when 'debian'
@ensure_ks = 'present' if os[:release].match?(%r{^11})
end
Expand Down