Skip to content

Commit 6c34246

Browse files
authored
Merge pull request #43 from danielparks/pdk-update
PDK update
2 parents e95b194 + 8a93c1d commit 6c34246

File tree

5 files changed

+15
-5
lines changed

5 files changed

+15
-5
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
/spec/fixtures/modules/*
2020
/tmp/
2121
/vendor/
22+
/.vendor/
2223
/convert_report.txt
2324
/update_report.txt
2425
.DS_Store

.pdkignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
/spec/fixtures/modules/*
2020
/tmp/
2121
/vendor/
22+
/.vendor/
2223
/convert_report.txt
2324
/update_report.txt
2425
.DS_Store

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,16 @@ All notable changes to this project will be documented in this file.
44

55
## main branch
66

7+
* Synced with [PDK][].
8+
9+
[PDK]: https://www.puppet.com/docs/pdk/latest/pdk.html
10+
711
## Release 1.2.8
812

13+
* Synced with [PDK][].
14+
15+
[PDK]: https://www.puppet.com/docs/pdk/latest/pdk.html
16+
917
## Release 1.2.7
1018

1119
### Security fix

Gemfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ group :development do
2020
gem "json", '= 2.6.1', require: false if Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
2121
gem "json", '= 2.6.3', require: false if Gem::Requirement.create(['>= 3.2.0', '< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
2222
gem "racc", '~> 1.4.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
23-
gem "deep_merge", '~> 1.0', require: false
23+
gem "deep_merge", '~> 1.2.2', require: false
2424
gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false
25-
gem "facterdb", '~> 1.26', require: false
25+
gem "facterdb", '~> 2.1', require: false
2626
gem "metadata-json-lint", '~> 4.0', require: false
27-
gem "rspec-puppet-facts", '~> 3.0', require: false
27+
gem "rspec-puppet-facts", '~> 4.0', require: false
2828
gem "dependency_checker", '~> 1.0.0', require: false
2929
gem "parallel_tests", '= 3.12.1', require: false
3030
gem "pry", '~> 0.10', require: false
@@ -38,7 +38,7 @@ group :development do
3838
end
3939
group :development, :release_prep do
4040
gem "puppet-strings", '~> 4.0', require: false
41-
gem "puppetlabs_spec_helper", '~> 7.3', require: false
41+
gem "puppetlabs_spec_helper", '~> 7.0', require: false
4242
end
4343
group :system_tests do
4444
gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw]

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,5 +85,5 @@
8585
],
8686
"pdk-version": "3.2.0",
8787
"template-url": "https://github.com/danielparks/pdk-templates#main",
88-
"template-ref": "heads/main-0-g32b6a5d"
88+
"template-ref": "heads/main-0-g49046f1"
8989
}

0 commit comments

Comments
 (0)