From a5dbea39bd91d3ab58e3ac8162748b4656fa1185 Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Tue, 12 Dec 2023 10:47:29 +0000
Subject: [PATCH 1/2] (CAT-1612) Revert removal of puppetlabs_spec_helper and
 puppet-strings from development gems

---
 config_defaults.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config_defaults.yml b/config_defaults.yml
index a6acd7b5..13cc4a84 100644
--- a/config_defaults.yml
+++ b/config_defaults.yml
@@ -515,6 +515,8 @@ Gemfile:
         version: '~> 1.18'
       - gem: 'metadata-json-lint'
         version: '~> 3.0'
+      - gem: 'puppetlabs_spec_helper'
+        version: '~> 7.0'
       - gem: 'rspec-puppet-facts'
         version: '~> 2.0'
       - gem: 'codecov'
@@ -535,6 +537,8 @@ Gemfile:
         version: '= 1.16.0'
       - gem: 'rubocop-rspec'
         version: '= 2.19.0'
+      - gem: 'puppet-strings'
+        version: '~> 4.0'
       - gem: 'rb-readline'
         version: '= 0.5.5'
         platforms:

From 955581333ae5917d1268c958c0cf70a64395ae81 Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Tue, 12 Dec 2023 13:31:49 +0000
Subject: [PATCH 2/2] (CAT-1612) Revert update of puppetlabs_spec_helper to ~>
 7.0

---
 config_defaults.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config_defaults.yml b/config_defaults.yml
index 13cc4a84..e746a379 100644
--- a/config_defaults.yml
+++ b/config_defaults.yml
@@ -516,7 +516,7 @@ Gemfile:
       - gem: 'metadata-json-lint'
         version: '~> 3.0'
       - gem: 'puppetlabs_spec_helper'
-        version: '~> 7.0'
+        version: '~> 6.0'
       - gem: 'rspec-puppet-facts'
         version: '~> 2.0'
       - gem: 'codecov'
@@ -558,7 +558,7 @@ Gemfile:
       - gem: 'puppet-strings'
         version: '~> 4.0'
       - gem: 'puppetlabs_spec_helper'
-        version: '~> 7.0'
+        version: '~> 6.0'
 spec/default_facts.yml:
   is_pe: false
   networking: