From db03fd99d87728f2c4ada2714e99e07b8acad91f Mon Sep 17 00:00:00 2001
From: nikhil2611 <nikhilgupta2102@gmail.com>
Date: Sun, 15 Dec 2024 01:15:57 +0530
Subject: [PATCH] updating chef and knife to 18.6.2 in omnibus gemfile.lock

Signed-off-by: nikhil2611 <nikhilgupta2102@gmail.com>
---
 components/gems/Gemfile.lock |  2 +-
 omnibus/Gemfile.lock         | 81 ++++++++++++++++++------------------
 2 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/components/gems/Gemfile.lock b/components/gems/Gemfile.lock
index d570a3b91..f1c553830 100644
--- a/components/gems/Gemfile.lock
+++ b/components/gems/Gemfile.lock
@@ -850,7 +850,7 @@ GEM
     mixlib-archive (1.1.7)
       mixlib-log
     mixlib-archive (1.1.7-universal-mingw32)
-      mixlib-log  
+      mixlib-log
     mixlib-authentication (3.0.10)
     mixlib-cli (2.1.8)
     mixlib-config (3.0.27)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 35c867a4b..274a566da 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/chef/omnibus-software.git
-  revision: dd171125b10e9a457090cc20165ee4ecf2e0d51d
+  revision: b97bb4e3e1319ca1c06b1a06f1f6354d3514ff51
   branch: main
   specs:
     omnibus-software (24.6.323)
@@ -35,13 +35,13 @@ GEM
     ast (2.4.2)
     awesome_print (1.9.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.1002.0)
-    aws-sdk-core (3.212.0)
+    aws-partitions (1.1023.0)
+    aws-sdk-core (3.214.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.95.0)
+    aws-sdk-kms (1.96.0)
       aws-sdk-core (~> 3, >= 3.210.0)
       aws-sigv4 (~> 1.5)
     aws-sdk-s3 (1.116.0)
@@ -55,33 +55,34 @@ GEM
       aws-eventstream (~> 1, >= 1.0.2)
     base64 (0.2.0)
     bcrypt_pbkdf (1.1.1)
-    berkshelf (8.0.9)
-      chef (>= 15.7.32)
+    berkshelf (8.0.15)
+      chef (>= 18.0.0)
+      chef-cleanroom (~> 1.0)
       chef-config
-      cleanroom (~> 1.0)
       concurrent-ruby (~> 1.0)
-      minitar (>= 0.6)
+      ffi (~> 1.9, < 1.16.0)
+      minitar (~> 1.0)
       mixlib-archive (>= 1.1.4, < 2.0)
       mixlib-config (>= 2.2.5)
       mixlib-shellout (>= 2.0, < 4.0)
-      octokit (~> 4.0)
+      octokit (>= 4.0, < 6.0)
       retryable (>= 2.0, < 4.0)
       solve (~> 4.0)
-      thor (>= 0.20)
+      thor (>= 0.20, < 1.3.0)
     bigdecimal (3.1.8)
     builder (3.3.0)
-    chef (18.5.0)
+    chef (18.6.2)
       addressable
       aws-sdk-s3 (~> 1.91)
       aws-sdk-secretsmanager (~> 1.46)
-      chef-config (= 18.5.0)
-      chef-utils (= 18.5.0)
+      chef-config (= 18.6.2)
+      chef-utils (= 18.6.2)
       chef-vault
       chef-zero (>= 14.0.11)
       corefoundation (~> 0.3.4)
       diff-lcs (>= 1.2.4, < 1.6.0, != 1.4.0)
       erubis (~> 2.7)
-      ffi (>= 1.15.5)
+      ffi (>= 1.15.5, <= 1.16.3)
       ffi-libarchive (~> 1.0, >= 1.0.3)
       ffi-yajl (~> 2.2)
       iniparse (~> 1.4)
@@ -98,25 +99,25 @@ GEM
       plist (~> 3.2)
       proxifier2 (~> 1.1)
       syslog-logger (~> 1.6)
-      train-core (~> 3.10)
+      train-core (~> 3.10, <= 3.12.7)
       train-rest (>= 0.4.1)
       train-winrm (>= 0.2.5)
       unf_ext (~> 0.0.8.2)
       uuidtools (>= 2.1.5, < 3.0)
       vault (~> 0.18.2)
-    chef (18.5.0-x64-mingw-ucrt)
+    chef (18.6.2-x64-mingw-ucrt)
       addressable
       aws-sdk-s3 (~> 1.91)
       aws-sdk-secretsmanager (~> 1.46)
-      chef-config (= 18.5.0)
+      chef-config (= 18.6.2)
       chef-powershell (~> 18.1.0)
-      chef-utils (= 18.5.0)
+      chef-utils (= 18.6.2)
       chef-vault
       chef-zero (>= 14.0.11)
       corefoundation (~> 0.3.4)
       diff-lcs (>= 1.2.4, < 1.6.0, != 1.4.0)
       erubis (~> 2.7)
-      ffi (>= 1.15.5)
+      ffi (>= 1.15.5, <= 1.16.3)
       ffi-libarchive (~> 1.0, >= 1.0.3)
       ffi-yajl (~> 2.2)
       iniparse (~> 1.4)
