From 4e751f59e57d97d9142a45c84a0a4383abeff5b0 Mon Sep 17 00:00:00 2001
From: donoghuc <cas.donoghue@gmail.com>
Date: Fri, 12 Apr 2024 12:21:36 -0700
Subject: [PATCH] (PE-38079) Gem updates to prepare for upcomming pe release

This commit updates runtimes that package up bolt with latest gem dependencies. This includes bolt packages, bolt/ace server, and installer packages.
---
 configs/components/rubygem-CFPropertyList.rb         |  4 ++--
 configs/components/rubygem-addressable.rb            |  4 ++--
 configs/components/rubygem-aws-eventstream.rb        |  4 ++--
 configs/components/rubygem-aws-partitions.rb         |  4 ++--
 configs/components/rubygem-aws-sdk-core.rb           |  4 ++--
 configs/components/rubygem-aws-sdk-ec2.rb            |  4 ++--
 configs/components/rubygem-aws-sigv4.rb              |  4 ++--
 configs/components/rubygem-base64.rb                 |  6 ++++++
 configs/components/rubygem-bindata.rb                |  4 ++--
 configs/components/rubygem-concurrent-ruby.rb        |  6 +++---
 configs/components/rubygem-diff-lcs.rb               |  4 ++--
 configs/components/rubygem-facter.rb                 |  4 ++--
 configs/components/rubygem-ffi.rb                    | 10 +++++-----
 configs/components/rubygem-gettext.rb                |  6 +++---
 configs/components/rubygem-json-schema.rb            |  4 ++--
 configs/components/rubygem-jwt.rb                    |  4 ++--
 configs/components/rubygem-locale.rb                 |  4 ++--
 configs/components/rubygem-multipart-post.rb         |  4 ++--
 configs/components/rubygem-net-ssh.rb                |  4 ++--
 configs/components/rubygem-nkf.rb                    |  6 ++++++
 configs/components/rubygem-optimist.rb               |  4 ++--
 configs/components/rubygem-public_suffix.rb          |  4 ++--
 configs/components/rubygem-puppet-strings.rb         |  6 +++---
 configs/components/rubygem-puppet.rb                 | 12 ++++--------
 configs/components/rubygem-puppetfile-resolver.rb    |  4 ++--
 configs/components/rubygem-semantic_puppet.rb        |  6 +++---
 configs/components/rubygem-yard.rb                   |  4 ++--
 configs/projects/_shared-pe-bolt-server.rb           |  4 +++-
 configs/projects/_shared-pe-bolt-server_with_ruby.rb |  2 +-
 configs/projects/_shared-pe-installer-runtime.rb     |  2 ++
 configs/projects/bolt-runtime.rb                     |  4 +++-
 configs/projects/pe-bolt-server-runtime-2021.7.x.rb  |  2 +-
 configs/projects/pe-bolt-server-runtime-main.rb      |  3 +--
 configs/projects/pe-installer-runtime-2021.7.x.rb    |  4 ++--
 configs/projects/pe-installer-runtime-main.rb        |  4 ++--
 35 files changed, 86 insertions(+), 73 deletions(-)
 create mode 100644 configs/components/rubygem-base64.rb
 create mode 100644 configs/components/rubygem-nkf.rb

diff --git a/configs/components/rubygem-CFPropertyList.rb b/configs/components/rubygem-CFPropertyList.rb
index 553b8bd1b..b53f88050 100644
--- a/configs/components/rubygem-CFPropertyList.rb
+++ b/configs/components/rubygem-CFPropertyList.rb
@@ -1,7 +1,7 @@
 component 'rubygem-CFPropertyList' do |pkg, settings, platform|
   if settings[:ruby_version].to_f >= 3.2
-    pkg.version '3.0.6'
-    pkg.md5sum 'a10c1a40d093160f7264c0985b89881d'
+    pkg.version '3.0.7'
+    pkg.md5sum 'ed89ce5e7074a6f8e8b8e744eaf014d0'
   else
     pkg.version '2.3.6'
     pkg.md5sum 'ae4086185992f293ffab1641b83286a5'
