diff options
author | Tim Smith <tsmith@chef.io> | 2018-06-12 12:29:01 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-12 12:29:01 -0700 |
commit | 4610b2586083b4d2e54e8d824d5b596b11434f6f (patch) | |
tree | 760aab19d31abd9f3fcbe92891f061f47bab704e | |
parent | a06ed250ed0fa17302319e166388e8ad251e3808 (diff) | |
parent | c7bd500212931e033947f5141660bae815ce88fb (diff) | |
download | chef-4610b2586083b4d2e54e8d824d5b596b11434f6f.tar.gz |
Merge pull request #7355 from chef/dep_bump
Update to the latest inspec and liblzma
-rw-r--r-- | Gemfile.lock | 8 | ||||
-rw-r--r-- | omnibus/Gemfile.lock | 44 | ||||
-rw-r--r-- | omnibus_overrides.rb | 2 |
3 files changed, 27 insertions, 27 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index a048156e50..4ea8b08570 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -149,7 +149,7 @@ GEM highline (1.7.10) htmlentities (4.3.4) iniparse (1.4.4) - inspec-core (2.1.84) + inspec-core (2.2.10) addressable (~> 2.4) faraday (>= 0.9.0) hashie (~> 3.4) @@ -221,7 +221,7 @@ GEM ast (~> 2.4.0) parslet (1.8.2) plist (3.4.0) - powerpack (0.1.1) + powerpack (0.1.2) proxifier (1.0.3) pry (0.11.3) coderay (~> 1.1.0) @@ -314,7 +314,7 @@ GEM typhoeus (~> 0.6, >= 0.6.8) typhoeus (0.8.0) ethon (>= 0.8.0) - unicode-display_width (1.3.3) + unicode-display_width (1.4.0) uuidtools (2.1.5) webmock (3.4.2) addressable (>= 2.3.6) @@ -377,4 +377,4 @@ DEPENDENCIES yard BUNDLED WITH - 1.16.1 + 1.16.2 diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 1b241b0ed7..1bcf7ab0ae 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -18,7 +18,7 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: 0cb3a8dfb6cebd56684c1d4609a676959389e4c5 + revision: 88ce7ac44a6be8a36b6582fa6f50150ed38a87c7 branch: master specs: omnibus-software (4.0.0) @@ -31,13 +31,13 @@ GEM addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) awesome_print (1.8.0) - aws-sdk (2.11.33) - aws-sdk-resources (= 2.11.33) - aws-sdk-core (2.11.33) + aws-sdk (2.11.66) + aws-sdk-resources (= 2.11.66) + aws-sdk-core (2.11.66) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.11.33) - aws-sdk-core (= 2.11.33) + aws-sdk-resources (2.11.66) + aws-sdk-core (= 2.11.66) aws-sigv4 (1.0.2) berkshelf (4.3.5) addressable (~> 2.3, >= 2.3.4) @@ -78,7 +78,7 @@ GEM celluloid-io (0.16.2) celluloid (>= 0.16.0) nio4r (>= 1.1.0) - chef-config (13.8.5) + chef-config (13.9.4) addressable fuzzyurl mixlib-config (~> 2.0) @@ -92,9 +92,9 @@ GEM erubis (2.7.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) - ffi (1.9.23) - ffi (1.9.23-x64-mingw32) - ffi (1.9.23-x86-mingw32) + ffi (1.9.25) + ffi (1.9.25-x64-mingw32) + ffi (1.9.25-x86-mingw32) ffi-yajl (2.3.1) libyajl2 (~> 1.2) fuzzyurl (0.9.0) @@ -110,10 +110,10 @@ GEM ipaddress (0.8.3) jmespath (1.4.0) json (2.1.0) - kitchen-vagrant (1.3.1) + kitchen-vagrant (1.3.2) test-kitchen (~> 1.4) libyajl2 (1.2.0) - license_scout (1.0.2) + license_scout (1.0.10) ffi-yajl (~> 2.2) mixlib-shellout (~> 2.2) toml-rb (~> 1.0) @@ -123,13 +123,13 @@ GEM multi_json (~> 1.10) method_source (0.9.0) minitar (0.6.1) - mixlib-archive (0.4.1) + mixlib-archive (0.4.7) mixlib-log - mixlib-authentication (2.0.0) + mixlib-authentication (2.1.1) mixlib-cli (1.7.0) mixlib-config (2.2.6) tomlrb - mixlib-install (3.9.3) + mixlib-install (3.10.0) mixlib-shellout mixlib-versioning thor @@ -147,11 +147,11 @@ GEM net-ssh (4.2.0) net-ssh-gateway (1.3.0) net-ssh (>= 2.6.5) - nio4r (2.3.0) + nio4r (2.3.1) nori (2.6.0) - octokit (4.8.0) + octokit (4.9.0) sawyer (~> 0.8.0, >= 0.5.3) - ohai (13.9.0) + ohai (13.9.2) chef-config (>= 12.5.0.alpha.1, < 14) ffi (~> 1.9) ffi-yajl (~> 2.2) @@ -211,17 +211,17 @@ GEM molinillo (~> 0.4.2) semverse (~> 1.1) systemu (2.6.5) - test-kitchen (1.21.0) + test-kitchen (1.21.2) mixlib-install (~> 3.6) mixlib-shellout (>= 1.2, < 3.0) net-scp (~> 1.1) net-ssh (>= 2.9, < 5.0) net-ssh-gateway (~> 1.2) - thor (~> 0.19, < 0.19.2) + thor (~> 0.19) winrm (~> 2.0) winrm-elevated (~> 1.0) winrm-fs (~> 1.1) - thor (0.19.1) + thor (0.20.0) timers (4.0.4) hitimes toml-rb (1.1.1) @@ -271,4 +271,4 @@ DEPENDENCIES winrm-fs (~> 1.0) BUNDLED WITH - 1.16.1 + 1.16.2 diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 1d2b46bdbe..cbb2edd6cf 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -6,7 +6,7 @@ override :bundler, version: "1.16.1" override "nokogiri", version: "1.8.2" override "libffi", version: "3.2.1" override "libiconv", version: "1.15" -override "liblzma", version: "5.2.3" +override "liblzma", version: "5.2.4" override "libtool", version: "2.4.2" override "libxml2", version: "2.9.7" override "libxslt", version: "1.1.30" |