diff options
| -rw-r--r-- | omnibus/Gemfile | 2 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 24 | ||||
| -rw-r--r-- | omnibus_overrides.rb | 4 |
3 files changed, 15 insertions, 15 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile index 8cdaafa877..622c7596f6 100644 --- a/omnibus/Gemfile +++ b/omnibus/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" gem "omnibus", github: ENV.fetch("OMNIBUS_GITHUB_REPO", "chef/omnibus"), branch: ENV.fetch("OMNIBUS_GITHUB_BRANCH", "main") -gem "omnibus-software", github: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_REPO", "chef/omnibus-software"), branch: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_BRANCH", "main") +gem "omnibus-software", github: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_REPO", "chef/omnibus-software"), branch: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_BRANCH", "new_ruby") gem "artifactory" gem "pedump" diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index b5a5edc60b..cad42210b6 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/chef/omnibus-software.git - revision: 461fc3e9f0a8f2f13e73b45413d232bfd04390aa - branch: main + revision: e350e19846d9d471749ae32a4ab50b92ac57d762 + branch: new_ruby specs: omnibus-software (4.0.0) omnibus (>= 8.0.0) @@ -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) 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" |