Skip to content

Commit dc59b34

Browse files
authored
Merge pull request #489 from puppetlabs/release-prep
Release prep v6.2.0
2 parents 560402c + 56b0588 commit dc59b34

File tree

3 files changed

+29
-9
lines changed

3 files changed

+29
-9
lines changed

CHANGELOG.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,26 @@
22

33
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).
44

5+
## [v6.2.0](https://github.com/puppetlabs/puppetlabs-tomcat/tree/v6.2.0) (2022-05-16)
6+
7+
[Full Changelog](https://github.com/puppetlabs/puppetlabs-tomcat/compare/v6.1.0...v6.2.0)
8+
9+
### Added
10+
11+
- Update puppet-archive dependency [\#477](https://github.com/puppetlabs/puppetlabs-tomcat/pull/477) ([h4l](https://github.com/h4l))
12+
- pdksync - \(IAC-1753\) - Add Support for AlmaLinux 8 [\#476](https://github.com/puppetlabs/puppetlabs-tomcat/pull/476) ([david22swan](https://github.com/david22swan))
13+
- pdksync - \(IAC-1751\) - Add Support for Rocky 8 [\#475](https://github.com/puppetlabs/puppetlabs-tomcat/pull/475) ([david22swan](https://github.com/david22swan))
14+
- pdksync - \(MAINT\) - Add Labeller and Stale GHA Workflows [\#481](https://github.com/puppetlabs/puppetlabs-tomcat/pull/481) ([chelnak](https://github.com/chelnak))
15+
16+
### Fixed
17+
18+
- pdk - \(MAINT\) - Update PDK [\#488](https://github.com/puppetlabs/puppetlabs-tomcat/pull/488) ([david22swan](https://github.com/david22swan))
19+
- pdksync - \(MAINT\) - Update Labeller Trigger [\#486](https://github.com/puppetlabs/puppetlabs-tomcat/pull/486) ([chelnak](https://github.com/chelnak))
20+
- 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))
21+
- 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))
22+
- pdksync - \(IAC-1787\) Remove Support for CentOS 6 [\#478](https://github.com/puppetlabs/puppetlabs-tomcat/pull/478) ([david22swan](https://github.com/david22swan))
23+
- pdksync - \(IAC-1598\) - Remove Support for Debian 8 [\#474](https://github.com/puppetlabs/puppetlabs-tomcat/pull/474) ([david22swan](https://github.com/david22swan))
24+
525
## [v6.1.0](https://github.com/puppetlabs/puppetlabs-tomcat/tree/v6.1.0) (2021-08-31)
626

727
[Full Changelog](https://github.com/puppetlabs/puppetlabs-tomcat/compare/v6.0.0...v6.1.0)

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "puppetlabs-tomcat",
3-
"version": "6.1.0",
3+
"version": "6.2.0",
44
"author": "puppetlabs",
55
"summary": "Installs, deploys, and configures Apache Tomcat web services.",
66
"license": "Apache-2.0",

spec/acceptance/acceptance_1b_spec.rb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,27 +41,27 @@ class jsvc {
4141
cleanup => false,
4242
path => "/opt/apache-tomcat/bin/commons-daemon-native.tar.gz",
4343
extract_path => "/opt/apache-tomcat/bin",
44-
creates => "/opt/apache-tomcat/bin/commons-daemon-1.2.4-native-src",
44+
creates => "/opt/apache-tomcat/bin/commons-daemon-1.3.0-native-src",
4545
}
4646
-> exec { 'configure jsvc':
4747
command => "JAVA_HOME=${java_home} configure --with-java=${java_home}",
48-
creates => "/opt/apache-tomcat/bin/commons-daemon-1.2.4-native-src/unix/Makefile",
49-
cwd => "/opt/apache-tomcat/bin/commons-daemon-1.2.4-native-src/unix",
50-
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",
48+
creates => "/opt/apache-tomcat/bin/commons-daemon-1.3.0-native-src/unix/Makefile",
49+
cwd => "/opt/apache-tomcat/bin/commons-daemon-1.3.0-native-src/unix",
50+
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",
5151
require => [ Class['gcc'], Class['java'] ],
5252
provider => shell,
5353
}
5454
-> exec { 'make jsvc':
5555
command => 'make',
56-
creates => "/opt/apache-tomcat/bin/commons-daemon-1.2.4-native-src/unix/jsvc",
57-
cwd => "/opt/apache-tomcat/bin/commons-daemon-1.2.4-native-src/unix",
58-
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",
56+
creates => "/opt/apache-tomcat/bin/commons-daemon-1.3.0-native-src/unix/jsvc",
57+
cwd => "/opt/apache-tomcat/bin/commons-daemon-1.3.0-native-src/unix",
58+
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",
5959
provider => shell,
6060
}
6161
-> file { 'jsvc':
6262
ensure => link,
6363
path => "/opt/apache-tomcat/bin/jsvc",
64-
target => "/opt/apache-tomcat/bin/commons-daemon-1.2.4-native-src/unix/jsvc",
64+
target => "/opt/apache-tomcat/bin/commons-daemon-1.3.0-native-src/unix/jsvc",
6565
}
6666
}
6767

0 commit comments

Comments
 (0)