From 95eb4d8609ee5504d1bc096b1822eb5526601e2b Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Fri, 17 May 2019 12:28:23 -0700 Subject: Update Chef 14 deps to the latest Avoid double addressable gems and bring in the updated mixlib-cli Signed-off-by: Tim Smith --- Gemfile.lock | 20 +++++----- omnibus/Gemfile.lock | 103 ++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 83 insertions(+), 40 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ab52a326d7..66752333a0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -87,7 +87,7 @@ PATH GEM remote: https://rubygems.org/ specs: - addressable (2.5.2) + addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) appbundler (0.12.0) mixlib-cli (>= 1.4, < 3.0) @@ -129,7 +129,7 @@ GEM ffi-yajl (2.3.1) libyajl2 (~> 1.2) fuzzyurl (0.9.0) - hashdiff (0.3.8) + hashdiff (0.3.9) hashie (3.6.0) highline (1.7.10) htmlentities (4.3.4) @@ -168,7 +168,7 @@ GEM mixlib-archive (1.0.1-universal-mingw32) mixlib-log mixlib-authentication (2.1.1) - mixlib-cli (2.0.3) + mixlib-cli (2.0.6) mixlib-config (3.0.1) tomlrb mixlib-log (3.0.1) @@ -177,7 +177,7 @@ GEM win32-process (~> 0.8.2) wmi-lite (~> 1.0) multi_json (1.13.1) - multipart-post (2.0.0) + multipart-post (2.1.1) necromancer (0.4.0) net-scp (2.0.0) net-ssh (>= 2.6.5, < 6.0.0) @@ -206,7 +206,7 @@ GEM systemu (~> 2.6.4) wmi-lite (~> 1.0) parallel (1.17.0) - parser (2.6.2.1) + parser (2.6.3.0) ast (~> 2.4.0) parslet (1.8.2) pastel (0.7.2) @@ -238,7 +238,7 @@ GEM rspec-mocks (~> 3.8.0) rspec-core (3.8.0) rspec-support (~> 3.8.0) - rspec-expectations (3.8.2) + rspec-expectations (3.8.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) rspec-its (1.3.0) @@ -263,9 +263,9 @@ GEM ruby-shadow (2.5.0) rubyzip (1.2.2) safe_yaml (1.0.5) - sawyer (0.8.1) - addressable (>= 2.3.5, < 2.6) - faraday (~> 0.8, < 1.0) + sawyer (0.8.2) + addressable (>= 2.3.5) + faraday (> 0.8, < 2.0) semverse (3.0.0) serverspec (2.41.4) multi_json @@ -321,7 +321,7 @@ GEM pastel (~> 0.7.2) strings (~> 0.1.0) tty-screen (~> 0.6.4) - unicode-display_width (1.5.0) + unicode-display_width (1.6.0) unicode_utils (1.4.0) uuidtools (2.1.5) webmock (3.5.1) diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index d117a46d54..8b34ffb671 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/chef/omnibus - revision: af75fc2b244de04e76961c02b30db504d5b1a8f4 + revision: 968307c129ee54416f5a4d07ca8f8ca2d2b12825 branch: master specs: - omnibus (6.0.25) + omnibus (6.0.27) aws-sdk-s3 (~> 1) chef-sugar (>= 3.3) cleanroom (~> 1.0) @@ -18,7 +18,7 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: 0dc67ede1784d56a975cb4a7aea47ad2349bf24a + revision: 02869232bd219e8018f7d16b222a6af7403f0ad8 branch: master specs: omnibus-software (4.0.0) @@ -28,25 +28,28 @@ GIT GEM remote: https://rubygems.org/ specs: - addressable (2.5.2) + addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) awesome_print (1.8.0) - aws-eventstream (1.0.2) - aws-partitions (1.150.0) - aws-sdk-core (3.48.3) + aws-eventstream (1.0.3) + aws-partitions (1.162.0) + aws-sdk-core (3.52.1) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.16.0) - aws-sdk-core (~> 3, >= 3.48.2) + aws-sdk-kms (1.20.0) + aws-sdk-core (~> 3, >= 3.52.1) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.36.0) - aws-sdk-core (~> 3, >= 3.48.2) + aws-sdk-s3 (1.39.0) + aws-sdk-core (~> 3, >= 3.52.1) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.0) aws-sigv4 (1.1.0) aws-eventstream (~> 1.0, >= 1.0.2) + bcrypt_pbkdf (1.0.1) + bcrypt_pbkdf (1.0.1-x64-mingw32) + bcrypt_pbkdf (1.0.1-x86-mingw32) berkshelf (7.0.8) chef (>= 13.6.52) chef-config @@ -64,10 +67,10 @@ GEM debug_inspector (>= 0.0.1) builder (3.2.3) byebug (11.0.1) - chef (14.12.3) + chef (14.12.9) addressable bundler (>= 1.10) - chef-config (= 14.12.3) + chef-config (= 14.12.9) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -94,10 +97,10 @@ GEM specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (14.12.3-universal-mingw32) + chef (14.12.9-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.12.3) + chef-config (= 14.12.9) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -136,7 +139,7 @@ GEM win32-service (>= 1.0, < 3.0) win32-taskscheduler (~> 2.0) wmi-lite (~> 1.0) - chef-config (14.12.3) + chef-config (14.12.9) addressable fuzzyurl mixlib-config (>= 2.2.12, < 4.0) @@ -155,6 +158,8 @@ GEM concurrent-ruby (1.1.5) debug_inspector (0.0.3) diff-lcs (1.3) + ed25519 (1.2.4) + equatable (0.5.0) erubis (2.7.0) faraday (0.15.4) multipart-post (>= 1.2, < 3) @@ -166,7 +171,7 @@ GEM ffi-yajl (2.3.1) libyajl2 (~> 1.2) fuzzyurl (0.9.0) - gssapi (1.2.0) + gssapi (1.3.0) ffi (>= 1.0.1) gyoku (1.3.1) builder (>= 2.1.2) @@ -178,9 +183,14 @@ GEM ipaddress (0.8.3) iso8601 (0.12.1) jmespath (1.4.0) - kitchen-vagrant (1.5.1) + kitchen-vagrant (1.5.2) test-kitchen (>= 1.4, < 3) libyajl2 (1.2.0) + license-acceptance (1.0.11) + pastel (~> 0.7) + tomlrb (~> 1.2) + tty-box (~> 0.3) + tty-prompt (~> 0.18) license_scout (1.0.24) ffi-yajl (~> 2.2) mixlib-shellout (~> 2.2) @@ -196,10 +206,10 @@ GEM mixlib-archive (1.0.1-universal-mingw32) mixlib-log mixlib-authentication (2.1.1) - mixlib-cli (2.0.3) - mixlib-config (2.2.18) + mixlib-cli (2.0.6) + mixlib-config (3.0.1) tomlrb - mixlib-install (3.11.12) + mixlib-install (3.11.18) mixlib-shellout mixlib-versioning thor @@ -212,6 +222,7 @@ GEM molinillo (0.6.6) multi_json (1.13.1) multipart-post (2.0.0) + necromancer (0.4.0) net-scp (2.0.0) net-ssh (>= 2.6.5, < 6.0.0) net-sftp (2.1.2) @@ -226,7 +237,7 @@ GEM nori (2.6.0) octokit (4.14.0) sawyer (~> 0.8.0, >= 0.5.3) - ohai (14.8.11) + ohai (14.8.12) chef-config (>= 12.8, < 15) ffi (~> 1.9) ffi-yajl (~> 2.2) @@ -238,6 +249,9 @@ GEM plist (~> 3.1) systemu (~> 2.6.4) wmi-lite (~> 1.0) + pastel (0.7.2) + equatable (~> 0.5.0) + tty-color (~> 0.4.0) pedump (0.5.2) awesome_print iostruct (>= 0.0.4) @@ -265,7 +279,7 @@ GEM rspec-mocks (~> 3.8.0) rspec-core (3.8.0) rspec-support (~> 3.8.0) - rspec-expectations (3.8.2) + rspec-expectations (3.8.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) rspec-its (1.3.0) @@ -281,11 +295,11 @@ GEM ruby-progressbar (1.10.0) rubyntlm (0.6.2) rubyzip (1.2.2) - sawyer (0.8.1) - addressable (>= 2.3.5, < 2.6) - faraday (~> 0.8, < 1.0) + sawyer (0.8.2) + addressable (>= 2.3.5) + faraday (> 0.8, < 2.0) semverse (3.0.0) - serverspec (2.41.3) + serverspec (2.41.4) multi_json rspec (~> 3.0) rspec-its @@ -294,15 +308,23 @@ GEM solve (4.0.2) molinillo (~> 0.6) semverse (>= 1.1, < 4.0) - specinfra (2.77.0) + specinfra (2.77.2) net-scp net-ssh (>= 2.7) net-telnet (= 0.1.1) sfl + strings (0.1.5) + strings-ansi (~> 0.1) + unicode-display_width (~> 1.5) + unicode_utils (~> 1.4) + strings-ansi (0.1.0) structured_warnings (0.3.0) syslog-logger (1.6.8) systemu (2.6.5) - test-kitchen (2.0.1) + test-kitchen (2.2.5) + bcrypt_pbkdf (~> 1.0) + ed25519 (~> 1.2) + license-acceptance (~> 1.0, >= 1.0.11) mixlib-install (~> 3.6) mixlib-shellout (>= 1.2, < 3.0) net-scp (>= 1.1, < 3.0) @@ -313,9 +335,29 @@ GEM winrm-elevated (~> 1.0) winrm-fs (~> 1.1) thor (0.20.3) + timers (4.3.0) toml-rb (1.1.2) citrus (~> 3.0, > 3.0) tomlrb (1.2.8) + tty-box (0.3.0) + pastel (~> 0.7.2) + strings (~> 0.1.4) + tty-cursor (~> 0.6.0) + tty-color (0.4.3) + tty-cursor (0.6.1) + tty-prompt (0.18.1) + necromancer (~> 0.4.0) + pastel (~> 0.7.0) + timers (~> 4.0) + tty-cursor (~> 0.6.0) + tty-reader (~> 0.5.0) + tty-reader (0.5.0) + tty-cursor (~> 0.6.0) + tty-screen (~> 0.6.4) + wisper (~> 2.0.0) + tty-screen (0.6.5) + unicode-display_width (1.6.0) + unicode_utils (1.4.0) uuidtools (2.1.5) win32-api (1.5.3-universal-mingw32) win32-certstore (0.3.0) @@ -341,7 +383,7 @@ GEM win32-taskscheduler (2.0.4) ffi structured_warnings - winrm (2.3.1) + winrm (2.3.2) builder (>= 2.1.2) erubis (~> 2.7) gssapi (~> 1.2) @@ -358,6 +400,7 @@ GEM logging (>= 1.6.1, < 3.0) rubyzip (~> 1.1) winrm (~> 2.0) + wisper (2.0.0) wmi-lite (1.0.2) zhexdump (0.0.2) -- cgit v1.2.1