diff --git a/configs/components/rubygem-addressable.rb b/configs/components/rubygem-addressable.rb
index 1205f6264..c6e110f33 100644
--- a/configs/components/rubygem-addressable.rb
+++ b/configs/components/rubygem-addressable.rb
@@ -1,6 +1,6 @@
 component "rubygem-addressable" do |pkg, settings, platform|
-  pkg.version "2.8.5"
-  pkg.sha256sum "63f0fbcde42edf116d6da98a9437f19dd1692152f1efa3fcc4741e443c772117"
+  pkg.version "2.8.6"
+  pkg.sha256sum "798f6af3556641a7619bad1dce04cdb6eb44b0216a991b0396ea7339276f2b47"
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
 end
diff --git a/configs/components/rubygem-aws-eventstream.rb b/configs/components/rubygem-aws-eventstream.rb
index 1adce8077..bc1674674 100644
--- a/configs/components/rubygem-aws-eventstream.rb
+++ b/configs/components/rubygem-aws-eventstream.rb
@@ -1,6 +1,6 @@
 component "rubygem-aws-eventstream" do |pkg, settings, platform|
-  pkg.version "1.2.0"
-  pkg.md5sum "47689acbf31e71cd5fb3877cce3d9d58"
+  pkg.version "1.3.0"
+  pkg.md5sum "e50f43c1f2d7805bbeaa155c6b52e033"
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
 end
diff --git a/configs/components/rubygem-aws-partitions.rb b/configs/components/rubygem-aws-partitions.rb
index a873deb21..b27defda2 100644
--- a/configs/components/rubygem-aws-partitions.rb
+++ b/configs/components/rubygem-aws-partitions.rb
@@ -1,6 +1,6 @@
 component "rubygem-aws-partitions" do |pkg, settings, platform|
-  pkg.version "1.831.0"
-  pkg.md5sum "9a25c0714eb323e8b2f8b77ac1b86b0c"
+  pkg.version "1.913.0"
+  pkg.md5sum "6231fd992c84e56941488776aa0be8b5"
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
 end
diff --git a/configs/components/rubygem-aws-sdk-core.rb b/configs/components/rubygem-aws-sdk-core.rb
index ce954a7a4..4157c3113 100644
--- a/configs/components/rubygem-aws-sdk-core.rb
+++ b/configs/components/rubygem-aws-sdk-core.rb
@@ -1,6 +1,6 @@
 component "rubygem-aws-sdk-core" do |pkg, settings, platform|
-  pkg.version "3.185.0"
-  pkg.md5sum "834895779a8bc78112f26492688c8295"
+  pkg.version "3.191.6"
+  pkg.md5sum "cdce9ffd297496550ec650fe7c0f0c0e"
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
 end
diff --git a/configs/components/rubygem-aws-sdk-ec2.rb b/configs/components/rubygem-aws-sdk-ec2.rb
index 494158f71..e62b1ffa5 100644
--- a/configs/components/rubygem-aws-sdk-ec2.rb
+++ b/configs/components/rubygem-aws-sdk-ec2.rb
@@ -1,6 +1,6 @@
 component "rubygem-aws-sdk-ec2" do |pkg, settings, platform|
-  pkg.version "1.411.0"
-  pkg.md5sum "1f915f9bb6344d054a29c17478789460"
+  pkg.version "1.448.0"
+  pkg.md5sum "79f7f0f2fd051cedda210399d45590c6"
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
 end
diff --git a/configs/components/rubygem-aws-sigv4.rb b/configs/components/rubygem-aws-sigv4.rb
index b3655a148..a4283a923 100644
--- a/configs/components/rubygem-aws-sigv4.rb
+++ b/configs/components/rubygem-aws-sigv4.rb
@@ -1,6 +1,6 @@
 component "rubygem-aws-sigv4" do |pkg, settings, platform|
-  pkg.version "1.6.0"
-  pkg.md5sum "a5a45f14886bbdcff038262a80dc4c75"
+  pkg.version "1.8.0"
+  pkg.md5sum "586f3e0e914c67bae0b8793e64347c03"
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
 end
