Merge pull request #13550 from chef/neha-p6/INFC-430_fix_license_scout

[Chef-16]Update dependencies for chef and chef/omnibus

3 files changed, 83 insertions, 59 deletions

diff --git a/Gemfile b/Gemfile
index 0d8988e841..efe31465cc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -42,15 +42,15 @@ group(:omnibus_package) do
   gem "chef-vault"
 end
 
-# Why are we installing debugging tools? DENIED.... commenting out because of version conflicts
-# group(:omnibus_package, :pry) do
-#   # Locked because pry-byebug is broken with 13+
-#   # some work is ongoing? https://github.com/deivid-rodriguez/pry-byebug/issues/343
-#   gem "pry", "= 0.13.0"
-#   # byebug does not install on freebsd on ruby 3.0
-#   gem "pry-byebug" unless RUBY_PLATFORM =~ /freebsd/i
-#   gem "pry-stack_explorer"
-# end
+group(:omnibus_package, :pry) do
+  # Locked because pry-byebug is broken with 13+
+  # some work is ongoing? https://github.com/deivid-rodriguez/pry-byebug/issues/343
+  gem "pry", "= 0.13.0"
+  # byebug does not install on freebsd on ruby 3.0
+  # This is the last version compatible for ruby2.6, which is used at linting step
+  gem "pry-byebug", "~> 3.9.0" unless RUBY_PLATFORM =~ /freebsd/i
+  gem "pry-stack_explorer"
+end
 
 # Everything except AIX
 group(:ruby_prof) do
diff --git a/Gemfile.lock b/Gemfile.lock
index 13ba0da57e..263255a513 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/chef/ohai.git
-  revision: 4df568953f07d5b9936be8931a946334df7d37be
+  revision: 2aa632521141c81fabecb32b82842e6089e317bd
   branch: 16-stable
   specs:
-    ohai (16.17.0)
+    ohai (16.17.2)
       chef-config (>= 14.12, < 17)
       chef-utils (>= 16.0, < 17)
       ffi (~> 1.9)
@@ -156,7 +156,10 @@ GEM
     bcrypt_pbkdf (1.1.0)
     bcrypt_pbkdf (1.1.0-x64-mingw32)
     bcrypt_pbkdf (1.1.0-x86-mingw32)
+    binding_of_caller (1.0.0)
+      debug_inspector (>= 0.0.1)
     builder (3.2.4)
+    byebug (11.1.3)
     chef-powershell (1.0.13)
       ffi (~> 1.15)
       ffi-yajl (~> 2.4)
@@ -177,20 +180,31 @@ GEM
     chefstyle (1.5.9)
       rubocop (= 1.7.0)
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.0)
     crack (0.4.5)
       rexml
+    debug_inspector (1.1.0)
     diff-lcs (1.3)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     ed25519 (1.3.0)
     erubi (1.12.0)
     erubis (2.7.0)
-    faraday (1.3.1)
+    faraday (1.4.3)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
       faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
     faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday_middleware (1.2.0)
+      faraday (~> 1.0)
     fauxhai-ng (9.3.0)
       net-ssh
     ffi (1.15.5)
@@ -210,25 +224,26 @@ GEM
       rexml (~> 3.0)
     hashdiff (1.0.1)
     hashie (4.1.0)
-    highline (2.0.3)
+    highline (2.1.0)
     http-accept (1.7.0)
     http-cookie (1.0.5)
       domain_name (~> 0.5)
     httpclient (2.8.3)
     iniparse (1.5.0)
-    inspec-core (4.24.32)
+    inspec-core (4.56.20)
       addressable (~> 2.4)
-      chef-telemetry (~> 1.0)
-      faraday (>= 0.9.0, < 1.4)
+      chef-telemetry (~> 1.0, >= 1.0.8)
+      faraday (>= 0.9.0, < 1.5)
+      faraday_middleware (~> 1.0)
       hashie (>= 3.4, < 5.0)
       license-acceptance (>= 0.2.13, < 3.0)
       method_source (>= 0.8, < 2.0)
       mixlib-log (~> 3.0)
       multipart-post (~> 2.0)
       parallel (~> 1.9)
