Merge branch 'main' into CAT-1256-Roll_out_new_puppet_lint_gem

Author: GSPatton

README.md

@@ -485,3 +485,7 @@ Rationale
 * mocha is an additional dependency to carry.
 
 EOF
+
+## License
+
+This codebase is licensed under Apache 2.0. However, the open source dependencies included in this codebase might be subject to other software licenses such as AGPL, GPL2.0, and MIT.

puppetlabs_spec_helper.gemspec

@@ -31,9 +31,9 @@ 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 '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