From bf90310b3ead5275ee304a23c1392e8c15701aa9 Mon Sep 17 00:00:00 2001
From: alex501212 <alexthepatterson@hotmail.com>
Date: Thu, 24 Oct 2024 10:00:22 +0100
Subject: [PATCH 1/6] updated rubygem-puppet to 8.10.0

---
 configs/components/rubygem-puppet.rb                | 4 ++--
 configs/projects/bolt-runtime.rb                    | 2 +-
 configs/projects/pe-bolt-server-runtime-2023.8.x.rb | 2 +-
 configs/projects/pe-bolt-server-runtime-main.rb     | 2 +-
 configs/projects/pe-installer-runtime-2023.8.x.rb   | 2 +-
 configs/projects/pe-installer-runtime-main.rb       | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/configs/components/rubygem-puppet.rb b/configs/components/rubygem-puppet.rb
index feae9798f..d1c3e6b6f 100644
--- a/configs/components/rubygem-puppet.rb
+++ b/configs/components/rubygem-puppet.rb
@@ -13,8 +13,8 @@
   #
   # Always use the generic version below
   case version
-  when '8.8.1'
-    pkg.md5sum '2f039fa86f8bd02e1258bca40dcc9b6b'
+  when '8.10.0'
+    pkg.md5sum '3d186db20ec581f6d6aef0b26b0e1275'
   when '7.32.1'
     pkg.md5sum 'e4e91fae76bb76d4e899b9cf7aafe365'
   when '6.28.0'
diff --git a/configs/projects/bolt-runtime.rb b/configs/projects/bolt-runtime.rb
index 6141ab4e1..25f9627bd 100644
--- a/configs/projects/bolt-runtime.rb
+++ b/configs/projects/bolt-runtime.rb
@@ -9,7 +9,7 @@
   proj.setting(:augeas_version, '1.14.1')
   # TODO: Can runtime projects use these updated versions?
   proj.setting(:rubygem_deep_merge_version, '1.2.2')
-  proj.setting(:rubygem_puppet_version, '8.8.1')
+  proj.setting(:rubygem_puppet_version, '8.10.0')
 
   platform = proj.get_platform
 
diff --git a/configs/projects/pe-bolt-server-runtime-2023.8.x.rb b/configs/projects/pe-bolt-server-runtime-2023.8.x.rb
index df183dcdf..5f593e3db 100644
--- a/configs/projects/pe-bolt-server-runtime-2023.8.x.rb
+++ b/configs/projects/pe-bolt-server-runtime-2023.8.x.rb
@@ -1,6 +1,6 @@
 project 'pe-bolt-server-runtime-2023.8.x' do |proj|
   proj.setting(:pe_version, '2023.8')
-  proj.setting(:rubygem_puppet_version, '8.8.1')
+  proj.setting(:rubygem_puppet_version, '8.10.0')
   # We build bolt server with the ruby installed in the puppet-agent dep. For ruby 2.7 we need to use a --no-document flag
   # for gem installs instead of --no-ri --no-rdoc. This setting allows us to use this while we support both ruby 2.5 and 2.7
   # Once we are no longer using ruby 2.5 we can update.
diff --git a/configs/projects/pe-bolt-server-runtime-main.rb b/configs/projects/pe-bolt-server-runtime-main.rb
index 813144a5d..1a774f157 100644
--- a/configs/projects/pe-bolt-server-runtime-main.rb
+++ b/configs/projects/pe-bolt-server-runtime-main.rb
@@ -1,6 +1,6 @@
 project 'pe-bolt-server-runtime-main' do |proj|
   proj.setting(:pe_version, 'main')
-  proj.setting(:rubygem_puppet_version, '8.8.1')
+  proj.setting(:rubygem_puppet_version, '8.10.0')
   # We build bolt server with the ruby installed in the puppet-agent dep. For ruby 2.7 we need to use a --no-document flag
   # for gem installs instead of --no-ri --no-rdoc. This setting allows us to use this while we support both ruby 2.5 and 2.7
   # Once we are no longer using ruby 2.5 we can update.
