ruby-shadow issueswindows_plan_issues

Signed-off-by: kanad-progress <kanad.kumar@progress.com>

3 files changed, 22 insertions, 11 deletions

diff --git a/Gemfile b/Gemfile
index c467dfb58c..c928bddf55 100644
--- a/Gemfile
+++ b/Gemfile
@@ -39,7 +39,7 @@ gem "proxifier", git: "https://github.com/chef/ruby-proxifier", branch: "lcg/rub
 # Everything except AIX and Windows
 group(:ruby_shadow) do
   # if ruby-shadow does a release that supports ruby-3.0 this can be removed
-  gem "ruby-shadow"#, git: "https://github.com/chef/ruby-shadow", branch: "lcg/ruby-3.0", platforms: :ruby
+  gem "ruby-shadow", "~> 2.5.1" , git: "https://github.com/chef/ruby-shadow", platforms: :ruby#, branch: "lcg/ruby-3.0"
 end
 
 # deps that cannot be put in the knife gem because they require a compiler and fail on windows nodes
@@ -56,7 +56,7 @@ end
 
 group(:chefstyle) do
   # for testing new chefstyle rules
-  gem "chefstyle"#, git: "https://github.com/chef/chefstyle.git", branch: "main"
+  gem "chefstyle", "~> 2.2.2", git: "https://github.com/chef/chefstyle.git", branch: "main"
 end
 
 instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"]
diff --git a/Gemfile.lock b/Gemfile.lock
index 424b9493a5..3795f9ee03 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,4 +1,12 @@
 GIT
+  remote: https://github.com/chef/chefstyle.git
+  revision: 71ae97744713ffd91ac8277d7a1385dabb6d570b
+  branch: main
+  specs:
+    chefstyle (2.2.2)
+      rubocop (= 1.25.1)
+
+GIT
   remote: https://github.com/chef/ohai.git
   revision: 2cd91848d807d7a37342b964c6c5e204570469f9
   branch: main
@@ -24,6 +32,12 @@ GIT
   specs:
     proxifier (1.0.3)
 
+GIT
+  remote: https://github.com/chef/ruby-shadow
+  revision: f135b3fd52d0a638f2eb9b17a8952a7f0f317688
+  specs:
+    ruby-shadow (2.5.1)
+
 PATH
   remote: .
   specs:
@@ -132,8 +146,6 @@ GEM
       chef-utils (>= 17.0)
       chef-zero (>= 14.0)
       net-ssh
-    chefstyle (2.2.2)
-      rubocop (= 1.25.1)
     coderay (1.1.3)
     concurrent-ruby (1.1.10)
     corefoundation (0.3.13)
@@ -304,7 +316,6 @@ GEM
     rubocop-ast (1.18.0)
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
-    ruby-shadow (2.5.1)
     ruby2_keywords (0.0.5)
     rubyntlm (0.6.3)
     rubyzip (2.3.2)
@@ -388,7 +399,7 @@ GEM
     wmi-lite (1.0.7)
 
 PLATFORMS
-  ruby
+  x86_64-darwin-21
 
 DEPENDENCIES
   appbundler
@@ -398,7 +409,7 @@ DEPENDENCIES
   chef-utils!
   chef-vault
   cheffish (>= 17)
-  chefstyle
+  chefstyle (~> 2.2.2)!
   ed25519 (~> 1.2)
   fauxhai-ng
   inspec-core-bin (~> 4.24)
@@ -410,8 +421,8 @@ DEPENDENCIES
   rake
   rb-readline
   rspec
-  ruby-shadow
+  ruby-shadow (~> 2.5.1)!
   webmock
 
 BUNDLED WITH
-   2.1.4
+   2.3.17
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 9d74eb7b94..0db9d1d842 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -375,7 +375,7 @@ GEM
     zhexdump (0.0.2)
 
 PLATFORMS
-  ruby
+  x86_64-darwin-21
 
 DEPENDENCIES
   artifactory
@@ -388,4 +388,4 @@ DEPENDENCIES
   winrm-fs (~> 1.0)
 
 BUNDLED WITH
-   2.1.4
+   2.3.17