Rolled back to last pseudo-working build and starting again

Signed-off-by: John McCrae <john.mccrae@progress.com>

3 files changed, 17 insertions, 10 deletions

diff --git a/Gemfile b/Gemfile
index 052b21cf6b..03c339a1ed 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,9 +4,11 @@ gem "chef", path: "."
 
 gem "ohai", git: "https://github.com/chef/ohai.git", branch: "main"
 
-# Nwed to file a bug with rest-client. In the meantime, we can use this until they accept the update.
+# Need to file a bug with rest-client. In the meantime, we can use this until they accept the update.
 gem "rest-client", git: "https://github.com/chef/rest-client", branch: "jfm/ucrt_update1"
 
+gem "mixlib-archive", git: "https://github.com/chef/mixlib-archive", branch: "jfm/ucrt_update1"
+
 gem "ffi", ">= 1.15.5"
 gem "chef-utils", path: File.expand_path("chef-utils", __dir__) if File.exist?(File.expand_path("chef-utils", __dir__))
 gem "chef-config", path: File.expand_path("chef-config", __dir__) if File.exist?(File.expand_path("chef-config", __dir__))
diff --git a/Gemfile.lock b/Gemfile.lock
index fd09abc724..688019e481 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,4 +1,12 @@
 GIT
+  remote: https://github.com/chef/mixlib-archive
+  revision: b4a3a4df06819cb785b7fe1c4c4f93d164746102
+  branch: jfm/ucrt_update1
+  specs:
+    mixlib-archive (1.2.0)
+      mixlib-log
+
+GIT
   remote: https://github.com/chef/ohai.git
   revision: f13a48ad2d0025482c19df06ff27670071e8e1e1
   branch: main
@@ -19,7 +27,7 @@ GIT
 
 GIT
   remote: https://github.com/chef/rest-client
-  revision: 7222fb1f5a0acb4fbfc457febad41b11b487c46d
+  revision: 53e19d6248dfa7b4848c7a03bade3662eab0ba05
   branch: jfm/ucrt_update1
   specs:
     rest-client (2.1.0)
@@ -27,7 +35,7 @@ GIT
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rest-client (2.1.0-x64-mingw-ucrt)
+    rest-client (2.1.0-mingw)
       ffi (~> 1.15)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
@@ -63,7 +71,6 @@ PATH
       inspec-core (>= 5)
       iso8601 (>= 0.12.1, < 0.14)
       license-acceptance (>= 1.0.5, < 3)
-      mixlib-archive (>= 0.4, < 2.0)
       mixlib-authentication (>= 2.1, < 4)
       mixlib-cli (>= 2.1.1, < 3.0)
       mixlib-log (>= 2.0.3, < 4.0)
@@ -261,10 +268,6 @@ GEM
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
-    mixlib-archive (1.1.7)
-      mixlib-log
-    mixlib-archive (1.1.7-universal-mingw32)
-      mixlib-log
     mixlib-authentication (3.0.10)
     mixlib-cli (2.1.8)
     mixlib-config (3.0.27)
@@ -366,7 +369,8 @@ GEM
       mixlib-shellout (>= 2.0, < 4.0)
       net-scp (>= 1.2, < 4.0)
       net-ssh (>= 2.9, < 7.0)
-    train-rest (0.4.2)
+    train-rest (0.5.0)
+      aws-sigv4 (~> 1.5)
       rest-client (~> 2.1)
       train-core (~> 3.0)
     train-winrm (0.2.13)
@@ -465,6 +469,7 @@ DEPENDENCIES
   fauxhai-ng
   ffi (>= 1.15.5)
   inspec-core-bin (>= 5)
+  mixlib-archive!
   ohai!
   proxifier!
   pry (= 0.13.0)
diff --git a/chef.gemspec b/chef.gemspec
index fa9d620938..3c0918236a 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -52,7 +52,7 @@ Gem::Specification.new do |s|
   s.add_dependency "mixlib-log", ">= 2.0.3", "< 4.0"
   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 "mixlib-archive", ">= 0.4", "< 2.0"
   s.add_dependency "ohai", "~> 18.0"
   s.add_dependency "inspec-core", ">= 5"