diff options
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 4 | ||||
| -rw-r--r-- | omnibus_overrides.rb | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 987062e16c..a33f0b1781 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -359,7 +359,7 @@ GEM unicode-display_width (1.6.0) unicode_utils (1.4.0) uuidtools (2.1.5) - webmock (3.7.0) + webmock (3.7.1) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 4eb3d17408..1f424e7962 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -18,7 +18,7 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: 75f8868a794508d6b567162f13924c9d21ce5dfa + revision: b851a32e09a384cad768a6d44df267ffe920cfc2 branch: master specs: omnibus-software (4.0.0) @@ -276,7 +276,7 @@ GEM unicode-display_width (~> 1.5) unicode_utils (~> 1.4) strings-ansi (0.1.0) - structured_warnings (0.3.0) + structured_warnings (0.4.0) syslog-logger (1.6.8) systemu (2.6.5) test-kitchen (2.3.1) diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 96342de8db..1f33f9be1f 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -6,7 +6,7 @@ # software here: bundle exec rake dependencies:update_omnibus_gemfile_lock override :rubygems, version: "3.0.3" # rubygems ships its own bundler which may differ from bundler defined below and then we get double bundler which results in performance issues / CLI warnings. Make sure these versions match before bumping either. override :bundler, version: "1.17.2" # currently pinned to what ships in Ruby to prevent double bundler -override "nokogiri", version: "1.10.2" +override "libarchive", version: "3.4.0" override "libffi", version: "3.2.1" override "libiconv", version: "1.15" override "liblzma", version: "5.2.4" @@ -16,13 +16,14 @@ override "libxslt", version: "1.1.30" override "libyaml", version: "0.1.7" override "makedepend", version: "1.0.5" override "ncurses", version: "5.9" +override "nokogiri", version: "1.10.2" +override "openssl", version: "1.0.2s" override "pkg-config-lite", version: "0.28-1" override "ruby", version: "2.6.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" override "zlib", version: "1.2.11" -override "openssl", version: "1.0.2s" # we build both a chef and ohai omnibus-software defintion which create the # chef-client and ohai binstubs. Out of the box the ohai definition uses whatever |