diff --git a/configs/projects/pe-installer-runtime-2023.8.x.rb b/configs/projects/pe-installer-runtime-2023.8.x.rb
index f0d8930a2..4c3d49dcc 100644
--- a/configs/projects/pe-installer-runtime-2023.8.x.rb
+++ b/configs/projects/pe-installer-runtime-2023.8.x.rb
@@ -8,6 +8,6 @@
 
   # rubygem-net-ssh included in shared-agent-components
   proj.setting(:rubygem_net_ssh_version, '7.2.3')
-  proj.setting(:rubygem_puppet_version, '8.8.1')
+  proj.setting(:rubygem_puppet_version, '8.10.0')
   instance_eval File.read(File.join(File.dirname(__FILE__), '_shared-pe-installer-runtime.rb'))
 end
\ No newline at end of file
diff --git a/configs/projects/pe-installer-runtime-main.rb b/configs/projects/pe-installer-runtime-main.rb
index f96fcdee1..09ea02ef8 100644
--- a/configs/projects/pe-installer-runtime-main.rb
+++ b/configs/projects/pe-installer-runtime-main.rb
@@ -8,6 +8,6 @@
 
   # rubygem-net-ssh included in shared-agent-components
   proj.setting(:rubygem_net_ssh_version, '7.2.3')
-  proj.setting(:rubygem_puppet_version, '8.8.1')
+  proj.setting(:rubygem_puppet_version, '8.10.0')
   instance_eval File.read(File.join(File.dirname(__FILE__), '_shared-pe-installer-runtime.rb'))
 end

From 3aa0a4cd1a27735dd272751b7fe84294fd4805d2 Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Mon, 28 Oct 2024 16:25:16 +0000
Subject: [PATCH 2/6] (CAT-2128) Remove json_pure dependency from the PDK
 runtime

This was originally added to ensure JSON would be available in all environments but should no longer necessary as JSON has been added as a default ruby gem.
---
 configs/components/rubygem-json_pure.rb | 6 ------
 configs/projects/_pdk-components.rb     | 1 -
 2 files changed, 7 deletions(-)
 delete mode 100644 configs/components/rubygem-json_pure.rb

diff --git a/configs/components/rubygem-json_pure.rb b/configs/components/rubygem-json_pure.rb
deleted file mode 100644
index edd1f514b..000000000
--- a/configs/components/rubygem-json_pure.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-component "rubygem-json_pure" do |pkg, settings, platform|
-  pkg.version "2.6.3"
-  pkg.sha256sum 'c39185aa41c04a1933b8d66d1294224743262ee6881adc7b5a488ab2ae19c74e'
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/projects/_pdk-components.rb b/configs/projects/_pdk-components.rb
index ffeb5346e..3f19ea66e 100644
--- a/configs/projects/_pdk-components.rb
+++ b/configs/projects/_pdk-components.rb
@@ -97,7 +97,6 @@
 
 # Other deps
 proj.component 'rubygem-deep_merge'
-proj.component 'rubygem-json_pure'
 proj.component 'rubygem-diff-lcs'
 proj.component 'rubygem-pathspec'
 proj.component 'rubygem-puppet_forge'

From 95a555a60107acc460245f71bbaf1f92b8eec7de Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Mon, 4 Nov 2024 16:59:11 +0000
Subject: [PATCH 3/6] (CAT-2123) Update version of `git` within the pdk-runtime
 to `2.47.0`

---
 configs/components/git.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configs/components/git.rb b/configs/components/git.rb
index e90014602..c55778d08 100644
--- a/configs/components/git.rb
+++ b/configs/components/git.rb
@@ -1,14 +1,14 @@
 component "git" do |pkg, settings, platform|
   if platform.is_windows?
-    pkg.version "2.31.0"
-    pkg.md5sum "0c3442bf598f096a4d19b904a0f99513"
+    pkg.version "2.47.0"
+    pkg.md5sum "e1312f449e17c9aac237e1ceeb50fad6"
 
     release = "1"
     pkg.url "https://github.com/git-for-windows/git/releases/download/v#{pkg.get_version.split('.')[0..2].join('.')}.windows.#{release}/MinGit-#{pkg.get_version}-64-bit.zip"
     pkg.mirror "#{settings[:buildsources_url]}/MinGit-#{pkg.get_version}-64-bit.zip"
   else
