Merge pull request #5270 from chef/acceptance_bump

update acceptance deps based on winrm 2 release and squashed tk branch

2 files changed, 59 insertions, 80 deletions

diff --git a/acceptance/Gemfile b/acceptance/Gemfile
index b521df8607..48a668e6bc 100644
--- a/acceptance/Gemfile
+++ b/acceptance/Gemfile
@@ -10,7 +10,5 @@ gem "windows_chef_zero"
 gem "kitchen-inspec", :github => "mwrock/kitchen-inspec", :branch => "winrm-v2"
 gem "test-kitchen", :github => "test-kitchen", :branch => "winrm-v2"
 gem "train", :github => "chef/train", :branch => "winrm-v2"
-gem "winrm", :github => "winrb/winrm", :branch => "winrm-v2"
-gem "winrm-fs", :github => "winrb/winrm-fs", :branch => "winrm-v2"
-gem "winrm-elevated", :github => "winrb/winrm-elevated", :branch => "winrm-v2"
+gem "winrm-elevated"
 gem "berkshelf"
diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock
index b5df4fad63..49959d244b 100644
--- a/acceptance/Gemfile.lock
+++ b/acceptance/Gemfile.lock
@@ -31,71 +31,35 @@ GIT
 
 GIT
   remote: git://github.com/test-kitchen/test-kitchen.git
-  revision: c4b42161729572b95a93468fb8d653d15935bc74
+  revision: aec5b1e64258c1d33b10e530e4c030a1023d09fb
   branch: winrm-v2
   specs:
-    test-kitchen (1.10.2)
+    test-kitchen (1.11.1)
       mixlib-install (~> 1.0, >= 1.0.4)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
       net-ssh (>= 2.9, < 4.0)
+      net-ssh-gateway (~> 1.2.0)
       safe_yaml (~> 1.0)
       thor (~> 0.18)
 
-GIT
-  remote: git://github.com/winrb/winrm-elevated.git
-  revision: fcf1d3490412d780d17ac4db09a9101b9794f6f4
-  branch: winrm-v2
-  specs:
-    winrm-elevated (1.0.0)
-      winrm (~> 2.0)
-      winrm-fs (~> 1.0)
-
-GIT
-  remote: git://github.com/winrb/winrm-fs.git
-  revision: 9e1131a3728054ade541fd6e99ebf7558fdabeb5
-  branch: winrm-v2
-  specs:
-    winrm-fs (1.0.0)
-      erubis (~> 2.7)
-      logging (>= 1.6.1, < 3.0)
-      rubyzip (~> 1.1)
-      winrm
-
-GIT
-  remote: git://github.com/winrb/winrm.git
-  revision: dd376892db3c5212708664f1c41c57bb54b8e2ac
-  branch: winrm-v2
-  specs:
-    winrm (2.0.0)
-      builder (>= 2.1.2)
-      erubis (~> 2.7)
-      gssapi (~> 1.2)
-      gyoku (~> 1.0)
-      httpclient (~> 2.2, >= 2.2.0.2)
-      logging (>= 1.6.1, < 3.0)
-      nori (~> 2.0)
-      rubyntlm (~> 0.6.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.4.0)
     artifactory (2.3.3)
-    aws-sdk (2.5.6)
-      aws-sdk-resources (= 2.5.6)
-    aws-sdk-core (2.5.6)
+    aws-sdk (2.5.7)
+      aws-sdk-resources (= 2.5.7)
+    aws-sdk-core (2.5.7)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.5.6)
-      aws-sdk-core (= 2.5.6)
-    berkshelf (4.3.5)
+    aws-sdk-resources (2.5.7)
+      aws-sdk-core (= 2.5.7)
+    berkshelf (5.0.0)
       addressable (~> 2.3, >= 2.3.4)
-      berkshelf-api-client (~> 2.0, >= 2.0.2)
-      buff-config (~> 1.0)
-      buff-extensions (~> 1.0)
+      berkshelf-api-client (>= 2.0.2, < 4.0)
+      buff-config (~> 2.0)
+      buff-extensions (~> 2.0)
       buff-shell_out (~> 0.1)
-      celluloid (= 0.16.0)
-      celluloid-io (~> 0.16.1)
       cleanroom (~> 1.0)
       faraday (~> 0.9)
       httpclient (~> 2.7)
@@ -103,18 +67,18 @@ GEM
       mixlib-archive (~> 0.1)
       octokit (~> 4.0)
       retryable (~> 2.0)
-      ridley (~> 4.5)
-      solve (~> 2.0)
+      ridley (~> 5.0)
+      solve (> 2.0, < 4.0)
       thor (~> 0.19)
