Merge pull request #6783 from chef/updates

Update Ohai, omnibus, and Ruby versions

4 files changed, 51 insertions, 53 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 12cc6a24f5..6c80090760 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/chef/chef-server
-  revision: e9de61e1d55e4a7fc0bc1a1628d38691c2bec387
+  revision: ac7467ae784924bad11bd616dd0110766fa7f0a0
   specs:
     oc-chef-pedant (2.2.0)
       activesupport (>= 4.2.7.1, < 6.0)
@@ -29,7 +29,7 @@ GIT
 
 GIT
   remote: https://github.com/rubysec/bundler-audit.git
-  revision: 06e6077aaaed3744915b1dda71effeea2ea41751
+  revision: b84d88f76c4d656421c1d810c9760b0fdea5d13a
   specs:
     bundler-audit (0.6.0)
       bundler (~> 1.2)
@@ -128,25 +128,25 @@ GEM
     addressable (2.4.0)
     appbundler (0.10.0)
       mixlib-cli (~> 1.4)
-    ast (2.3.0)
+    ast (2.4.0)
     awesome_print (1.8.0)
-    aws-sdk (2.10.102)
-      aws-sdk-resources (= 2.10.102)
-    aws-sdk-core (2.10.102)
+    aws-sdk (2.10.125)
+      aws-sdk-resources (= 2.10.125)
+    aws-sdk-core (2.10.125)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.10.102)
-      aws-sdk-core (= 2.10.102)
+    aws-sdk-resources (2.10.125)
+      aws-sdk-core (= 2.10.125)
     aws-sigv4 (1.0.2)
-    backports (3.10.3)
-    binding_of_caller (0.7.3)
+    backports (3.11.1)
+    binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.3)
     byebug (9.1.0)
     chef-api (0.7.1)
       logify (~> 0.1)
       mime-types
-    chef-provisioning (2.6.0)
+    chef-provisioning (2.7.0)
       cheffish (>= 4.0, < 14.0)
       inifile (>= 2.0.2)
       mixlib-install (>= 1.0)
@@ -156,7 +156,7 @@ GEM
       winrm (~> 2.0)
       winrm-elevated (~> 1.0)
       winrm-fs (~> 1.0)
-    chef-sugar (3.6.0)
+    chef-sugar (4.0.0)
     chef-zero (5.3.2)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 4.0)
@@ -193,7 +193,7 @@ GEM
       backports (>= 3.8.0)
       cucumber-tag_expressions (~> 1.1.0)
       gherkin (>= 5.0.0)
-    cucumber-expressions (5.0.7)
+    cucumber-expressions (5.0.13)
     cucumber-tag_expressions (1.1.1)
     cucumber-wire (0.0.1)
     debug_inspector (0.0.3)
@@ -204,14 +204,14 @@ GEM
     erubis (2.7.0)
     ethon (0.11.0)
       ffi (>= 1.3.0)
-    excon (0.59.0)
-    faraday (0.13.1)
+    excon (0.60.0)
+    faraday (0.14.0)
       multipart-post (>= 1.2, < 3)
     faraday-http-cache (2.0.0)
       faraday (~> 0.8)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    fauxhai (5.5.0)
+    fauxhai (5.6.0)
       net-ssh
     ffi (1.9.18)
     ffi (1.9.18-x64-mingw32)
@@ -228,7 +228,7 @@ GEM
       rake
       rufus-lru (~> 1.0)
       treetop (~> 1.4)
-    fuubar (2.2.0)
+    fuubar (2.3.1)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
     fuzzyurl (0.9.0)
@@ -250,13 +250,13 @@ GEM
       chef (>= 12.0, < 14.0)
       stove (~> 5.0)
       thor
-    hashie (3.5.6)
+    hashie (3.5.7)
     highline (1.7.10)
     hirb (0.7.3)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (0.9.1)
+    i18n (0.9.3)
       concurrent-ruby (~> 1.0)
     inifile (3.0.0)
     iniparse (1.4.4)