diff --git a/configs/components/rubygem-base64.rb b/configs/components/rubygem-base64.rb
new file mode 100644
index 000000000..b0471dda8
--- /dev/null
+++ b/configs/components/rubygem-base64.rb
@@ -0,0 +1,6 @@
+component 'rubygem-bas64' do |pkg, settings, platform|
+  pkg.version '0.2.0'
+  pkg.md5sum 'fe02f4347a5846f79f4d4615edababd3'
+
+  instance_eval File.read('configs/components/_base-rubygem.rb')
+end
diff --git a/configs/components/rubygem-bindata.rb b/configs/components/rubygem-bindata.rb
index 4c20c6ccd..922dbd8ec 100644
--- a/configs/components/rubygem-bindata.rb
+++ b/configs/components/rubygem-bindata.rb
@@ -1,6 +1,6 @@
 component 'rubygem-bindata' do |pkg, settings, platform|
-  pkg.version '2.4.15'
-  pkg.md5sum '55ccdea22d70273b136e573dba9b97cf'
+  pkg.version '2.5.0'
+  pkg.md5sum 'c893016c3b689893b033e12536faeeab'
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
 end
diff --git a/configs/components/rubygem-concurrent-ruby.rb b/configs/components/rubygem-concurrent-ruby.rb
index e11d5c480..259900bc5 100644
--- a/configs/components/rubygem-concurrent-ruby.rb
+++ b/configs/components/rubygem-concurrent-ruby.rb
@@ -1,11 +1,11 @@
 component 'rubygem-concurrent-ruby' do |pkg, settings, platform|
   # Projects may define a :rubygem_concurrent_ruby_version setting
-  version = settings[:rubygem_concurrent_ruby_version] || '1.2.2'
+  version = settings[:rubygem_concurrent_ruby_version] || '1.2.3'
   pkg.version version
 
   case version
-  when '1.2.2'
-    pkg.sha256sum '3879119b8b75e3b62616acc256c64a134d0b0a7a9a3fcba5a233025bcde22c4f'
+  when '1.2.3'
+    pkg.sha256sum '82fdd3f8a0816e28d513e637bb2b90a45d7b982bdf4f3a0511722d2e495801e2'
   else
     raise "rubygem-concurrent-ruby #{version} has not been configured; Cannot continue."
   end
diff --git a/configs/components/rubygem-diff-lcs.rb b/configs/components/rubygem-diff-lcs.rb
index 3bbe18dab..0bce832e1 100644
--- a/configs/components/rubygem-diff-lcs.rb
+++ b/configs/components/rubygem-diff-lcs.rb
@@ -1,6 +1,6 @@
 component "rubygem-diff-lcs" do |pkg, settings, platform|
-  pkg.version "1.5.0"
-  pkg.sha256sum "49b934001c8c6aedb37ba19daec5c634da27b318a7a3c654ae979d6ba1929b67"
+  pkg.version "1.5.1"
+  pkg.sha256sum "273223dfb40685548436d32b4733aa67351769c7dea621da7d9dd4813e63ddfe"
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
 end
diff --git a/configs/components/rubygem-facter.rb b/configs/components/rubygem-facter.rb
index 2d7683955..6b6ba4449 100644
--- a/configs/components/rubygem-facter.rb
+++ b/configs/components/rubygem-facter.rb
@@ -1,6 +1,6 @@
 component 'rubygem-facter' do |pkg, settings, platform|
-  pkg.version '4.5.0'
-  pkg.md5sum 'b10500668a69db77ddb65907be2bd908'
+  pkg.version '4.7.0'
+  pkg.md5sum 'b77bcd4ed8ebf713717a89014b835830'
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
 end
\ No newline at end of file
diff --git a/configs/components/rubygem-ffi.rb b/configs/components/rubygem-ffi.rb
index 38a1e8d0d..fa7cbc709 100644
--- a/configs/components/rubygem-ffi.rb
+++ b/configs/components/rubygem-ffi.rb
@@ -11,8 +11,8 @@
     pkg.version '1.13.1'
     pkg.sha256sum '4e15f52ee45af7c5674d656041855448adbb5022618be252cd602d81b8e2978a'
   else
