Update all deps to current

Signed-off-by: Tim Smith <tsmith@chef.io>

3 files changed, 71 insertions, 63 deletions

diff --git a/Gemfile b/Gemfile
index 8b75e347f8..0c92c3034d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,6 +23,9 @@ end
 
 gem "cheffish", "~> 14"
 
+# avoid bringing in the new http 4 gem that comes with other ffi baggage which breaks builds
+gem "chef-telemetry", "=1.0.3"
+
 group(:omnibus_package) do
   gem "appbundler"
   gem "rb-readline"
diff --git a/Gemfile.lock b/Gemfile.lock
index 74f9efbcbe..77b2d4d54f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
 GIT
   remote: https://github.com/chef/chefstyle.git
-  revision: 274a01b0e3fc9a350962c3ea73005e2a0d3215f2
+  revision: d8b485c06560bffe507ba519137a5aceb8ee0ac8
   branch: master
   specs:
-    chefstyle (1.0.3)
-      rubocop (= 0.82.0)
+    chefstyle (1.0.5)
+      rubocop (= 0.83.0)
 
 GIT
   remote: https://github.com/chef/ohai.git
@@ -141,7 +141,7 @@ GEM
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.4)
-    byebug (11.1.2)
+    byebug (11.1.3)
     chef-telemetry (1.0.3)
       chef-config
       concurrent-ruby (~> 1.0)
@@ -174,7 +174,7 @@ GEM
     erubis (2.7.0)
     faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-    fauxhai-ng (8.0.0)
+    fauxhai-ng (8.2.0)
       net-ssh
     ffi (1.12.2)
     ffi (1.12.2-x64-mingw32)
@@ -190,7 +190,7 @@ GEM
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
-    hana (1.3.5)
+    hana (1.3.6)
     hashdiff (1.0.1)
     hashie (3.6.0)
     highline (1.7.10)
@@ -206,7 +206,7 @@ GEM
     http_parser.rb (0.6.0)
     httpclient (2.8.3)
     iniparse (1.5.0)
-    inspec-core (4.18.104)
+    inspec-core (4.18.114)
       addressable (~> 2.4)
       chef-telemetry (~> 1.0)
       faraday (>= 0.9.0)
@@ -214,12 +214,12 @@ GEM
       htmlentities (~> 4.3)
       json_schemer (~> 0.2.1)
       license-acceptance (>= 0.2.13, < 2.0)
-      method_source (~> 0.8)
+      method_source (>= 0.8, < 2.0)
       mixlib-log (~> 3.0)
       multipart-post (~> 2.0)
       parallel (~> 1.9)
       parslet (~> 1.5)
-      pry (~> 0)
+      pry (~> 0.13)
       rspec (~> 3.9)
       rspec-its (~> 1.2)
       rubyzip (~> 1.2, >= 1.2.2)
@@ -231,11 +231,10 @@ GEM
       train-core (~> 3.0)
       tty-prompt (~> 0.17)
       tty-table (~> 0.10)
-    inspec-core-bin (4.18.104)
-      inspec-core (= 4.18.104)
+    inspec-core-bin (4.18.114)
+      inspec-core (= 4.18.114)
     ipaddress (0.8.3)
     iso8601 (0.12.1)
-    jaro_winkler (1.5.4)
     json (2.3.0)
     json_schemer (0.2.11)
       ecma-re-validator (~> 0.2)
@@ -252,7 +251,7 @@ GEM
     logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
-    method_source (0.9.2)
+    method_source (1.0.0)
     mixlib-archive (1.0.5)
       mixlib-log
     mixlib-archive (1.0.5-universal-mingw32)
@@ -281,27 +280,27 @@ GEM
       net-ssh-gateway (>= 1.2.0)
     nori (2.6.0)
     parallel (1.19.1)
-    parser (2.7.1.1)
+    parser (2.7.1.2)
       ast (~> 2.4.0)
     parslet (1.8.2)
-    pastel (0.7.3)
+    pastel (0.7.4)
       equatable (~> 0.6)
       tty-color (~> 0.5)
     plist (3.5.0)
     proxifier (1.0.3)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.8.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
       byebug (~> 11.0)