-    pkg.version "2.31.0"
-    pkg.md5sum "ddce35ac120406daf00ab6d0c119f50c"
+    pkg.version "2.47.0"
+    pkg.md5sum "a8c73e621c1c176e834cdfc4e794dd93"
     pkg.url "https://mirrors.edge.kernel.org/pub/software/scm/git/git-#{pkg.get_version}.tar.gz"
     pkg.mirror "#{settings[:buildsources_url]}/git-#{pkg.get_version}.tar.gz"
   end

From 0dbc553d472a39736868d30414f21ed3ab06f06b Mon Sep 17 00:00:00 2001
From: Alex Patterson <56118464+alex501212@users.noreply.github.com>
Date: Fri, 8 Nov 2024 09:12:32 +0000
Subject: [PATCH 4/6] Revert "Update rubygem-r10k to 4.1.0"

---
 configs/components/rubygem-r10k.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configs/components/rubygem-r10k.rb b/configs/components/rubygem-r10k.rb
index 3de2f8659..480041b2a 100644
--- a/configs/components/rubygem-r10k.rb
+++ b/configs/components/rubygem-r10k.rb
@@ -1,6 +1,6 @@
 component 'rubygem-r10k' do |pkg, settings, platform|
-  pkg.version '4.1.0'
-  pkg.sha256sum '64e5b9e1a6cbb4006c96477d8c34ce589fe1c278117311f452d9f30b9cc86e4c'
+  pkg.version '3.16.2'
+  pkg.sha256sum '9775a726ba94a543bf49952b10dcd23690a54f5d2a361746b78b1292abe32eb9'
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
 end

From b249b9a6594664e11d708d485a9230d63b05aa97 Mon Sep 17 00:00:00 2001
From: Alex Patterson <56118464+alex501212@users.noreply.github.com>
Date: Fri, 8 Nov 2024 09:45:52 +0000
Subject: [PATCH 5/6] Revert "Update rubygem-puppet to 8.10.0"

---
 configs/components/rubygem-puppet.rb                | 4 ++--
 configs/projects/bolt-runtime.rb                    | 2 +-
 configs/projects/pe-bolt-server-runtime-2023.8.x.rb | 2 +-
 configs/projects/pe-bolt-server-runtime-main.rb     | 2 +-
 configs/projects/pe-installer-runtime-2023.8.x.rb   | 2 +-
 configs/projects/pe-installer-runtime-main.rb       | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/configs/components/rubygem-puppet.rb b/configs/components/rubygem-puppet.rb
index d1c3e6b6f..feae9798f 100644
--- a/configs/components/rubygem-puppet.rb
+++ b/configs/components/rubygem-puppet.rb
@@ -13,8 +13,8 @@
   #
   # Always use the generic version below
   case version
-  when '8.10.0'
-    pkg.md5sum '3d186db20ec581f6d6aef0b26b0e1275'
+  when '8.8.1'
+    pkg.md5sum '2f039fa86f8bd02e1258bca40dcc9b6b'
   when '7.32.1'
     pkg.md5sum 'e4e91fae76bb76d4e899b9cf7aafe365'
   when '6.28.0'
diff --git a/configs/projects/bolt-runtime.rb b/configs/projects/bolt-runtime.rb
index 25f9627bd..6141ab4e1 100644
--- a/configs/projects/bolt-runtime.rb
+++ b/configs/projects/bolt-runtime.rb
@@ -9,7 +9,7 @@
   proj.setting(:augeas_version, '1.14.1')
   # TODO: Can runtime projects use these updated versions?
   proj.setting(:rubygem_deep_merge_version, '1.2.2')
-  proj.setting(:rubygem_puppet_version, '8.10.0')
+  proj.setting(:rubygem_puppet_version, '8.8.1')
 
   platform = proj.get_platform
 
diff --git a/configs/projects/pe-bolt-server-runtime-2023.8.x.rb b/configs/projects/pe-bolt-server-runtime-2023.8.x.rb
index 5f593e3db..df183dcdf 100644
--- a/configs/projects/pe-bolt-server-runtime-2023.8.x.rb
+++ b/configs/projects/pe-bolt-server-runtime-2023.8.x.rb
@@ -1,6 +1,6 @@
 project 'pe-bolt-server-runtime-2023.8.x' do |proj|
   proj.setting(:pe_version, '2023.8')
