diff options
author | Tim Smith <tsmith@chef.io> | 2021-07-08 17:12:49 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-08 17:12:49 -0700 |
commit | 8e1275bdf14fe0cc96eb2e38565451d43d647edc (patch) | |
tree | 584fa4c8e176bfb1a955e47f3c800a5ed12c9bf6 | |
parent | f0ad00feeb7ac42dc328f3d2be4f8c8bc431c107 (diff) | |
parent | 5bec93c489610b2e3bc2e7b50f6317cf18e9758e (diff) | |
download | chef-8e1275bdf14fe0cc96eb2e38565451d43d647edc.tar.gz |
Merge pull request #11792 from chef/ruby_cve
Update to Ruby 3.0.2 with bundler 2.2.22
-rw-r--r-- | Gemfile.lock | 6 | ||||
-rw-r--r-- | omnibus/Gemfile.lock | 8 | ||||
-rw-r--r-- | omnibus_overrides.rb | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 7f0f4b17e5..1cdb8692c1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -259,7 +259,7 @@ GEM net-ssh (6.1.0) nori (2.6.0) parallel (1.20.1) - parser (3.0.1.1) + parser (3.0.2.0) ast (~> 2.4.1) parslet (1.8.2) pastel (0.8.0) @@ -278,7 +278,7 @@ GEM public_suffix (4.0.6) rack (2.2.3) rainbow (3.0.0) - rake (13.0.4) + rake (13.0.5) rb-readline (0.5.5) regexp_parser (2.1.1) rexml (3.2.5) @@ -432,4 +432,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.2.19 + 2.2.22 diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index f96ae0354d..23b6a35b15 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/chef/omnibus-software.git - revision: b02a8c311c403c102a79ba1c1d8c0ce689d93373 + revision: e9feb357a695b6d022e7da2bb535baf5d53e8e84 branch: master specs: omnibus-software (4.0.0) @@ -33,8 +33,8 @@ GEM artifactory (3.0.15) awesome_print (1.9.2) aws-eventstream (1.1.1) - aws-partitions (1.473.0) - aws-sdk-core (3.115.0) + aws-partitions (1.475.0) + aws-sdk-core (3.116.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) @@ -46,7 +46,7 @@ GEM aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) - aws-sigv4 (1.2.3) + aws-sigv4 (1.2.4) aws-eventstream (~> 1, >= 1.0.2) bcrypt_pbkdf (1.1.0) bcrypt_pbkdf (1.1.0-x64-mingw32) diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 32c2cc6e69..127c6bf24e 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -16,8 +16,8 @@ override "ncurses", version: "5.9" override "nokogiri", version: "1.11.0" override "openssl", version: mac_os_x? ? "1.1.1k" : "1.0.2y" override "pkg-config-lite", version: "0.28-1" -override "bundler", version: "2.2.15" -override "ruby", version: "3.0.1" +override "bundler", version: "2.2.22" +override "ruby", version: "3.0.2" override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18" override "util-macros", version: "1.19.0" override "xproto", version: "7.0.28" |