Merge branch 'master' into r10k-bump

puppetlabs · Nov 12, 2024 · f2e8c40 · f2e8c40
2 parents e51b9b0 + 86d6e2d
commit f2e8c40
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 18 deletions.
diff --git 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

diff --git a/configs/components/rubygem-json_pure.rb b/configs/components/rubygem-json_pure.rb
diff --git 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/_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'

diff --git a/configs/projects/bolt-runtime.rb b/configs/projects/bolt-runtime.rb
@@ -9,12 +9,12 @@
   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_forge_version, '5.0.4')
   proj.setting(:rubygem_faraday_version, '2.12.0')
   proj.setting(:rubygem_faraday_net_http_version, '3.3.0')
   proj.setting(:rubygem_faraday_net_http_persistent_version, '2.3.0')
   proj.setting(:rubygem_r10k_version, '4.1.0')
+  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
@@ -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
@@ -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
@@ -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
diff --git 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