@@ -274,7 +274,7 @@ GEM
     kitchen-sync (2.2.0)
       net-sftp
       test-kitchen (>= 1.0.0)
-    kitchen-vagrant (1.2.1)
+    kitchen-vagrant (1.3.0)
       test-kitchen (~> 1.4)
     knife-windows (1.9.0)
       winrm (~> 2.1)
@@ -292,13 +292,13 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
-    minitest (5.10.3)
+    minitest (5.11.3)
     mixlib-archive (0.4.1)
       mixlib-log
     mixlib-authentication (1.4.2)
     mixlib-cli (1.7.0)
     mixlib-config (2.2.4)
-    mixlib-install (3.8.0)
+    mixlib-install (3.9.0)
       mixlib-shellout
       mixlib-versioning
       thor
@@ -308,7 +308,7 @@ GEM
       win32-process (~> 0.8.2)
       wmi-lite (~> 1.0)
     mixlib-versioning (1.2.2)
-    multi_json (1.12.2)
+    multi_json (1.13.1)
     multi_test (0.1.2)
     multipart-post (2.0.0)
     net-http-persistent (2.9.4)
@@ -333,9 +333,9 @@ GEM
     nokogiri (1.7.2-x86-mingw32)
       mini_portile2 (~> 2.1.0)
     nori (2.6.0)
-    octokit (4.7.0)
+    octokit (4.8.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (8.25.1)
+    ohai (8.26.1)
       chef-config (>= 12.5.0.alpha.1, < 14)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
@@ -430,7 +430,7 @@ GEM
       rspec-core (~> 3.7.0)
       rspec-expectations (~> 3.7.0)
       rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.0)
+    rspec-core (3.7.1)
       rspec-support (~> 3.7.0)
     rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -453,13 +453,12 @@ GEM
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-prof (0.16.2)
+    ruby-prof (0.17.0)
     ruby-progressbar (1.9.0)
     ruby-shadow (2.5.0)
     rubyntlm (0.6.2)
     rubyzip (1.2.1)
     rufus-lru (1.1.0)
-    safe_yaml (1.0.4)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
@@ -475,7 +474,7 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     slop (3.6.0)
-    specinfra (2.72.1)
+    specinfra (2.73.1)
       net-scp
       net-ssh (>= 2.7, < 5.0)
       net-telnet
@@ -485,13 +484,12 @@ GEM
       logify (~> 0.2)
     syslog-logger (1.6.8)
     systemu (2.6.5)
-    test-kitchen (1.19.2)
+    test-kitchen (1.20.0)
       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)
-      safe_yaml (~> 1.0)
       thor (~> 0.19, < 0.19.2)
       winrm (~> 2.0)
       winrm-elevated (~> 1.0)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index fe90f74c87..19729bbde8 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/chef/license_scout
-  revision: d736df0d72f84ed3f0c8e3eb66b12562a3dccbda
+  revision: d044136f0b464ed3894a172f06a50167106ec5d1
   specs:
     license_scout (0.1.3)
       ffi-yajl (~> 2.2)
@@ -9,9 +9,9 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus
-  revision: f6f9973bd65af06a6b3077b3ee094ca203b1d612
+  revision: 9f281bfb7fb44aa5d152b38e73ce04805fdb8958
   specs:
-    omnibus (5.6.1)
+    omnibus (5.6.4)
       aws-sdk (~> 2)
       chef-sugar (~> 3.3)
       cleanroom (~> 1.0)
@@ -26,7 +26,7 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus-software
-  revision: d6accc79f166cc6fc552e07088951bf467c30989
+  revision: 4f03b681b46e9d7300dd6764d8b68b1f6b8a16b8
   specs:
     omnibus-software (4.0.0)
       chef-sugar (>= 3.4.0)