-  proj.setting(:rubygem_puppet_version, '8.10.0')
+  proj.setting(:rubygem_puppet_version, '8.8.1')
   # We build bolt server with the ruby installed in the puppet-agent dep. For ruby 2.7 we need to use a --no-document flag
   # for gem installs instead of --no-ri --no-rdoc. This setting allows us to use this while we support both ruby 2.5 and 2.7
   # Once we are no longer using ruby 2.5 we can update.
diff --git a/configs/projects/pe-bolt-server-runtime-main.rb b/configs/projects/pe-bolt-server-runtime-main.rb
index 1a774f157..813144a5d 100644
--- a/configs/projects/pe-bolt-server-runtime-main.rb
+++ b/configs/projects/pe-bolt-server-runtime-main.rb
@@ -1,6 +1,6 @@
 project 'pe-bolt-server-runtime-main' do |proj|
   proj.setting(:pe_version, 'main')
-  proj.setting(:rubygem_puppet_version, '8.10.0')
+  proj.setting(:rubygem_puppet_version, '8.8.1')
   # We build bolt server with the ruby installed in the puppet-agent dep. For ruby 2.7 we need to use a --no-document flag
   # for gem installs instead of --no-ri --no-rdoc. This setting allows us to use this while we support both ruby 2.5 and 2.7
   # Once we are no longer using ruby 2.5 we can update.
diff --git a/configs/projects/pe-installer-runtime-2023.8.x.rb b/configs/projects/pe-installer-runtime-2023.8.x.rb
index 4c3d49dcc..f0d8930a2 100644
--- a/configs/projects/pe-installer-runtime-2023.8.x.rb
+++ b/configs/projects/pe-installer-runtime-2023.8.x.rb
@@ -8,6 +8,6 @@
 
   # rubygem-net-ssh included in shared-agent-components
   proj.setting(:rubygem_net_ssh_version, '7.2.3')
-  proj.setting(:rubygem_puppet_version, '8.10.0')
+  proj.setting(:rubygem_puppet_version, '8.8.1')
   instance_eval File.read(File.join(File.dirname(__FILE__), '_shared-pe-installer-runtime.rb'))
 end
\ No newline at end of file
diff --git a/configs/projects/pe-installer-runtime-main.rb b/configs/projects/pe-installer-runtime-main.rb
index 09ea02ef8..f96fcdee1 100644
--- a/configs/projects/pe-installer-runtime-main.rb
+++ b/configs/projects/pe-installer-runtime-main.rb
@@ -8,6 +8,6 @@
 
   # rubygem-net-ssh included in shared-agent-components
   proj.setting(:rubygem_net_ssh_version, '7.2.3')
-  proj.setting(:rubygem_puppet_version, '8.10.0')
+  proj.setting(:rubygem_puppet_version, '8.8.1')
   instance_eval File.read(File.join(File.dirname(__FILE__), '_shared-pe-installer-runtime.rb'))
 end

From 0c84a076f468d1de3a496cbf9d962d9edf4c025c Mon Sep 17 00:00:00 2001
From: alex501212 <alexthepatterson@hotmail.com>
Date: Mon, 11 Nov 2024 18:11:13 +0000
Subject: [PATCH 6/6] update puppet to 8.10.0

---
 configs/components/rubygem-puppet.rb                | 4 ++--
 configs/projects/bolt-runtime.rb                    | 2 +-
 configs/projects/pe-bolt-server-runtime-2023.8.x.rb | 2 +-
 configs/projects/pe-bolt-server-runtime-main.rb     | 2 +-
 configs/projects/pe-installer-runtime-2023.8.x.rb   | 2 +-
 configs/projects/pe-installer-runtime-main.rb       | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/configs/components/rubygem-puppet.rb b/configs/components/rubygem-puppet.rb
index feae9798f..d1c3e6b6f 100644
--- a/configs/components/rubygem-puppet.rb
+++ b/configs/components/rubygem-puppet.rb
@@ -13,8 +13,8 @@
   #
   # Always use the generic version below
   case version
-  when '8.8.1'
-    pkg.md5sum '2f039fa86f8bd02e1258bca40dcc9b6b'
+  when '8.10.0'
+    pkg.md5sum '3d186db20ec581f6d6aef0b26b0e1275'
   when '7.32.1'
     pkg.md5sum 'e4e91fae76bb76d4e899b9cf7aafe365'
   when '6.28.0'
