remove kitchen-inspec and train pins in acceptanceremove_branches

2 files changed, 21 insertions, 32 deletions

diff --git a/acceptance/Gemfile b/acceptance/Gemfile
index 7b210da1a0..83f9f7dcfc 100644
--- a/acceptance/Gemfile
+++ b/acceptance/Gemfile
@@ -7,8 +7,7 @@ gem "inspec"
 # puts in a box_url for bento when a vagrant box in atlas is specified
 gem "kitchen-vagrant"
 gem "windows_chef_zero"
-gem "kitchen-inspec", :github => "mwrock/kitchen-inspec", :branch => "winrm-v2"
+gem "kitchen-inspec"
 gem "test-kitchen"
-gem "train", :github => "chef/train", :branch => "winrm-v2"
 gem "winrm-elevated"
 gem "berkshelf", "4.3.5"
diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock
index a85459bbde..9b28266017 100644
--- a/acceptance/Gemfile.lock
+++ b/acceptance/Gemfile.lock
@@ -6,29 +6,6 @@ GIT
       mixlib-shellout (~> 2.0)
       thor (~> 0.19)
 
-GIT
-  remote: git://github.com/chef/train.git
-  revision: 0d380fd0e25466287710408c796623170e02f677
-  branch: winrm-v2
-  specs:
-    train (0.15.0)
-      docker-api (~> 1.26)
-      json (~> 1.8)
-      mixlib-shellout (~> 2.0)
-      net-scp (~> 1.2)
-      net-ssh (>= 2.9, < 4.0)
-      winrm (~> 2.0)
-      winrm-fs (~> 1.0)
-
-GIT
-  remote: git://github.com/mwrock/kitchen-inspec.git
-  revision: e422f994d666500286ddf837a85c808390d7e24e
-  branch: winrm-v2
-  specs:
-    kitchen-inspec (0.15.0)
-      inspec (>= 0.22.0, < 1.0.0)
-      test-kitchen (~> 1.6)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -99,25 +76,30 @@ GEM
     hashie (3.4.4)
     hitimes (1.2.4)
     httpclient (2.7.2)
-    inspec (0.26.0)
+    inspec (0.32.0)
       hashie (~> 3.4)
-      json (~> 1.8)
+      json (>= 1.8, < 3.0)
       method_source (~> 0.8)
+      mixlib-log
       pry (~> 0)
       rainbow (~> 2)
       rspec (~> 3)
       rspec-its (~> 1.2)
       rubyzip (~> 1.1)
+      sslshake (~> 1)
       thor (~> 0.19)
-      train (~> 0.13)
+      train (>= 0.16.0, < 1.0)
     jmespath (1.3.1)
-    json (1.8.3)
+    json (2.0.2)
     kitchen-ec2 (1.1.0)
       aws-sdk (~> 2)
       excon
       multi_json
       retryable (~> 2.0)
       test-kitchen (~> 1.4, >= 1.4.1)
+    kitchen-inspec (0.15.1)
+      inspec (>= 0.22.0, < 1.0.0)
+      test-kitchen (~> 1.6)
     kitchen-vagrant (0.20.0)
       test-kitchen (~> 1.4)
     little-plugger (1.1.4)
@@ -201,6 +183,7 @@ GEM
     solve (2.0.3)
       molinillo (~> 0.4.2)
       semverse (~> 1.1)
+    sslshake (1.0.12)
     test-kitchen (1.12.0)
       mixlib-install (~> 1.0, >= 1.0.4)
       mixlib-shellout (>= 1.2, < 3.0)
@@ -212,12 +195,20 @@ GEM
     thor (0.19.1)
     timers (4.0.4)
       hitimes
+    train (0.19.0)
+      docker-api (~> 1.26)
+      json (>= 1.8, < 3.0)
+      mixlib-shellout (~> 2.0)
+      net-scp (~> 1.2)
+      net-ssh (>= 2.9, < 4.0)
+      winrm (~> 2.0)
+      winrm-fs (~> 1.0)
     varia_model (0.4.1)
       buff-extensions (~> 1.0)
       hashie (>= 2.0.2, < 4.0.0)
     windows_chef_zero (2.0.0)
       test-kitchen (>= 1.2.1)
-    winrm (2.0.0)
+    winrm (2.0.1)
       builder (>= 2.1.2)
       erubis (~> 2.7)
       gssapi (~> 1.2)
@@ -243,10 +234,9 @@ DEPENDENCIES
   chef-acceptance!
   inspec
   kitchen-ec2
-  kitchen-inspec!
+  kitchen-inspec
   kitchen-vagrant
   test-kitchen
-  train!
   windows_chef_zero
   winrm-elevated