Chef16 artifacts are now built with ruby31 using omnibus. Update the rake task used to update dependencies for omnibus to support platform x64-mingw-ucrt for ruby31. Update the dependencies for omnibus now that ruby31 platform is added to pull in correct gems

Fix linting

Point to omnibus-software temporary branch

Fix linting

Fix typo

Revert temporary change added to point omnibus to a development branch

Signed-off-by: Neha Pansare <neha.pansare@progress.com>

3 files changed, 48 insertions, 38 deletions

diff --git a/cspell.json b/cspell.json
index 8903f1b440..4b5fd2379e 100644
--- a/cspell.json
+++ b/cspell.json
@@ -1318,6 +1318,7 @@
     "ucanhaz",
     "UCHAR",
     "uchar",
+    "ucrt",
     "udiff",
     "UHALF",
     "ULONG",
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 1d48a96ff8..644733a9a0 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/chef/omnibus-software.git
-  revision: a63bd71702f5bf350ca17ee0726ac36fc418d54e
+  revision: e9632cb92ae2649d61fd2f3329a9f68cd0d7f7cb
   branch: main
   specs:
     omnibus-software (4.0.0)
@@ -34,26 +34,26 @@ GEM
     artifactory (3.0.15)
     awesome_print (1.9.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.648.0)
