Skip to content

Commit 7e9e011

Browse files
author
Helen
authored
Merge pull request #883 from eputnam/release5
(MODULES-5062) release prep 5.0.0
2 parents 5b01b42 + 0325d37 commit 7e9e011

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1401
-639
lines changed

‎.fixtures.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
fixtures:
22
repositories:
3-
apt:
4-
repo: "https://github.com/puppetlabs/puppetlabs-apt.git"
5-
branch: "1.8.x"
3+
apt: "https://github.com/puppetlabs/puppetlabs-apt.git"
64
stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
75
firewall: "https://github.com/puppetlabs/puppetlabs-firewall.git"
86
concat: "https://github.com/puppetlabs/puppetlabs-concat.git"

‎.gitattributes

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#This file is generated by ModuleSync, do not edit.
2-
*.rb eol=lf
2+
*.rb eol=lf
33
*.erb eol=lf
4-
*.pp eol=lf
5-
*.sh eol=lf
4+
*.pp eol=lf
5+
*.sh eol=lf

‎CHANGELOG.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
## Supported Release 5.0.0
2+
### Summary
3+
This **major** release drops support for Puppet 3 and PostgreSQL 8.x, adds Puppet 4 data types, and deprecates the validate_db_connection type.
4+
5+
#### Added
6+
- `locales/` directory, .pot file, and i18n `config.yaml`
7+
- `update_password` parameter to toggle password management per role
8+
- **Puppet 4** type validation
9+
- `postgresql_conn_validator` type
10+
11+
#### Changed
12+
- Updated default postgis versions in postgresql::globals
13+
- Updated puppetlabs-concat and puppetlabs-apt dependencies
14+
- default `log_line_prefix` has been removed
15+
- `listen_addresses` now defaults to 'localhost' and can be set independently of a class declaration
16+
17+
#### Fixed
18+
- Fixed deprecated apt::source parameters
19+
- Fix for default SUSE parameters
20+
- Remove deprecated force parameter on concat resources
21+
- Replace Puppet.version.to_f version comparison from spec_helper.rb ([MODULES-4528](https://tickets.puppetlabs.com/browse/MODULES-4528))
22+
123
## Supported Release 4.9.0
224
### Summary
325
This release adds several types and, among other bugs, fixes an issue with the yum URL.

‎Gemfile

Lines changed: 16 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -29,38 +29,27 @@ end
2929

3030
# Used for gem conditionals
3131
supports_windows = false
32+
ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
33+
minor_version = "#{ruby_version_segments[0]}.#{ruby_version_segments[1]}"
3234

3335
group :development do
34-
gem 'puppet-lint', :require => false
35-
gem 'metadata-json-lint', :require => false, :platforms => 'ruby'
36-
gem 'puppet_facts', :require => false
37-
gem 'puppet-blacksmith', '>= 3.4.0', :require => false, :platforms => 'ruby'
38-
gem 'puppetlabs_spec_helper', '>= 1.2.1', :require => false
39-
gem 'rspec-puppet', '>= 2.3.2', :require => false
40-
gem 'rspec-puppet-facts', :require => false, :platforms => 'ruby'
41-
gem 'mocha', '< 1.2.0', :require => false
42-
gem 'simplecov', :require => false, :platforms => 'ruby'
43-
gem 'parallel_tests', '< 2.10.0', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
44-
gem 'parallel_tests', :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.0.0')
45-
gem 'rubocop', '0.41.2', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
46-
gem 'rubocop', :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.0.0')
47-
gem 'rubocop-rspec', '~> 1.6', :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0')
48-
gem 'pry', :require => false
49-
gem 'json_pure', '<= 2.0.1', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
50-
gem 'fast_gettext', '1.1.0', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
51-
gem 'fast_gettext', :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
52-
gem 'rainbow', '< 2.2.0', :require => false
36+
gem "puppet-module-posix-default-r#{minor_version}", :require => false, :platforms => "ruby"
37+
gem "puppet-module-win-default-r#{minor_version}", :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
38+
gem "puppet-module-posix-dev-r#{minor_version}", :require => false, :platforms => "ruby"
39+
gem "puppet-module-win-dev-r#{minor_version}", :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
40+
gem "json_pure", '<= 2.0.1', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
41+
gem "fast_gettext", '1.1.0', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
42+
gem "fast_gettext", :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
5343
end
5444

5545
group :system_tests do
56-
gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '>= 3')
57-
gem 'beaker-pe', :require => false
58-
gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'])
59-
gem 'beaker-puppet_install_helper', :require => false
60-
gem 'beaker-module_install_helper', :require => false
61-
gem 'master_manipulator', :require => false
62-
gem 'beaker-hostgenerator', *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
63-
gem 'beaker-abs', *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')
46+
gem "puppet-module-posix-system-r#{minor_version}", :require => false, :platforms => "ruby"
47+
gem "puppet-module-win-system-r#{minor_version}", :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
48+
gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '>= 3')
49+
gem "beaker-pe", :require => false
50+
gem "beaker-rspec", *location_for(ENV['BEAKER_RSPEC_VERSION'])
51+
gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
52+
gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')
6453
end
6554

6655
gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])

0 commit comments

Comments
 (0)