-    berkshelf-api-client (2.0.2)
-      faraday (~> 0.9.1)
-      httpclient (~> 2.7.0)
-      ridley (~> 4.5)
-    buff-config (1.0.1)
-      buff-extensions (~> 1.0)
-      varia_model (~> 0.4)
-    buff-extensions (1.0.0)
-    buff-ignore (1.1.1)
+    berkshelf-api-client (3.0.0)
+      faraday (~> 0.9)
+      httpclient (~> 2.7)
+      ridley (>= 4.5, < 6.0)
+    buff-config (2.0.0)
+      buff-extensions (~> 2.0)
+      varia_model (~> 0.6)
+    buff-extensions (2.0.0)
+    buff-ignore (1.2.0)
     buff-ruby_engine (0.1.0)
     buff-shell_out (0.2.0)
       buff-ruby_engine (~> 0.1.0)
@@ -146,7 +110,7 @@ GEM
       builder (>= 2.1.2)
     hashie (3.4.4)
     hitimes (1.2.4)
-    httpclient (2.7.2)
+    httpclient (2.8.2.3)
     inspec (0.28.1)
       hashie (~> 3.4)
       json (~> 1.8)
@@ -178,7 +142,7 @@ GEM
       mixlib-log
     mixlib-authentication (1.4.1)
       mixlib-log
-    mixlib-config (2.2.2)
+    mixlib-config (2.2.3)
     mixlib-install (1.1.0)
       artifactory
       mixlib-shellout
@@ -186,12 +150,14 @@ GEM
     mixlib-log (1.7.1)
     mixlib-shellout (2.2.7)
     mixlib-versioning (1.1.0)
-    molinillo (0.4.5)
+    molinillo (0.5.0)
     multi_json (1.12.1)
     multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (3.2.0)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
     nio4r (1.2.1)
     nori (2.6.0)
     octokit (4.3.0)
@@ -202,11 +168,11 @@ GEM
       slop (~> 3.4)
     rainbow (2.1.0)
     retryable (2.0.4)
-    ridley (4.6.1)
+    ridley (5.0.0)
       addressable
-      buff-config (~> 1.0)
-      buff-extensions (~> 1.0)
-      buff-ignore (~> 1.1.1)
+      buff-config (~> 2.0)
+      buff-extensions (~> 2.0)
+      buff-ignore (~> 1.2)
       buff-shell_out (~> 0.1)
       celluloid (~> 0.16.0)
       celluloid-io (~> 0.16.1)
@@ -218,8 +184,8 @@ GEM
       json (>= 1.7.7)
       mixlib-authentication (>= 1.3.0)
       retryable (~> 2.0)
-      semverse (~> 1.1)
-      varia_model (~> 0.4.0)
+      semverse (~> 2.0)
+      varia_model (~> 0.6)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -242,19 +208,36 @@ GEM
     sawyer (0.7.0)
       addressable (>= 2.3.5, < 2.5)
       faraday (~> 0.8, < 0.10)
-    semverse (1.2.1)
+    semverse (2.0.0)
     slop (3.6.0)
-    solve (2.0.3)
-      molinillo (~> 0.4.2)
-      semverse (~> 1.1)
+    solve (3.0.1)
+      molinillo (~> 0.4)
+      semverse (>= 1.1, < 3.0)
     thor (0.19.1)
     timers (4.0.4)
       hitimes
-    varia_model (0.4.1)
-      buff-extensions (~> 1.0)
+    varia_model (0.6.0)
+      buff-extensions (~> 2.0)
       hashie (>= 2.0.2, < 4.0.0)
     windows_chef_zero (2.0.0)
       test-kitchen (>= 1.2.1)
+    winrm (2.0.0)
+      builder (>= 2.1.2)
+      erubis (~> 2.7)
+      gssapi (~> 1.2)
+      gyoku (~> 1.0)
+      httpclient (~> 2.2, >= 2.2.0.2)
+      logging (>= 1.6.1, < 3.0)
+      nori (~> 2.0)
+      rubyntlm (~> 0.6.0)
+    winrm-elevated (1.0.0)
+      winrm (~> 2.0)
+      winrm-fs (~> 1.0)
+    winrm-fs (1.0.0)
+      erubis (~> 2.7)
+      logging (>= 1.6.1, < 3.0)
+      rubyzip (~> 1.1)
+      winrm (~> 2.0)
 
 PLATFORMS
   ruby
@@ -269,9 +252,7 @@ DEPENDENCIES
   test-kitchen!
   train!
   windows_chef_zero
-  winrm!
-  winrm-elevated!
-  winrm-fs!
+  winrm-elevated
 
 BUNDLED WITH
    1.12.5