From e0e41bae58f831ea81e993ac0d95f4a8cd742faf Mon Sep 17 00:00:00 2001 From: Helen Campbell Date: Wed, 22 Aug 2018 14:57:06 +0100 Subject: [PATCH] pdksync_1.7.0-0-g57412ed --- .pdkignore | 24 ++++++++++++++++++++++++ .yardopts | 1 + Gemfile | 4 ++-- metadata.json | 4 ++-- spec/spec_helper.rb | 1 - 5 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 .pdkignore create mode 100644 .yardopts diff --git a/.pdkignore b/.pdkignore new file mode 100644 index 00000000..650022e5 --- /dev/null +++ b/.pdkignore @@ -0,0 +1,24 @@ +.git/ +.*.sw[op] +.metadata +.yardoc +.yardwarns +*.iml +/.bundle/ +/.idea/ +/.vagrant/ +/coverage/ +/bin/ +/doc/ +/Gemfile.local +/Gemfile.lock +/junit/ +/log/ +/pkg/ +/spec/fixtures/manifests/ +/spec/fixtures/modules/ +/tmp/ +/vendor/ +/convert_report.txt +/update_report.txt +.DS_Store diff --git a/.yardopts b/.yardopts new file mode 100644 index 00000000..29c933bc --- /dev/null +++ b/.yardopts @@ -0,0 +1 @@ +--markup markdown diff --git a/Gemfile b/Gemfile index db07cb09..d1932e62 100644 --- a/Gemfile +++ b/Gemfile @@ -35,8 +35,8 @@ group :development do gem "puppet-module-win-dev-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw] end group :system_tests do - gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby] - gem "puppet-module-win-system-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw] + gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby] + gem "puppet-module-win-system-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw] end puppet_version = ENV['PUPPET_GEM_VERSION'] diff --git a/metadata.json b/metadata.json index 10478c7c..9b3aa832 100644 --- a/metadata.json +++ b/metadata.json @@ -96,6 +96,6 @@ ], "description": "Uses a combination of keytool and Ruby openssl library to manage entries in a Java keystore.", "template-url": "https://github.com/puppetlabs/pdk-templates", - "template-ref": "heads/master-0-g91687c5", - "pdk-version": "1.5.0" + "template-ref": "1.7.0-0-g57412ed", + "pdk-version": "1.7.0" } diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index e69d11d8..5e721b7f 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,4 +1,3 @@ - require 'puppetlabs_spec_helper/module_spec_helper' require 'rspec-puppet-facts'