-      parslet (>= 1.5, < 3.0)
+      parslet (>= 1.5, < 2.0)
       pry (~> 0.13)
-      rspec (~> 3.10)
+      rspec (>= 3.9, <= 3.11)
       rspec-its (~> 1.2)
       rubyzip (>= 1.2.2, < 3.0)
       semverse (~> 3.0)
@@ -238,8 +253,8 @@ GEM
       train-core (~> 3.0)
       tty-prompt (~> 0.17)
       tty-table (~> 0.10)
-    inspec-core-bin (4.24.32)
-      inspec-core (= 4.24.32)
+    inspec-core-bin (4.56.20)
+      inspec-core (= 4.56.20)
     ipaddress (0.8.3)
     iso8601 (0.13.0)
     json (2.6.3)
@@ -274,7 +289,7 @@ GEM
       win32-process (~> 0.9)
       wmi-lite (~> 1.0)
     multi_json (1.15.0)
-    multipart-post (2.2.3)
+    multipart-post (2.3.0)
     net-scp (2.0.0)
       net-ssh (>= 2.6.5, < 6.0.0)
     net-sftp (3.0.0)
@@ -288,39 +303,45 @@ GEM
     netrc (0.11.0)
     nori (2.6.0)
     parallel (1.22.1)
-    parser (3.1.3.0)
+    parser (3.2.0.0)
       ast (~> 2.4.1)
-    parslet (2.0.0)
+    parslet (1.8.2)
     pastel (0.8.0)
       tty-color (~> 0.5)
     plist (3.6.0)
     proxifier (1.0.3)
-    pry (0.14.1)
+    pry (0.13.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
+    pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
+    pry-stack_explorer (0.6.1)
+      binding_of_caller (~> 1.0)
+      pry (~> 0.13)
     public_suffix (5.0.1)
-    rack (2.2.5)
+    rack (2.2.6.2)
     rainbow (3.1.1)
     rake (13.0.6)
     rb-readline (0.5.5)
-    regexp_parser (2.6.1)
+    regexp_parser (2.6.2)
     rexml (3.2.5)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.1)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
+      rspec-support (~> 3.11.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.12.1)
+    rspec-mocks (3.11.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.1)
     rubocop (1.7.0)
       parallel (~> 1.10)
       parser (>= 2.7.1.5)
@@ -330,7 +351,7 @@ GEM
       rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.24.0)
+    rubocop-ast (1.24.1)
       parser (>= 3.1.1.0)
     ruby-prof (1.2.0)
     ruby-progressbar (1.11.0)
@@ -388,7 +409,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    webrick (1.7.0)
+    webrick (1.8.1)
     win32-api (1.5.3-universal-mingw32)
     win32-certstore (0.5.3)
       ffi
@@ -452,6 +473,9 @@ DEPENDENCIES
   ffi (>= 1.15)
   inspec-core-bin (~> 4.24)
   ohai!
+  pry (= 0.13.0)
+  pry-byebug (~> 3.9.0)
+  pry-stack_explorer
   rake
   rb-readline
   rest-client!
@@ -463,4 +487,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.1.4
+   2.3.7
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index d31eef4343..30db03e984 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,17 +1,17 @@
 GIT
   remote: https://github.com/chef/omnibus-software.git
-  revision: ab0afc4a658b63708f166f96576f3015376a0810
+  revision: db8acc3fa5baaee33eeefc0ae47c11d9cf0be2b5
   branch: main
   specs:
-    omnibus-software (23.1.274)
+    omnibus-software (23.1.280)
       omnibus (>= 9.0.0)
 
 GIT
   remote: https://github.com/chef/omnibus.git