-    pkg.version '1.15.5'
-    pkg.sha256sum '6f2ed2fa68047962d6072b964420cba91d82ce6fa8ee251950c17fca6af3c2a0'
+    pkg.version '1.16.3'
+    pkg.sha256sum '6d3242ff10c87271b0675c58d68d3f10148fabc2ad6da52a18123f06078871fb'
   end
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
@@ -59,7 +59,7 @@
       case pkg.get_version
       when '1.9.25'
         pkg.sha256sum '5473ac958b78f271f53e9a88197c35cd3e990fbe625d21e525c56d62ae3750da'
-      when '1.15.5'
+      when '1.16.3'
         pkg.sha256sum '9acc4e474bef25dbcf827b1e6fce4067e9a1eff74a0296d25f0af392fafcd096'
       end
 
@@ -70,8 +70,8 @@
       case pkg.get_version
       when '1.9.25'
         pkg.sha256sum '43d357732a6a0e3e41dc7e28a9c9c5112ac66f4a6ed9e1de40afba9ffcb836c1'
-      when '1.15.5'
-        pkg.sha256sum '6e52c39fdbbccc085ae05d489d1b835ce05dcdf2a4c88ba739e3b42afd2b5404'
+      when '1.16.3'
+        pkg.sha256sum 'ee49ccfa125f84a2f2053a0e6dd8433a34233479e026513ecbf06798ba542fe6'
       end
 
       pkg.url "https://rubygems.org/downloads/ffi-#{pkg.get_version}-x86-mingw32.gem"
diff --git a/configs/components/rubygem-gettext.rb b/configs/components/rubygem-gettext.rb
index a8cc02753..d12962fe9 100644
--- a/configs/components/rubygem-gettext.rb
+++ b/configs/components/rubygem-gettext.rb
@@ -1,10 +1,10 @@
 component "rubygem-gettext" do |pkg, settings, platform|
-  version = settings[:rubygem_gettext_version] || '3.4.3'
+  version = settings[:rubygem_gettext_version] || '3.4.9'
   pkg.version version
 
   case version
-  when '3.4.3'
-    pkg.sha256sum '1b98e1272d0f55a56f519ee86d24e0fcd114b94c9d10b26e72512d65f9174251'
+  when '3.4.9'
+    pkg.sha256sum '292864fe6a15c224cee4125a4a72fab426fdbb280e4cff3cfe44935f549b009a'
   when '3.2.2'
     pkg.sha256sum '9d250bb79273efb4a268977f219d2daca05cdc7473eff40288b8ab8ddd0f51b4'
   else
diff --git a/configs/components/rubygem-json-schema.rb b/configs/components/rubygem-json-schema.rb
index 175a078b5..1082650f4 100644
--- a/configs/components/rubygem-json-schema.rb
+++ b/configs/components/rubygem-json-schema.rb
@@ -1,6 +1,6 @@
 component "rubygem-json-schema" do |pkg, settings, platform|
-  pkg.version "4.1.1"
-  pkg.sha256sum "89a8399745a710c2c7be3ff9564f67a0ae982c82f7590a95ab9cebe374fa2d49"
+  pkg.version "4.3.1"
+  pkg.sha256sum "ac35bfabf99eea2b8b45fbccbb714b399fbe7824c621fc985048a9c2e45d58d2"
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
 end
diff --git a/configs/components/rubygem-jwt.rb b/configs/components/rubygem-jwt.rb
index 1296d80c2..574e9406b 100644
--- a/configs/components/rubygem-jwt.rb
+++ b/configs/components/rubygem-jwt.rb
@@ -1,6 +1,6 @@
 component "rubygem-jwt" do |pkg, settings, platform|
-  pkg.version "2.2.3"
-  pkg.md5sum "a25cbd9b40f8da7a40faad7a26b8153c"
+  pkg.version "2.7.1"
+  pkg.md5sum "d3a7ba14444b03f91c7d36b61519fe17"
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
 end
diff --git a/configs/components/rubygem-locale.rb b/configs/components/rubygem-locale.rb
index e009c5e14..009b6b7ed 100644
--- a/configs/components/rubygem-locale.rb
+++ b/configs/components/rubygem-locale.rb
@@ -1,6 +1,6 @@
 component "rubygem-locale" do |pkg, settings, platform|
