diff options
| author | Lamont Granquist <454857+lamont-granquist@users.noreply.github.com> | 2021-11-29 17:32:58 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-29 17:32:58 -0800 |
| commit | d52520e155b9581a51b36743687faf2968617096 (patch) | |
| tree | a670904db6dcaec6eb7b184d0103fe81d34c0865 | |
| parent | 9eec7706fc7140e1611cb8b2d309e53dc352b275 (diff) | |
| parent | d048b20521db2ca8ac9bc11c425a7631b6dd6215 (diff) | |
| download | chef-d52520e155b9581a51b36743687faf2968617096.tar.gz | |
Merge pull request #12323 from chef/lcg/ruby-3.0.3
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 24 | ||||
| -rw-r--r-- | omnibus_overrides.rb | 4 |
3 files changed, 16 insertions, 16 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 66099f8aff..437014872e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -290,7 +290,7 @@ GEM net-ssh (6.1.0) nori (2.6.0) parallel (1.21.0) - parser (3.0.2.0) + parser (3.0.3.1) ast (~> 2.4.1) parslet (1.8.2) pastel (0.8.0) @@ -466,4 +466,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.2.22 + 2.2.32 diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 6ed662f62e..1acbb12fd9 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -65,12 +65,12 @@ GEM solve (~> 4.0) thor (>= 0.20) builder (3.2.4) - chef (16.16.13) + chef (16.17.4) addressable bcrypt_pbkdf (~> 1.1) bundler (>= 1.10) - chef-config (= 16.16.13) - chef-utils (= 16.16.13) + chef-config (= 16.17.4) + chef-utils (= 16.17.4) chef-vault chef-zero (>= 14.0.11) diff-lcs (>= 1.2.4, < 1.4.0) @@ -102,12 +102,12 @@ GEM tty-screen (~> 0.6) tty-table (~> 0.11) uuidtools (>= 2.1.5, < 3.0) - chef (16.16.13-universal-mingw32) + chef (16.17.4-universal-mingw32) addressable bcrypt_pbkdf (~> 1.1) bundler (>= 1.10) - chef-config (= 16.16.13) - chef-utils (= 16.16.13) + chef-config (= 16.17.4) + chef-utils (= 16.17.4) chef-vault chef-zero (>= 14.0.11) diff-lcs (>= 1.2.4, < 1.4.0) @@ -151,9 +151,9 @@ GEM win32-taskscheduler (~> 2.0) wmi-lite (~> 1.0) chef-cleanroom (1.0.4) - chef-config (16.16.13) + chef-config (16.17.4) addressable - chef-utils (= 16.16.13) + chef-utils (= 16.17.4) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -161,7 +161,7 @@ GEM chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) - chef-utils (16.16.13) + chef-utils (16.17.4) chef-vault (4.1.4) chef-zero (15.0.11) ffi-yajl (~> 2.2) @@ -212,7 +212,7 @@ GEM highline (2.0.3) httpclient (2.8.3) iniparse (1.5.0) - inspec-core (4.49.0) + inspec-core (4.50.3) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -363,7 +363,7 @@ GEM strings-ansi (0.2.0) structured_warnings (0.4.0) syslog-logger (1.6.8) - test-kitchen (3.2.0) + test-kitchen (3.2.1) bcrypt_pbkdf (~> 1.0) chef-utils (>= 16.4.35) ed25519 (~> 1.2) @@ -478,4 +478,4 @@ DEPENDENCIES winrm-fs (~> 1.0) BUNDLED WITH - 2.2.22 + 2.2.32 diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 59979f2703..ee21ae5713 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.1l" : "1.0.2zb" override "pkg-config-lite", version: "0.28-1" -override "bundler", version: "2.2.22" -override "ruby", version: "3.0.2" +override "bundler", version: "2.2.32" +override "ruby", version: "3.0.3" 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" |