-    aws-sdk-core (3.162.0)
+    aws-partitions (1.653.0)
+    aws-sdk-core (3.166.0)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.525.0)
-      aws-sigv4 (~> 1.1)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.58.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-kms (1.59.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.115.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-s3 (1.117.1)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sdk-secretsmanager (1.60.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-secretsmanager (1.67.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.5.2)
       aws-eventstream (~> 1, >= 1.0.2)
     bcrypt_pbkdf (1.1.0)
-    berkshelf (8.0.0)
+    berkshelf (8.0.5)
       chef (>= 15.7.32)
       chef-config
       cleanroom (~> 1.0)
@@ -174,7 +174,7 @@ GEM
       ffi (>= 1.15.0)
     diff-lcs (1.5.0)
     ed25519 (1.3.0)
-    erubi (1.10.0)
+    erubi (1.11.0)
     erubis (2.7.0)
     faraday (1.4.3)
       faraday-em_http (~> 1.0)
@@ -238,7 +238,7 @@ GEM
     iso8601 (0.13.0)
     jmespath (1.6.1)
     json (2.6.2)
-    kitchen-vagrant (1.11.0)
+    kitchen-vagrant (1.12.1)
       test-kitchen (>= 1.4, < 4)
     libyajl2 (2.1.0)
     license-acceptance (2.1.13)
@@ -251,7 +251,7 @@ GEM
       mixlib-shellout (>= 2.2, < 4.0)
       toml-rb (>= 1, < 3)
     little-plugger (1.1.4)
-    logging (2.3.0)
+    logging (2.3.1)
       little-plugger (~> 1.1)
       multi_json (~> 1.14)
     method_source (1.0.0)
@@ -264,7 +264,7 @@ GEM
     mixlib-cli (2.1.8)
     mixlib-config (3.0.27)
       tomlrb
-    mixlib-install (3.12.16)
+    mixlib-install (3.12.20)
       mixlib-shellout
       mixlib-versioning
       thor
@@ -276,21 +276,26 @@ GEM
       ffi-win32-extensions (~> 1.0.3)
       win32-process (~> 0.9)
       wmi-lite (~> 1.0)
+    mixlib-shellout (3.2.7-x64-mingw-ucrt)
+      chef-utils
+      ffi-win32-extensions (~> 1.0.3)
+      win32-process (~> 0.9)
+      wmi-lite (~> 1.0)
     mixlib-versioning (1.2.12)
     molinillo (0.8.0)
     multi_json (1.15.0)
     multipart-post (2.2.3)
-    net-scp (3.0.0)
-      net-ssh (>= 2.6.5, < 7.0.0)
-    net-sftp (3.0.0)
-      net-ssh (>= 5.0.0, < 7.0.0)
-    net-ssh (6.1.0)
+    net-scp (4.0.0)
+      net-ssh (>= 2.6.5, < 8.0.0)
+    net-sftp (4.0.0.rc1)
+      net-ssh (>= 5.0.0, < 8.0.0)
+    net-ssh (7.0.1)
     net-ssh-gateway (2.0.0)
       net-ssh (>= 4.0.0)
     nori (2.6.0)
-    octokit (4.22.0)
-      faraday (>= 0.9)
-      sawyer (~> 0.8.0, >= 0.5.3)
+    octokit (4.25.1)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
     ohai (17.9.0)
       chef-config (>= 14.12, < 18)
       chef-utils (>= 16.0, < 18)
@@ -320,7 +325,7 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (5.0.0)
-    rack (2.2.3)
+    rack (2.2.4)
     rainbow (3.1.1)
     retryable (3.0.5)
     rexml (3.2.5)
@@ -330,24 +335,24 @@ GEM
       rspec-mocks (~> 3.11.0)
     rspec-core (3.11.0)
       rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec-expectations (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.11.1)
+    rspec-mocks (3.11.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
+    rspec-support (3.11.1)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
     rubyntlm (0.6.3)
     rubyzip (2.3.2)
-    sawyer (0.8.2)
+    sawyer (0.9.2)
       addressable (>= 2.3.5)
-      faraday (> 0.8, < 2.0)
-    semverse (3.0.0)
+      faraday (>= 0.17.3, < 3)
+    semverse (3.0.2)
     solve (4.0.4)
       molinillo (~> 0.6)
       semverse (>= 1.1, < 4.0)
@@ -359,15 +364,15 @@ GEM
     strings-ansi (0.2.0)
     structured_warnings (0.4.0)
     syslog-logger (1.6.8)
-    test-kitchen (3.2.2)
+    test-kitchen (3.4.0)
       bcrypt_pbkdf (~> 1.0)
       chef-utils (>= 16.4.35)
       ed25519 (~> 1.2)
       license-acceptance (>= 1.0.11, < 3.0)
       mixlib-install (~> 3.6)
       mixlib-shellout (>= 1.2, < 4.0)
-      net-scp (>= 1.1, < 4.0)
-      net-ssh (>= 2.9, < 7.0)
+      net-scp (>= 1.1, < 5.0)
+      net-ssh (>= 2.9, < 8.0)
       net-ssh-gateway (>= 1.2, < 3.0)
       thor (>= 0.19, < 2.0)
       winrm (~> 2.0)
@@ -406,14 +411,14 @@ GEM
       pastel (~> 0.8)
       strings (~> 0.2.0)
       tty-screen (~> 0.8)
-    unicode-display_width (2.1.0)
+    unicode-display_width (2.3.0)
     unicode_utils (1.4.0)
     uuidtools (2.2.0)
-    vault (0.16.0)
+    vault (0.17.0)
       aws-sigv4
     webrick (1.7.0)
     win32-api (1.5.3-universal-mingw32)
-    win32-certstore (0.6.10)
+    win32-certstore (0.6.15)
       chef-powershell (>= 1.0.12)
       ffi
     win32-event (0.6.3)
@@ -459,6 +464,7 @@ GEM
 PLATFORMS
   ruby
   x64-mingw
+  x64-mingw-ucrt
   x64-mingw32
   x86-mingw32
 
diff --git a/tasks/dependencies.rb b/tasks/dependencies.rb
index f83b1c356c..79d41a08d8 100644
--- a/tasks/dependencies.rb
+++ b/tasks/dependencies.rb
@@ -32,8 +32,11 @@ namespace :dependencies do
     task task_name do
       Dir.chdir(dir) do
         Bundler.with_unbundled_env do
+          platform_list = "ruby x64-mingw32 x86-mingw32"
+          # chef-16 is now built using ruby31 with omnibus hence we need `x64-mingw-ucrt` platform ONLY for omnibus. The ruby version packaged inside chef continues to be ruby 2.7.5 (or as per omnibus_overrides.rb)
+          platform_list += " x64-mingw-ucrt" if dir == "omnibus"
           rm_f "#{dir}/Gemfile.lock"
-          sh "bundle lock --update --add-platform ruby x64-mingw32 x86-mingw32"
+          sh "bundle lock --update --add-platform #{platform_list}"
         end
       end
     end