-  pkg.version "2.1.3"
-  pkg.md5sum "f5bef9eed8e8c40417a3ab68fa34f477"
+  pkg.version "2.1.4"
+  pkg.md5sum "c324a7f34b94044f8d38eabff159de62"
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
 
diff --git a/configs/components/rubygem-multipart-post.rb b/configs/components/rubygem-multipart-post.rb
index 49f1a34e3..37e4d8e58 100644
--- a/configs/components/rubygem-multipart-post.rb
+++ b/configs/components/rubygem-multipart-post.rb
@@ -1,6 +1,6 @@
 component 'rubygem-multipart-post' do |pkg, settings, platform|
-  pkg.version '2.3.0'
-  pkg.md5sum '067cd7270a1f476ce71454d499213671'
+  pkg.version '2.4.0'
+  pkg.md5sum '626fd8b3f8cd080c1eccfa0e25d7bfed'
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
 end
diff --git a/configs/components/rubygem-net-ssh.rb b/configs/components/rubygem-net-ssh.rb
index af713d5be..de6ce0301 100644
--- a/configs/components/rubygem-net-ssh.rb
+++ b/configs/components/rubygem-net-ssh.rb
@@ -4,8 +4,8 @@
   pkg.version version
 
   case version
-  when "7.0.1"
-    pkg.md5sum "2ac500ae0a9c578b64d8c3a4bff741c0"
+  when "7.2.3"
+    pkg.md5sum "be25f70538cb8dcde68d924f001d75df"
   when "6.1.0"
     pkg.md5sum "383afadb1bd66a458a5d8d2d60736b3d"
   when "5.2.0"
diff --git a/configs/components/rubygem-nkf.rb b/configs/components/rubygem-nkf.rb
new file mode 100644
index 000000000..5f721f361
--- /dev/null
+++ b/configs/components/rubygem-nkf.rb
@@ -0,0 +1,6 @@
+component 'rubygem-nkf' do |pkg, settings, platform|
+  pkg.version '0.2.0'
+  pkg.md5sum '7a0af896fa45703c594cf0535096a8ed'
+
+  instance_eval File.read('configs/components/_base-rubygem.rb')
+end
diff --git a/configs/components/rubygem-optimist.rb b/configs/components/rubygem-optimist.rb
index 3a89e19d5..c1af6cafa 100644
--- a/configs/components/rubygem-optimist.rb
+++ b/configs/components/rubygem-optimist.rb
@@ -1,6 +1,6 @@
 component 'rubygem-optimist' do |pkg, settings, _platform|
-  pkg.version '3.0.1'
-  pkg.md5sum 'ce7ee8dac7e34793756680c2af9a8ee9'
+  pkg.version '3.1.0'
+  pkg.md5sum 'bd9b5fc3bfba641766817760cc8b58e9'
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
 
diff --git a/configs/components/rubygem-public_suffix.rb b/configs/components/rubygem-public_suffix.rb
index e4f838354..77f1df0bf 100644
--- a/configs/components/rubygem-public_suffix.rb
+++ b/configs/components/rubygem-public_suffix.rb
@@ -1,6 +1,6 @@
 component 'rubygem-public_suffix' do |pkg, _settings, _platform|
-  pkg.version '5.0.1'
-  pkg.md5sum '504e45c1f5f7b629e46e4deef7d0f46f'
+  pkg.version '5.0.5'
+  pkg.md5sum '1e6879068c1bc976a0ba890a4b11b24d'
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
 end
diff --git a/configs/components/rubygem-puppet-strings.rb b/configs/components/rubygem-puppet-strings.rb
index 79ca0da91..ab8dfc76e 100644
--- a/configs/components/rubygem-puppet-strings.rb
+++ b/configs/components/rubygem-puppet-strings.rb
@@ -2,14 +2,14 @@
   # 2021.7.x LTS has a jruby that does not work with puppet-strings
   # version 4.y. The 4 series requires ruby >= 2.7
   # Default to 4.x sereies but allow it to be configuratble by project.
