From 305c94f0b1d38bf6470c1fdb5f6621224424f361 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Mon, 16 May 2022 10:39:03 +0000 Subject: [PATCH 1/2] Release prep v6.2.0 --- CHANGELOG.md | 20 ++++++++++++++++++++ metadata.json | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64fe6b7a..1a88f609 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,26 @@ 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.2.0](https://github.com/puppetlabs/puppetlabs-tomcat/tree/v6.2.0) (2022-05-16) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-tomcat/compare/v6.1.0...v6.2.0) + +### Added + +- Update puppet-archive dependency [\#477](https://github.com/puppetlabs/puppetlabs-tomcat/pull/477) ([h4l](https://github.com/h4l)) +- pdksync - \(IAC-1753\) - Add Support for AlmaLinux 8 [\#476](https://github.com/puppetlabs/puppetlabs-tomcat/pull/476) ([david22swan](https://github.com/david22swan)) +- pdksync - \(IAC-1751\) - Add Support for Rocky 8 [\#475](https://github.com/puppetlabs/puppetlabs-tomcat/pull/475) ([david22swan](https://github.com/david22swan)) +- pdksync - \(MAINT\) - Add Labeller and Stale GHA Workflows [\#481](https://github.com/puppetlabs/puppetlabs-tomcat/pull/481) ([chelnak](https://github.com/chelnak)) + +### Fixed + +- pdk - \(MAINT\) - Update PDK [\#488](https://github.com/puppetlabs/puppetlabs-tomcat/pull/488) ([david22swan](https://github.com/david22swan)) +- pdksync - \(MAINT\) - Update Labeller Trigger [\#486](https://github.com/puppetlabs/puppetlabs-tomcat/pull/486) ([chelnak](https://github.com/chelnak)) +- pdksync - \(GH-C&T-7\) - Remove code specific to unsupported OSs [\#482](https://github.com/puppetlabs/puppetlabs-tomcat/pull/482) ([david22swan](https://github.com/david22swan)) +- pdksync - \(GH-iac-334\) Remove Support for Ubuntu 14.04/16.04 [\#480](https://github.com/puppetlabs/puppetlabs-tomcat/pull/480) ([david22swan](https://github.com/david22swan)) +- pdksync - \(IAC-1787\) Remove Support for CentOS 6 [\#478](https://github.com/puppetlabs/puppetlabs-tomcat/pull/478) ([david22swan](https://github.com/david22swan)) +- pdksync - \(IAC-1598\) - Remove Support for Debian 8 [\#474](https://github.com/puppetlabs/puppetlabs-tomcat/pull/474) ([david22swan](https://github.com/david22swan)) + ## [v6.1.0](https://github.com/puppetlabs/puppetlabs-tomcat/tree/v6.1.0) (2021-08-31) [Full Changelog](https://github.com/puppetlabs/puppetlabs-tomcat/compare/v6.0.0...v6.1.0) diff --git a/metadata.json b/metadata.json index b544f980..4b64c484 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppetlabs-tomcat", - "version": "6.1.0", + "version": "6.2.0", "author": "puppetlabs", "summary": "Installs, deploys, and configures Apache Tomcat web services.", "license": "Apache-2.0", From 56b0588dec6e7107a1a3ff28c91270394a2a1941 Mon Sep 17 00:00:00 2001 From: petergmurphy Date: Mon, 16 May 2022 18:40:10 +0100 Subject: [PATCH 2/2] (MAINT) Update commons-daemon-native version This commit changes the commons-daemon-native version from `1.2.4` to `1.3.0` in the appropriate acceptance tests. --- spec/acceptance/acceptance_1b_spec.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/spec/acceptance/acceptance_1b_spec.rb b/spec/acceptance/acceptance_1b_spec.rb index 997e5a14..d24cad74 100644 --- a/spec/acceptance/acceptance_1b_spec.rb +++ b/spec/acceptance/acceptance_1b_spec.rb @@ -41,27 +41,27 @@ class jsvc { cleanup => false, path => "/opt/apache-tomcat/bin/commons-daemon-native.tar.gz", extract_path => "/opt/apache-tomcat/bin", - creates => "/opt/apache-tomcat/bin/commons-daemon-1.2.4-native-src", + creates => "/opt/apache-tomcat/bin/commons-daemon-1.3.0-native-src", } -> exec { 'configure jsvc': command => "JAVA_HOME=${java_home} configure --with-java=${java_home}", - creates => "/opt/apache-tomcat/bin/commons-daemon-1.2.4-native-src/unix/Makefile", - cwd => "/opt/apache-tomcat/bin/commons-daemon-1.2.4-native-src/unix", - path => "/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin:/opt/apache-tomcat/bin/commons-daemon-1.2.4-native-src/unix", + creates => "/opt/apache-tomcat/bin/commons-daemon-1.3.0-native-src/unix/Makefile", + cwd => "/opt/apache-tomcat/bin/commons-daemon-1.3.0-native-src/unix", + path => "/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin:/opt/apache-tomcat/bin/commons-daemon-1.3.0-native-src/unix", require => [ Class['gcc'], Class['java'] ], provider => shell, } -> exec { 'make jsvc': command => 'make', - creates => "/opt/apache-tomcat/bin/commons-daemon-1.2.4-native-src/unix/jsvc", - cwd => "/opt/apache-tomcat/bin/commons-daemon-1.2.4-native-src/unix", - path => "/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin:/opt/apache-tomcat/bin/commons-daemon-1.2.4-native-src/unix", + creates => "/opt/apache-tomcat/bin/commons-daemon-1.3.0-native-src/unix/jsvc", + cwd => "/opt/apache-tomcat/bin/commons-daemon-1.3.0-native-src/unix", + path => "/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin:/opt/apache-tomcat/bin/commons-daemon-1.3.0-native-src/unix", provider => shell, } -> file { 'jsvc': ensure => link, path => "/opt/apache-tomcat/bin/jsvc", - target => "/opt/apache-tomcat/bin/commons-daemon-1.2.4-native-src/unix/jsvc", + target => "/opt/apache-tomcat/bin/commons-daemon-1.3.0-native-src/unix/jsvc", } }