From 0feaf8ea2be7e75c9e7bafcbc5f1284a1a8369d5 Mon Sep 17 00:00:00 2001 From: jordanbreen28 Date: Wed, 22 Nov 2023 14:19:43 +0000 Subject: [PATCH 1/2] Revert "(CAT-1222) - Require puppetlabs-rspec-puppet over rspec-puppet" This reverts commit 1f6c13e7e2e29bc8414ba78d2bf945fda6c0661c. --- puppetlabs_spec_helper.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/puppetlabs_spec_helper.gemspec b/puppetlabs_spec_helper.gemspec index 2ec15e87..6b795fbf 100644 --- a/puppetlabs_spec_helper.gemspec +++ b/puppetlabs_spec_helper.gemspec @@ -31,7 +31,7 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency 'mocha', '~> 1.0' spec.add_runtime_dependency 'pathspec', '>= 0.2', '< 2.0.0' spec.add_runtime_dependency 'puppetlabs-puppet-lint', '~> 5.0' - spec.add_runtime_dependency 'puppetlabs-rspec-puppet', '~> 5.0' + spec.add_runtime_dependency 'rspec-puppet', '~> 4.0' spec.add_runtime_dependency 'puppet-syntax', '~> 3.0' spec.add_runtime_dependency 'rspec-github', '~> 2.0' From eb7d4449a6a5d46c613477c1efceb9109bee6ca7 Mon Sep 17 00:00:00 2001 From: jordanbreen28 Date: Wed, 22 Nov 2023 14:20:40 +0000 Subject: [PATCH 2/2] Revert "(CAT-1256) Roll out new puppet-lint gem" This reverts commit fb7acc3f66fc9292b40612f8f8e75059d978781f. --- puppetlabs_spec_helper.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/puppetlabs_spec_helper.gemspec b/puppetlabs_spec_helper.gemspec index 6b795fbf..16085998 100644 --- a/puppetlabs_spec_helper.gemspec +++ b/puppetlabs_spec_helper.gemspec @@ -30,10 +30,10 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency 'mocha', '~> 1.0' spec.add_runtime_dependency 'pathspec', '>= 0.2', '< 2.0.0' - spec.add_runtime_dependency 'puppetlabs-puppet-lint', '~> 5.0' - spec.add_runtime_dependency 'rspec-puppet', '~> 4.0' + spec.add_runtime_dependency 'puppet-lint', '~> 4.0' spec.add_runtime_dependency 'puppet-syntax', '~> 3.0' spec.add_runtime_dependency 'rspec-github', '~> 2.0' + spec.add_runtime_dependency 'rspec-puppet', '~> 4.0' spec.requirements << 'puppet, >= 7.0.0' end