-  version = settings[:rubygem_puppet_strings_version] || '4.1.0'
+  version = settings[:rubygem_puppet_strings_version] || '4.1.2'
   pkg.version(version)
 
   case version
   when '3.0.1'
     pkg.md5sum '7c9a8936509a0434c39975a75197472c'
-  when '4.1.0'
-    pkg.md5sum 'd8259d8a9144757f4e78f118b59e2681'
+  when '4.1.2'
+    pkg.md5sum 'e19f3fdc60692df346d1a348ab9facee'
   else
     raise "Invalid version #{version} for rubygem-puppet-strings; Cannot continue."
   end
diff --git a/configs/components/rubygem-puppet.rb b/configs/components/rubygem-puppet.rb
index 90cd2933f..28882f13b 100644
--- a/configs/components/rubygem-puppet.rb
+++ b/configs/components/rubygem-puppet.rb
@@ -13,14 +13,10 @@
   #
   # Always use the generic version below
   case version
-  when '8.3.1'
-    pkg.md5sum '9cff495eff59639fce989dceeff34560'
-  when '8.0.1'
-    pkg.md5sum '7e87d988e485c0f0c3d6ef76bd39409d'
-  when '7.27.0'
-    pkg.md5sum '6a49f375dffe5f786ed474b3eaaaf931'
-  when '7.26.0'
-    pkg.md5sum '347ec39281f59232be5cbb47daf9b539'
+  when '8.6.0'
+    pkg.md5sum '5ac831a42a5fbaef9c6e320c64bbcbd5'
+  when '7.30.0'
+    pkg.md5sum '1b36ae786efdf3c91edf60f60af54af7'
   when '6.28.0'
     pkg.md5sum '31520d986869f9362c88c7d6a4a5c103'
   else
diff --git a/configs/components/rubygem-puppetfile-resolver.rb b/configs/components/rubygem-puppetfile-resolver.rb
index 7a5f9e05c..d1ce52aed 100644
--- a/configs/components/rubygem-puppetfile-resolver.rb
+++ b/configs/components/rubygem-puppetfile-resolver.rb
@@ -1,6 +1,6 @@
 component "rubygem-puppetfile-resolver" do |pkg, settings, platform|
-  pkg.version "0.6.2"
-  pkg.md5sum "e0b40ef4258d32d6d47857b1eb4a5acf"
+  pkg.version "0.6.3"
+  pkg.md5sum "8377387749cf0fcfcfd9f8c0c6baaf0c"
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
 end
diff --git a/configs/components/rubygem-semantic_puppet.rb b/configs/components/rubygem-semantic_puppet.rb
index 08d54ca66..bc7e891fe 100644
--- a/configs/components/rubygem-semantic_puppet.rb
+++ b/configs/components/rubygem-semantic_puppet.rb
@@ -1,13 +1,13 @@
 component "rubygem-semantic_puppet" do |pkg, settings, platform|
   # Projects may define a :rubygem_semantic_puppet_version setting, or we use 1.0.4 by default
-  version = settings[:rubygem_semantic_puppet_version] || '1.0.4'
+  version = settings[:rubygem_semantic_puppet_version] || '1.1.0'
   pkg.version version
 
   case version
   when '0.1.2'
     pkg.md5sum '192ae7729997cb5d5364f64b99b13121'
-  when '1.0.4'
-    pkg.sha256sum "5d8380bf733c1552ef77e06a7c44a6d5b48def7d390ecf3bd71cad477f5ce13d"
+  when '1.1.0'
+    pkg.sha256sum "52d108d08e1a5d95c00343cb3a4936fb1deecff2be612ec39c9cb66be5a8b859"
   else
     raise "rubygem-semantic_puppet version #{version} has not been configured; Cannot continue."
   end
diff --git a/configs/components/rubygem-yard.rb b/configs/components/rubygem-yard.rb
index 135944f71..05f278aa8 100644
--- a/configs/components/rubygem-yard.rb
+++ b/configs/components/rubygem-yard.rb
@@ -1,6 +1,6 @@
 component 'rubygem-yard' do |pkg, settings, platform|
-  pkg.version '0.9.34'
-  pkg.md5sum '9c8530eaaf9acf6fd32ee4b51119e46a'
+  pkg.version '0.9.36'
+  pkg.md5sum 'ffaaaaafc1257e3bb98aea44fa47c05d'
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
 end