@@ -38,13 +38,13 @@ GEM
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     awesome_print (1.8.0)
-    aws-sdk (2.10.102)
-      aws-sdk-resources (= 2.10.102)
-    aws-sdk-core (2.10.102)
+    aws-sdk (2.10.125)
+      aws-sdk-resources (= 2.10.125)
+    aws-sdk-core (2.10.125)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.10.102)
-      aws-sdk-core (= 2.10.102)
+    aws-sdk-resources (2.10.125)
+      aws-sdk-core (= 2.10.125)
     aws-sigv4 (1.0.2)
     berkshelf (4.3.5)
       addressable (~> 2.3, >= 2.3.4)
@@ -68,7 +68,7 @@ GEM
       faraday (~> 0.9.1)
       httpclient (~> 2.7.0)
       ridley (~> 4.5)
-    binding_of_caller (0.7.3)
+    binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     buff-config (1.0.1)
       buff-extensions (~> 1.0)
@@ -85,11 +85,12 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (13.6.4)
+    chef-config (13.7.16)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
+      tomlrb (~> 1.2)
     chef-sugar (3.6.0)
     citrus (3.0.2)
     cleanroom (1.0.0)
@@ -107,7 +108,7 @@ GEM
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
-    hashie (3.5.6)
+    hashie (3.5.7)
     hitimes (1.2.6)
     hitimes (1.2.6-x86-mingw32)
     httpclient (2.7.2)
@@ -129,7 +130,7 @@ GEM
     mixlib-authentication (1.4.2)
     mixlib-cli (1.7.0)
     mixlib-config (2.2.4)
-    mixlib-install (3.8.0)
+    mixlib-install (3.9.0)
       mixlib-shellout
       mixlib-versioning
       thor
@@ -140,18 +141,18 @@ GEM
       wmi-lite (~> 1.0)
     mixlib-versioning (1.2.2)
     molinillo (0.4.5)
-    multi_json (1.12.2)
+    multi_json (1.13.1)
     multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (4.2.0)
     net-ssh-gateway (1.3.0)
       net-ssh (>= 2.6.5)
-    nio4r (2.1.0)
+    nio4r (2.2.0)
     nori (2.6.0)
-    octokit (4.7.0)
+    octokit (4.8.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (8.25.1)
+    ohai (8.26.1)
       chef-config (>= 12.5.0.alpha.1, < 14)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
@@ -203,7 +204,6 @@ GEM
     ruby-progressbar (1.9.0)
     rubyntlm (0.6.2)
     rubyzip (1.2.1)
-    safe_yaml (1.0.4)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
@@ -212,13 +212,12 @@ GEM
       molinillo (~> 0.4.2)
       semverse (~> 1.1)
     systemu (2.6.5)
-    test-kitchen (1.19.2)
+    test-kitchen (1.20.0)
       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)
-      safe_yaml (~> 1.0)
       thor (~> 0.19, < 0.19.2)
       winrm (~> 2.0)
       winrm-elevated (~> 1.0)
@@ -228,6 +227,7 @@ GEM
       hitimes
     toml-rb (1.1.1)
       citrus (~> 3.0, > 3.0)
+    tomlrb (1.2.6)
     varia_model (0.4.1)
       buff-extensions (~> 1.0)
       hashie (>= 2.0.2, < 4.0.0)
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 9698b2fe3e..228dcf6177 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -11,7 +11,7 @@ override "libyaml", version: "0.1.7"
 override "makedepend", version: "1.0.5"
 override "ncurses", version: "5.9"
 override "pkg-config-lite", version: "0.28-1"
-override "ruby", version: "2.3.5"
+override "ruby", version: "2.3.6"
 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"
diff --git a/version_policy.rb b/version_policy.rb
index b37952c23e..3441ec8138 100644
--- a/version_policy.rb
+++ b/version_policy.rb
@@ -33,7 +33,7 @@ OMNIBUS_OVERRIDES = {
   "makedepend" => "1.0.5",
   "ncurses" => "5.9",
   "pkg-config-lite" => "0.28-1",
-  "ruby" => "2.3.5",
+  "ruby" => "2.3.6",
   # Leave dev-kit pinned to 4.5 on 32-bit, because 4.7 is 20MB larger and we don't want
   # to unnecessarily make the client any fatter. (Since it's different between
   # 32 and 64, we have to do it in the project file still.)