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 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/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/_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' diff --git a/configs/projects/bolt-runtime.rb b/configs/projects/bolt-runtime.rb index b14f907c0..56aafab75 100644 --- 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 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