diff --git a/configs/projects/_shared-pe-bolt-server.rb b/configs/projects/_shared-pe-bolt-server.rb
index 844fd5f18..bb6fa7bd8 100644
--- a/configs/projects/_shared-pe-bolt-server.rb
+++ b/configs/projects/_shared-pe-bolt-server.rb
@@ -36,7 +36,7 @@
 # Set desired versions for gem components that offer multiple versions:
 # TODO: Can runtime projects use these updated versions?
 proj.setting(:rubygem_deep_merge_version, '1.2.2')
-proj.setting(:rubygem_net_ssh_version, '7.0.1')
+proj.setting(:rubygem_net_ssh_version, '7.2.3')
 
 # (pe-bolt-server does not run on Windows, so only the *nix path is here)
 proj.setting(:prefix, '/opt/puppetlabs/server/apps/bolt-server')
@@ -110,6 +110,7 @@
 proj.component('rubygem-aws-sdk-core')
 proj.component('rubygem-aws-sdk-ec2')
 proj.component('rubygem-aws-sigv4')
+proj.component('rubygem-base64')
 proj.component('rubygem-bcrypt_pbkdf')
 proj.component('rubygem-bindata')
 proj.component('rubygem-builder')
@@ -140,6 +141,7 @@
 proj.component('rubygem-net-scp')
 proj.component('rubygem-net-ssh')
 proj.component('rubygem-net-ssh-krb')
+proj.component('rubygem-nkf')
 proj.component('rubygem-rubyntlm')
 proj.component('rubygem-nori')
 proj.component('rubygem-orchestrator_client')
diff --git a/configs/projects/_shared-pe-bolt-server_with_ruby.rb b/configs/projects/_shared-pe-bolt-server_with_ruby.rb
index a471eec39..06740fccd 100644
--- a/configs/projects/_shared-pe-bolt-server_with_ruby.rb
+++ b/configs/projects/_shared-pe-bolt-server_with_ruby.rb
@@ -43,7 +43,7 @@
 # Set desired versions for gem components that offer multiple versions:
 # TODO: Can runtime projects use these updated versions?
 proj.setting(:rubygem_deep_merge_version, '1.2.2')
-proj.setting(:rubygem_net_ssh_version, '7.0.1')
+proj.setting(:rubygem_net_ssh_version, '7.2.3')
 
 # (pe-bolt-server does not run on Windows, so only the *nix path is here)
 proj.setting(:prefix, '/opt/puppetlabs/server/apps/bolt-server')
diff --git a/configs/projects/_shared-pe-installer-runtime.rb b/configs/projects/_shared-pe-installer-runtime.rb
index fec319e75..654ade094 100644
--- a/configs/projects/_shared-pe-installer-runtime.rb
+++ b/configs/projects/_shared-pe-installer-runtime.rb
@@ -93,6 +93,7 @@
 proj.component('rubygem-aws-sdk-core')
 proj.component('rubygem-aws-sdk-ec2')
 proj.component('rubygem-aws-sigv4')
+proj.component('rubygem-base64')
 proj.component('rubygem-bcrypt_pbkdf')
 proj.component('rubygem-bindata')
 proj.component('rubygem-builder')
@@ -121,6 +122,7 @@
 proj.component('rubygem-net-http-persistent')
 proj.component('rubygem-net-scp')
 proj.component('rubygem-net-ssh-krb')
+proj.component('rubygem-nkf')
 proj.component('rubygem-nori')
 proj.component('rubygem-rubyntlm')
 proj.component('rubygem-orchestrator_client')
diff --git a/configs/projects/bolt-runtime.rb b/configs/projects/bolt-runtime.rb
index a682ae4dd..225117c2a 100644
--- a/configs/projects/bolt-runtime.rb
+++ b/configs/projects/bolt-runtime.rb
@@ -7,7 +7,7 @@
   proj.setting(:augeas_version, '1.11.0')
   # TODO: Can runtime projects use these updated versions?
   proj.setting(:rubygem_deep_merge_version, '1.2.2')