diff --git a/configs/projects/bolt-runtime.rb b/configs/projects/bolt-runtime.rb
index 6141ab4e1..25f9627bd 100644
--- a/configs/projects/bolt-runtime.rb
+++ b/configs/projects/bolt-runtime.rb
@@ -9,7 +9,7 @@
   proj.setting(:augeas_version, '1.14.1')
   # TODO: Can runtime projects use these updated versions?
   proj.setting(:rubygem_deep_merge_version, '1.2.2')
-  proj.setting(:rubygem_puppet_version, '8.8.1')
+  proj.setting(:rubygem_puppet_version, '8.10.0')
 
   platform = proj.get_platform
 
diff --git a/configs/projects/pe-bolt-server-runtime-2023.8.x.rb b/configs/projects/pe-bolt-server-runtime-2023.8.x.rb
index df183dcdf..5f593e3db 100644
--- a/configs/projects/pe-bolt-server-runtime-2023.8.x.rb
+++ b/configs/projects/pe-bolt-server-runtime-2023.8.x.rb
@@ -1,6 +1,6 @@
 project 'pe-bolt-server-runtime-2023.8.x' do |proj|
   proj.setting(:pe_version, '2023.8')
-  proj.setting(:rubygem_puppet_version, '8.8.1')
+  proj.setting(:rubygem_puppet_version, '8.10.0')
   # We build bolt server with the ruby installed in the puppet-agent dep. For ruby 2.7 we need to use a --no-document flag
   # for gem installs instead of --no-ri --no-rdoc. This setting allows us to use this while we support both ruby 2.5 and 2.7
   # Once we are no longer using ruby 2.5 we can update.
diff --git a/configs/projects/pe-bolt-server-runtime-main.rb b/configs/projects/pe-bolt-server-runtime-main.rb
index 813144a5d..1a774f157 100644
--- a/configs/projects/pe-bolt-server-runtime-main.rb
+++ b/configs/projects/pe-bolt-server-runtime-main.rb
@@ -1,6 +1,6 @@
 project 'pe-bolt-server-runtime-main' do |proj|
   proj.setting(:pe_version, 'main')
-  proj.setting(:rubygem_puppet_version, '8.8.1')
+  proj.setting(:rubygem_puppet_version, '8.10.0')
   # We build bolt server with the ruby installed in the puppet-agent dep. For ruby 2.7 we need to use a --no-document flag
   # for gem installs instead of --no-ri --no-rdoc. This setting allows us to use this while we support both ruby 2.5 and 2.7
   # Once we are no longer using ruby 2.5 we can update.
diff --git a/configs/projects/pe-installer-runtime-2023.8.x.rb b/configs/projects/pe-installer-runtime-2023.8.x.rb
index f0d8930a2..4c3d49dcc 100644
--- a/configs/projects/pe-installer-runtime-2023.8.x.rb
+++ b/configs/projects/pe-installer-runtime-2023.8.x.rb
@@ -8,6 +8,6 @@
 
   # rubygem-net-ssh included in shared-agent-components
   proj.setting(:rubygem_net_ssh_version, '7.2.3')
-  proj.setting(:rubygem_puppet_version, '8.8.1')
+  proj.setting(:rubygem_puppet_version, '8.10.0')
   instance_eval File.read(File.join(File.dirname(__FILE__), '_shared-pe-installer-runtime.rb'))
 end
\ No newline at end of file
diff --git a/configs/projects/pe-installer-runtime-main.rb b/configs/projects/pe-installer-runtime-main.rb
index f96fcdee1..09ea02ef8 100644
--- a/configs/projects/pe-installer-runtime-main.rb
+++ b/configs/projects/pe-installer-runtime-main.rb
@@ -8,6 +8,6 @@
 
   # rubygem-net-ssh included in shared-agent-components
   proj.setting(:rubygem_net_ssh_version, '7.2.3')
-  proj.setting(:rubygem_puppet_version, '8.8.1')
+  proj.setting(:rubygem_puppet_version, '8.10.0')
   instance_eval File.read(File.join(File.dirname(__FILE__), '_shared-pe-installer-runtime.rb'))
 end