-      pry (~> 0.10)
+      pry (~> 0.13.0)
     pry-remote (0.1.8)
       pry (~> 0.9)
       slop (~> 3.0)
     pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    public_suffix (4.0.4)
+    public_suffix (4.0.5)
     rack (2.2.2)
     rainbow (3.0.0)
     rake (12.3.3)
@@ -312,9 +311,9 @@ GEM
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-its (1.3.0)
@@ -323,12 +322,11 @@ GEM
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+    rspec-support (3.9.3)
     rspec_junit_formatter (0.2.3)
       builder (< 4)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.82.0)
-      jaro_winkler (~> 1.5.1)
+    rubocop (0.83.0)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
@@ -360,7 +358,7 @@ GEM
     term-ansicolor (1.7.1)
       tins (~> 1.0)
     thor (1.0.1)
-    tins (1.24.1)
+    tins (1.25.0)
       sync
     tomlrb (1.3.0)
     train-core (3.2.28)
@@ -446,7 +444,7 @@ GEM
       winrm (~> 2.0)
     wisper (2.0.1)
     wmi-lite (1.0.5)
-    yard (0.9.24)
+    yard (0.9.25)
 
 PLATFORMS
   ruby
@@ -459,6 +457,7 @@ DEPENDENCIES
   chef!
   chef-bin!
   chef-config!
+  chef-telemetry (= 1.0.3)
   chef-utils!
   chef-vault
   cheffish (~> 14)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 763dc49f2f..f1988e64f6 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -18,7 +18,7 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus-software
-  revision: 74e9d02cf7f9b164d67789a0a0a7e167143db6fb
+  revision: 1193dc710f66809eb4abd69ea29b23234527acc5
   branch: master
   specs:
     omnibus-software (4.0.0)
@@ -29,28 +29,28 @@ GEM
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    artifactory (3.0.12)
+    artifactory (3.0.13)
     awesome_print (1.8.0)
     aws-eventstream (1.1.0)
-    aws-partitions (1.310.0)
-    aws-sdk-core (3.94.1)
+    aws-partitions (1.319.0)
+    aws-sdk-core (3.96.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.30.0)
+    aws-sdk-kms (1.31.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.63.1)
-      aws-sdk-core (~> 3, >= 3.83.0)
+    aws-sdk-s3 (1.66.0)
+      aws-sdk-core (~> 3, >= 3.96.1)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.1.3)
       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.9)
+    bcrypt_pbkdf (1.1.0.rc1)
+    bcrypt_pbkdf (1.1.0.rc1-x64-mingw32)
+    bcrypt_pbkdf (1.1.0.rc1-x86-mingw32)
+    berkshelf (7.0.10)
       chef (>= 13.6.52)
       chef-config
       cleanroom (~> 1.0)
@@ -64,12 +64,13 @@ GEM
       solve (~> 4.0)
       thor (>= 0.20)
     builder (3.2.4)
-    chef (15.10.12)
+    chef (16.1.0)
       addressable
-      bcrypt_pbkdf (~> 1.0)
+      bcrypt_pbkdf (= 1.1.0.rc1)
       bundler (>= 1.10)
-      chef-config (= 15.10.12)
-      chef-utils (= 15.10.12)
+      chef-config (= 16.1.0)
+      chef-utils (= 16.1.0)
+      chef-vault
       chef-zero (>= 14.0.11)
       diff-lcs (~> 1.2, >= 1.2.4)
       ed25519 (~> 1.2)
@@ -77,7 +78,7 @@ GEM
       ffi (~> 1.9, >= 1.9.25)
       ffi-libarchive
       ffi-yajl (~> 2.2)
-      highline (>= 1.6.9, < 2)
+      highline (>= 1.6.9, < 3)
       iniparse (~> 1.4)
       license-acceptance (~> 1.0, >= 1.0.5)
       mixlib-archive (>= 0.4, < 2.0)
@@ -88,7 +89,8 @@ GEM
       net-sftp (~> 2.1, >= 2.1.2)
       net-ssh (>= 4.2, < 6)
       net-ssh-multi (~> 1.2, >= 1.2.1)
-      ohai (~> 15.0)
+      ohai (~> 16.0)
+      pastel
       plist (~> 3.2)
       proxifier (~> 1.0)
       syslog-logger (~> 1.6)
