From 0632c9309474b805f58ff59c4629c08f6e0bc689 Mon Sep 17 00:00:00 2001
From: Tim Smith <tsmith84@gmail.com>
Date: Fri, 18 Dec 2020 13:00:20 -0800
Subject: Bump Chef Infra to 17

Bump the version to 17 and allow for Ohai 17

Signed-off-by: Tim Smith <tsmith@chef.io>
---
 Gemfile.lock         | 16 ++++++++--------
 VERSION              |  2 +-
 chef.gemspec         |  2 +-
 omnibus/Gemfile.lock |  8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 293bd11cfa..3235f097f4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,12 +8,12 @@ GIT
 
 GIT
   remote: https://github.com/chef/ohai.git
-  revision: 1ad8c5946606a7f08ffb841e3682ae2d4991077f
+  revision: e1b27c497fb3409d7dab49fbf115c8b0a70c1403
   branch: master
   specs:
-    ohai (16.8.1)
-      chef-config (>= 12.8, < 17)
-      chef-utils (>= 16.0, < 17)
+    ohai (17.0.0)
+      chef-config (>= 12.8, < 18)
+      chef-utils (>= 16.0, < 18)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
       ipaddress
@@ -54,7 +54,7 @@ PATH
       net-sftp (>= 2.1.2, < 4.0)
       net-ssh (>= 5.1, < 7)
       net-ssh-multi (~> 1.2, >= 1.2.1)
-      ohai (~> 16.0)
+      ohai (~> 17.0)
       pastel
       plist (~> 3.2)
       proxifier (~> 1.0)
@@ -92,7 +92,7 @@ PATH
       net-sftp (>= 2.1.2, < 4.0)
       net-ssh (>= 5.1, < 7)
       net-ssh-multi (~> 1.2, >= 1.2.1)
-      ohai (~> 16.0)
+      ohai (~> 17.0)
       pastel
       plist (~> 3.2)
       proxifier (~> 1.0)
@@ -223,7 +223,7 @@ GEM
       inspec-core (= 4.24.8)
     ipaddress (0.8.3)
     iso8601 (0.13.0)
-    json (2.4.0)
+    json (2.4.1)
     libyajl2 (1.2.0)
     license-acceptance (2.1.13)
       pastel (~> 0.7)
@@ -363,7 +363,7 @@ GEM
     unicode-display_width (1.7.0)
     unicode_utils (1.4.0)
     uuidtools (2.1.5)
-    webmock (3.10.0)
+    webmock (3.11.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
diff --git a/VERSION b/VERSION
index b2377c6edc..7d31a2a0d2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.9.2
\ No newline at end of file
+17.0.0
\ No newline at end of file
diff --git a/chef.gemspec b/chef.gemspec
index 876ee3f513..a41dffa741 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency "mixlib-authentication", ">= 2.1", "< 4"
   s.add_dependency "mixlib-shellout", ">= 3.1.1", "< 4.0"
   s.add_dependency "mixlib-archive", ">= 0.4", "< 2.0"
-  s.add_dependency "ohai", "~> 16.0"
+  s.add_dependency "ohai", "~> 17.0"
   s.add_dependency "inspec-core", "~> 4.23"
 
   s.add_dependency "ffi", ">= 1.9.25"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 228db504f0..412dcba213 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -18,7 +18,7 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus-software
-  revision: aa93b0f3c21f75508b28c1c1e016b1aa11ecf3a9
+  revision: 457df26b59259183d2918e802ffb79de9a134e27
   branch: master
   specs:
     omnibus-software (4.0.0)
@@ -32,13 +32,13 @@ GEM
     artifactory (3.0.15)
     awesome_print (1.8.0)
     aws-eventstream (1.1.0)
-    aws-partitions (1.407.0)
+    aws-partitions (1.410.0)
     aws-sdk-core (3.110.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.39.0)
+    aws-sdk-kms (1.40.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-s3 (1.86.2)
@@ -195,7 +195,7 @@ GEM
     ipaddress (0.8.3)
     iso8601 (0.13.0)
     jmespath (1.4.0)
-    json (2.4.0)
+    json (2.4.1)
     kitchen-vagrant (1.7.2)
       test-kitchen (>= 1.4, < 3)
     libyajl2 (1.2.0)
-- 
cgit v1.2.1