Merge pull request #9803 from chef/expeditor/inspec-core_4.18.111

Bump inspec-core to 4.18.111

2 files changed, 36 insertions, 31 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index e177ab5689..bacd049a28 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,10 +8,10 @@ GIT
 
 GIT
   remote: https://github.com/chef/ohai.git
-  revision: 45dff3307b8509dd52e1432c4ff1c2a6c43f316b
+  revision: 1d3b0b74a8a7c5244878c8b8f46946a1d2205641
   branch: master
   specs:
-    ohai (16.0.20)
+    ohai (16.1.0)
       chef-config (>= 12.8, < 17)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
@@ -209,7 +209,7 @@ GEM
     http_parser.rb (0.6.0)
     httpclient (2.8.3)
     iniparse (1.5.0)
-    inspec-core (4.18.108)
+    inspec-core (4.18.111)
       addressable (~> 2.4)
       chef-telemetry (~> 1.0)
       faraday (>= 0.9.0)
@@ -234,8 +234,8 @@ GEM
       train-core (~> 3.0)
       tty-prompt (~> 0.17)
       tty-table (~> 0.10)
-    inspec-core-bin (4.18.108)
-      inspec-core (= 4.18.108)
+    inspec-core-bin (4.18.111)
+      inspec-core (= 4.18.111)
     ipaddress (0.8.3)
     iso8601 (0.12.1)
     jaro_winkler (1.5.4)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index e48cf6e0c7..459bf25ea0 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -18,7 +18,7 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus-software
-  revision: 8f5fafe1dff1e3f6d7fa92d79b6e42e82bd8a097
+  revision: 8f4f31ca9548c18808b038975f957351ec40dfd5
   branch: master
   specs:
     omnibus-software (4.0.0)
@@ -32,7 +32,7 @@ GEM
     artifactory (3.0.12)
     awesome_print (1.8.0)
     aws-eventstream (1.1.0)
-    aws-partitions (1.309.0)
+    aws-partitions (1.310.0)
     aws-sdk-core (3.94.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
@@ -47,9 +47,9 @@ GEM
       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)
+    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
@@ -64,12 +64,13 @@ GEM
       solve (~> 4.0)
       thor (>= 0.20)
     builder (3.2.4)
-    chef (15.10.12)
+    chef (16.0.275)
       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.0.275)
+      chef-utils (= 16.0.275)
+      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.0.275-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.0.275)
+      chef-utils (= 16.0.275)
+      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.0.275)
       addressable
-      chef-utils (= 15.10.12)
+      chef-utils (= 16.0.275)
       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.0.275)
+    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,8 @@ 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.0.20)
+      chef-config (>= 12.8, < 17)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
       ipaddress
@@ -289,14 +294,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.0)
       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)