@@ -96,12 +98,13 @@ GEM
       train-winrm (>= 0.2.5)
       tty-screen (~> 0.6)
       uuidtools (~> 2.1.5)
-    chef (15.10.12-universal-mingw32)
+    chef (16.1.0-universal-mingw32)
       addressable
-      bcrypt_pbkdf (~> 1.0)
+      bcrypt_pbkdf (= 1.1.0.rc1)
       bundler (>= 1.10)
-      chef-config (= 15.10.12)
-      chef-utils (= 15.10.12)
+      chef-config (= 16.1.0)
+      chef-utils (= 16.1.0)
+      chef-vault
       chef-zero (>= 14.0.11)
       diff-lcs (~> 1.2, >= 1.2.4)
       ed25519 (~> 1.2)
@@ -109,7 +112,7 @@ GEM
       ffi (~> 1.9, >= 1.9.25)
       ffi-libarchive
       ffi-yajl (~> 2.2)
-      highline (>= 1.6.9, < 2)
+      highline (>= 1.6.9, < 3)
       iniparse (~> 1.4)
       iso8601 (~> 0.12.1)
       license-acceptance (~> 1.0, >= 1.0.5)
@@ -121,7 +124,8 @@ GEM
       net-sftp (~> 2.1, >= 2.1.2)
       net-ssh (>= 4.2, < 6)
       net-ssh-multi (~> 1.2, >= 1.2.1)
-      ohai (~> 15.0)
+      ohai (~> 16.0)
+      pastel
       plist (~> 3.2)
       proxifier (~> 1.0)
       syslog-logger (~> 1.6)
@@ -141,15 +145,16 @@ GEM
       win32-taskscheduler (~> 2.0)
       wmi-lite (~> 1.0)
     chef-cleanroom (1.0.2)
-    chef-config (15.10.12)
+    chef-config (16.1.0)
       addressable
-      chef-utils (= 15.10.12)
+      chef-utils (= 16.1.0)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
       tomlrb (~> 1.2)
     chef-sugar (5.1.9)
-    chef-utils (15.10.12)
+    chef-utils (16.1.0)
+    chef-vault (4.0.1)
     chef-zero (15.0.0)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 5.0)
@@ -181,7 +186,7 @@ GEM
     gyoku (1.3.1)
       builder (>= 2.1.2)
     hashie (4.1.0)
-    highline (1.7.10)
+    highline (2.0.3)
     httpclient (2.8.3)
     iniparse (1.5.0)
     iostruct (0.0.4)
@@ -242,8 +247,9 @@ GEM
     octokit (4.18.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (15.9.1)
-      chef-config (>= 12.8, < 16)
+    ohai (16.1.1)
+      chef-config (>= 12.8, < 17)
+      chef-utils (>= 16.0, < 17)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
       ipaddress
@@ -254,7 +260,7 @@ GEM
       plist (~> 3.1)
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
-    pastel (0.7.3)
+    pastel (0.7.4)
       equatable (~> 0.6)
       tty-color (~> 0.5)
     pedump (0.5.4)
@@ -267,7 +273,7 @@ GEM
     plist (3.5.0)
     progressbar (1.10.1)
     proxifier (1.0.3)
-    public_suffix (4.0.4)
+    public_suffix (4.0.5)
     rack (2.2.2)
     rainbow (3.0.0)
     retryable (3.0.5)
@@ -289,14 +295,14 @@ GEM
     structured_warnings (0.4.0)
     syslog-logger (1.6.8)
     systemu (2.6.5)
-    test-kitchen (2.4.0)
+    test-kitchen (2.5.1)
       bcrypt_pbkdf (~> 1.0)
       ed25519 (~> 1.2)
       license-acceptance (~> 1.0, >= 1.0.11)
       mixlib-install (~> 3.6)
       mixlib-shellout (>= 1.2, < 4.0)
-      net-scp (>= 1.1, < 3.0)
-      net-ssh (>= 2.9, < 6.0)
+      net-scp (>= 1.1, < 4.0)
+      net-ssh (>= 2.9, < 7.0)
       net-ssh-gateway (>= 1.2, < 3.0)
       thor (~> 0.19)
       winrm (~> 2.0)