-  proj.setting(:rubygem_puppet_version, '7.27.0')
+  proj.setting(:rubygem_puppet_version, '7.30.0')
 
   platform = proj.get_platform
 
@@ -166,6 +166,7 @@
   proj.component 'rubygem-aws-sdk-core'
   proj.component 'rubygem-aws-sdk-ec2'
   proj.component 'rubygem-aws-sigv4'
+  proj.component 'rubygem-base64'
   proj.component 'rubygem-bindata'
   proj.component 'rubygem-builder'
   proj.component 'rubygem-CFPropertyList'
@@ -193,6 +194,7 @@
   proj.component 'rubygem-net-scp'
   proj.component 'rubygem-net-ssh'
   proj.component 'rubygem-net-ssh-krb'
+  proj.component 'rubygem-nkf'
   proj.component 'rubygem-nori'
   proj.component 'rubygem-orchestrator_client'
   proj.component 'rubygem-paint'
diff --git a/configs/projects/pe-bolt-server-runtime-2021.7.x.rb b/configs/projects/pe-bolt-server-runtime-2021.7.x.rb
index 79b7a83ab..5b56164d1 100644
--- a/configs/projects/pe-bolt-server-runtime-2021.7.x.rb
+++ b/configs/projects/pe-bolt-server-runtime-2021.7.x.rb
@@ -1,6 +1,6 @@
 project 'pe-bolt-server-runtime-2021.7.x' do |proj|
   proj.setting(:pe_version, '2021.7')
-  proj.setting(:rubygem_puppet_version, '7.27.0')
+  proj.setting(:rubygem_puppet_version, '7.30.0')
   proj.setting(:rubygem_puppet_strings_version, '3.0.1')
   proj.setting(:rubygem_net_ssh_version, '6.1.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
diff --git a/configs/projects/pe-bolt-server-runtime-main.rb b/configs/projects/pe-bolt-server-runtime-main.rb
index 5a0f073c8..2bd5c4a94 100644
--- a/configs/projects/pe-bolt-server-runtime-main.rb
+++ b/configs/projects/pe-bolt-server-runtime-main.rb
@@ -1,7 +1,6 @@
 project 'pe-bolt-server-runtime-main' do |proj|
   proj.setting(:pe_version, 'main')
-  proj.setting(:rubygem_puppet_version, '8.3.1')
-  proj.setting(:rubygem_net_ssh_version, '7.0.1')
+  proj.setting(:rubygem_puppet_version, '8.6.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-2021.7.x.rb b/configs/projects/pe-installer-runtime-2021.7.x.rb
index 04fe59f22..434792ef9 100644
--- a/configs/projects/pe-installer-runtime-2021.7.x.rb
+++ b/configs/projects/pe-installer-runtime-2021.7.x.rb
@@ -10,7 +10,7 @@
   end
   
   # rubygem-net-ssh included in shared-agent-components
-  proj.setting(:rubygem_net_ssh_version, '5.2.0')
-  proj.setting(:rubygem_puppet_version, '7.27.0')
+  proj.setting(:rubygem_net_ssh_version, '6.1.0')
+  proj.setting(:rubygem_puppet_version, '7.30.0')
   instance_eval File.read(File.join(File.dirname(__FILE__), '_shared-pe-installer-runtime.rb'))
 end
diff --git a/configs/projects/pe-installer-runtime-main.rb b/configs/projects/pe-installer-runtime-main.rb
index f54ae8001..c5bfd22a0 100644
--- a/configs/projects/pe-installer-runtime-main.rb
+++ b/configs/projects/pe-installer-runtime-main.rb
@@ -7,7 +7,7 @@
   proj.setting(:use_legacy_openssl_algos, true)
 
   # rubygem-net-ssh included in shared-agent-components
-  proj.setting(:rubygem_net_ssh_version, '7.0.1')
-  proj.setting(:rubygem_puppet_version, '8.3.1')
+  proj.setting(:rubygem_net_ssh_version, '7.2.3')
+  proj.setting(:rubygem_puppet_version, '8.6.0')
   instance_eval File.read(File.join(File.dirname(__FILE__), '_shared-pe-installer-runtime.rb'))
 end