From c751b70e87e9d90e5a23fe6f6b8f47f9e60299a5 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 23 Sep 2026 14:17:01 +0000 Subject: [PATCH] Release prep v6.1.0 --- CHANGELOG.md | 8 ++++++++ REFERENCE.md | 7 +++++++ metadata.json | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 78c89df..f14bc7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,14 @@ 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). +## [v6.1.0](https://github.com/puppetlabs/puppetlabs-java_ks/tree/v6.1.0) - 2026-09-23 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java_ks/compare/v6.0.0...v6.1.0) + +### Added + +- Make keytool path configureable [#477](https://github.com/puppetlabs/puppetlabs-java_ks/pull/477) ([bastelfreak](https://github.com/bastelfreak)) + ## [v6.0.0](https://github.com/puppetlabs/puppetlabs-java_ks/tree/v6.0.0) - 2026-09-16 [Full Changelog](https://github.com/puppetlabs/puppetlabs-java_ks/compare/v5.1.1...v6.0.0) diff --git a/REFERENCE.md b/REFERENCE.md index 5b705ff..e37f24d 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -69,6 +69,7 @@ The following parameters are available in the `java_ks` type. * [`certificate_content`](#-java_ks--certificate_content) * [`chain`](#-java_ks--chain) * [`destkeypass`](#-java_ks--destkeypass) +* [`keytool`](#-java_ks--keytool) * [`keytool_timeout`](#-java_ks--keytool_timeout) * [`name`](#-java_ks--name) * [`password_fail_reset`](#-java_ks--password_fail_reset) @@ -103,6 +104,12 @@ from a file separate from the server certificate. This will autorequire the spec The password used to protect the key in keystore. +##### `keytool` + +Path to the keytool executable used by the provider. + +Default value: `keytool` + ##### `keytool_timeout` Timeout for the keytool command in seconds. diff --git a/metadata.json b/metadata.json index b3ddd52..dfa8a84 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppetlabs-java_ks", - "version": "6.0.0", + "version": "6.1.0", "author": "puppetlabs", "summary": "Manage arbitrary Java keystore files", "license": "Apache-2.0",