@@ -134,7 +135,7 @@ GEM
       plist (~> 3.2)
       proxifier2 (~> 1.1)
       syslog-logger (~> 1.6)
-      train-core (~> 3.10)
+      train-core (~> 3.10, <= 3.12.7)
       train-rest (>= 0.4.1)
       train-winrm (>= 0.2.5)
       unf_ext (~> 0.0.8.2)
@@ -151,9 +152,9 @@ GEM
       win32-taskscheduler (~> 2.0)
       wmi-lite (~> 1.0)
     chef-cleanroom (1.0.5)
-    chef-config (18.5.0)
+    chef-config (18.6.2)
       addressable
-      chef-utils (= 18.5.0)
+      chef-utils (= 18.6.2)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
@@ -164,7 +165,7 @@ GEM
     chef-telemetry (1.1.1)
       chef-config
       concurrent-ruby (~> 1.0)
-    chef-utils (18.5.0)
+    chef-utils (18.6.2)
       concurrent-ruby
     chef-vault (4.1.11)
     chef-zero (15.0.11)
@@ -183,20 +184,20 @@ GEM
       rubocop (= 1.25.1)
     corefoundation (0.3.13)
       ffi (>= 1.15.0)
-    date (3.4.0)
+    date (3.4.1)
     diff-lcs (1.5.1)
     domain_name (0.6.20240107)
     ed25519 (1.3.0)
     erubi (1.13.0)
     erubis (2.7.0)
-    faraday (2.12.0)
-      faraday-net_http (>= 2.0, < 3.4)
+    faraday (2.12.2)
+      faraday-net_http (>= 2.0, < 3.5)
       json
       logger
     faraday-follow_redirects (0.3.0)
       faraday (>= 1, < 3)
-    faraday-net_http (3.3.0)
-      net-http
+    faraday-net_http (3.4.0)
+      net-http (>= 0.5.0)
     ffi (1.16.3)
     ffi (1.16.3-x64-mingw-ucrt)
     ffi (1.16.3-x64-mingw32)
@@ -215,11 +216,11 @@ GEM
       rexml (~> 3.0)
     hashie (4.1.0)
     http-accept (1.7.0)
-    http-cookie (1.0.7)
+    http-cookie (1.0.8)
       domain_name (~> 0.5)
     httpclient (2.8.3)
     iniparse (1.5.0)
-    inspec-core (5.22.58)
+    inspec-core (5.22.65)
       addressable (~> 2.4)
       chef-telemetry (~> 1.0, >= 1.0.8)
       cookstyle
@@ -247,7 +248,7 @@ GEM
     ipaddress (0.8.3)
     iso8601 (0.13.0)
     jmespath (1.6.2)
-    json (2.8.1)
+    json (2.9.0)
     kitchen-vagrant (2.0.1)
       test-kitchen (>= 1.4, < 4)
     libyajl2 (2.1.0)
@@ -261,7 +262,7 @@ GEM
       mixlib-shellout (>= 2.2, < 4.0)
       toml-rb (>= 1, < 3)
     little-plugger (1.1.4)
-    logger (1.6.1)
+    logger (1.6.3)
     logging (2.4.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.14)
@@ -269,7 +270,7 @@ GEM
     mime-types (3.6.0)
       logger
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.1105)
+    mime-types-data (3.2024.1203)
     minitar (1.0.2)
     mixlib-archive (1.1.7)
       mixlib-log
@@ -304,7 +305,7 @@ GEM
     net-ftp (0.3.8)
       net-protocol
       time
-    net-http (0.5.0)
+    net-http (0.6.0)
       uri
     net-protocol (0.2.2)
       timeout
@@ -318,7 +319,7 @@ GEM
     netrc (0.11.0)
     nori (2.7.1)
       bigdecimal
-    octokit (4.25.1)
+    octokit (5.6.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     ohai (18.1.18)
@@ -349,14 +350,14 @@ GEM
       zhexdump (>= 0.0.2)
     plist (3.7.1)
     proxifier2 (1.1.0)
-    pry (0.14.2)
+    pry (0.15.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (6.0.1)
     racc (1.8.1)
     rack (2.2.10)
     rainbow (3.1.1)
-    regexp_parser (2.9.2)
+    regexp_parser (2.9.3)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
@@ -401,7 +402,7 @@ GEM
       rubocop-ast (>= 1.15.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.34.1)
+    rubocop-ast (1.37.0)
       parser (>= 3.3.1.0)
     ruby-progressbar (1.13.0)
     rubyntlm (0.6.5)
@@ -480,11 +481,11 @@ GEM
     unf_ext (0.0.8.2-x64-mingw-ucrt)
     unicode-display_width (2.6.0)
     unicode_utils (1.4.0)
-    uri (1.0.1)
+    uri (1.0.2)
     uuidtools (2.2.0)
     vault (0.18.2)
       aws-sigv4
-    webrick (1.9.0)
+    webrick (1.9.1)
     win32-api (1.10.1-universal-mingw32)
     win32-certstore (0.6.16)
       chef-powershell