-  revision: 52b6d2e08bc2c90592b99da41a1728fb1629f673
+  revision: c66e97c211a60296e58da100d79d048974e13904
   branch: main
   specs:
-    omnibus (9.0.12)
+    omnibus (9.0.14)
       aws-sdk-s3 (~> 1.116.0)
       chef-cleanroom (~> 1.0)
       chef-utils (>= 15.4)
@@ -34,8 +34,8 @@ GEM
     artifactory (3.0.15)
     awesome_print (1.9.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.695.0)
-    aws-sdk-core (3.169.0)
+    aws-partitions (1.704.0)
+    aws-sdk-core (3.170.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
@@ -47,7 +47,7 @@ GEM
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sdk-secretsmanager (1.67.0)
+    aws-sdk-secretsmanager (1.72.0)
       aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.5.2)
@@ -170,13 +170,13 @@ GEM
     citrus (3.0.2)
     cleanroom (1.0.0)
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.0)
     contracts (0.16.1)
     corefoundation (0.3.13)
       ffi (>= 1.15.0)
     diff-lcs (1.5.0)
     ed25519 (1.3.0)
-    erubi (1.11.0)
+    erubi (1.12.0)
     erubis (2.7.0)
     faraday (1.4.3)
       faraday-em_http (~> 1.0)
@@ -240,7 +240,7 @@ GEM
     iso8601 (0.13.0)
     jmespath (1.6.2)
     json (2.6.3)
-    kitchen-vagrant (1.12.1)
+    kitchen-vagrant (1.13.0)
       test-kitchen (>= 1.4, < 4)
     libyajl2 (2.1.0)
     license-acceptance (2.1.13)
@@ -248,7 +248,7 @@ GEM
       tomlrb (>= 1.2, < 3.0)
       tty-box (~> 0.6)
       tty-prompt (~> 0.20)
-    license_scout (1.3.3)
+    license_scout (1.3.4)
       ffi-yajl (~> 2.2)
       mixlib-shellout (>= 2.2, < 4.0)
       toml-rb (>= 1, < 3)
@@ -266,7 +266,7 @@ GEM
     mixlib-cli (2.1.8)
     mixlib-config (3.0.27)
       tomlrb
-    mixlib-install (3.12.20)
+    mixlib-install (3.12.27)
       mixlib-shellout
       mixlib-versioning
       thor
@@ -286,7 +286,7 @@ GEM
     mixlib-versioning (1.2.12)
     molinillo (0.8.0)
     multi_json (1.15.0)
-    multipart-post (2.2.3)
+    multipart-post (2.3.0)
     net-scp (4.0.0)
       net-ssh (>= 2.6.5, < 8.0.0)
     net-sftp (4.0.0.rc1)
@@ -323,11 +323,11 @@ GEM
       zhexdump (>= 0.0.2)
     plist (3.6.0)
     proxifier (1.0.3)
-    pry (0.14.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (5.0.1)
-    rack (2.2.4)
+    rack (2.2.6.2)
     rainbow (3.1.1)
     retryable (3.0.5)
     rexml (3.2.5)
@@ -366,7 +366,7 @@ GEM
     strings-ansi (0.2.0)
     structured_warnings (0.4.0)
     syslog-logger (1.6.8)
-    test-kitchen (3.4.0)
+    test-kitchen (3.5.0)
       bcrypt_pbkdf (~> 1.0)
       chef-utils (>= 16.4.35)
       ed25519 (~> 1.2)
@@ -413,12 +413,12 @@ GEM
       pastel (~> 0.8)
       strings (~> 0.2.0)
       tty-screen (~> 0.8)
-    unicode-display_width (2.3.0)
+    unicode-display_width (2.4.2)
     unicode_utils (1.4.0)
     uuidtools (2.2.0)
     vault (0.17.0)
       aws-sigv4
-    webrick (1.7.0)
+    webrick (1.8.1)
     win32-api (1.5.3-universal-mingw32)
     win32-certstore (0.6.15)
       chef-powershell (>= 1.0.12)