Merge pull request #5872 from chef/lcg/fix-acceptance-bundle

fix the acceptance Gemfile

2 files changed, 22 insertions, 16 deletions

diff --git a/acceptance/Gemfile b/acceptance/Gemfile
index 41a18c9914..71c4f6794b 100644
--- a/acceptance/Gemfile
+++ b/acceptance/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 gem "rake" # required to build some native extensions
-gem "chef-acceptance", github: "chef/chef-acceptance"
+gem "chef-acceptance", git: "https://github.com/chef/chef-acceptance.git"
 gem "kitchen-ec2"
 gem "inspec"
 gem "kitchen-vagrant"
diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock
index e025c3c35a..fecbc5b203 100644
--- a/acceptance/Gemfile.lock
+++ b/acceptance/Gemfile.lock
@@ -12,13 +12,13 @@ GEM
     addressable (2.5.0)
       public_suffix (~> 2.0, >= 2.0.2)
     artifactory (2.7.0)
-    aws-sdk (2.7.13)
-      aws-sdk-resources (= 2.7.13)
-    aws-sdk-core (2.7.13)
+    aws-sdk (2.8.1)
+      aws-sdk-resources (= 2.8.1)
+    aws-sdk-core (2.8.1)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.7.13)
-      aws-sdk-core (= 2.7.13)
+    aws-sdk-resources (2.8.1)
+      aws-sdk-core (= 2.8.1)
     aws-sigv4 (1.0.0)
     berkshelf (5.6.3)
       addressable (~> 2.3, >= 2.3.4)
@@ -40,6 +40,7 @@ GEM
       faraday (~> 0.9)
       httpclient (~> 2.7)
       ridley (>= 4.5, < 6.0)
+    blankslate (2.1.2.4)
     buff-config (2.0.0)
       buff-extensions (~> 2.0)
       varia_model (~> 0.6)
@@ -54,7 +55,7 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (13.0.0)
+    chef-config (13.0.1)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
@@ -69,16 +70,16 @@ GEM
     excon (0.55.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.17)
+    ffi (1.9.18)
     fuzzyurl (0.9.0)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
-    hashie (3.5.4)
+    hashie (3.5.5)
     hitimes (1.2.4)
     httpclient (2.8.3)
-    inspec (1.14.1)
+    inspec (1.16.1)
       faraday (>= 0.9.0)
       hashie (~> 3.4)
       json (>= 1.8, < 3.0)
@@ -93,10 +94,11 @@ GEM
       rubyzip (~> 1.1)
       sslshake (~> 1)
       thor (~> 0.19)
+      toml (~> 0.1)
       train (>= 0.22.0, < 1.0)
     jmespath (1.3.1)
     json (2.0.3)
-    kitchen-ec2 (1.3.1)
+    kitchen-ec2 (1.3.2)
       aws-sdk (~> 2)
       excon
       multi_json
@@ -126,7 +128,7 @@ GEM
     mixlib-log (1.7.1)
     mixlib-shellout (2.2.7)
     mixlib-versioning (1.1.0)
-    molinillo (0.5.6)
+    molinillo (0.5.7)
     multi_json (1.12.1)
     multipart-post (2.0.0)
     net-scp (1.2.1)
@@ -139,6 +141,8 @@ GEM
     octokit (4.6.2)
       sawyer (~> 0.8.0, >= 0.5.3)
     parallel (1.10.0)
+    parslet (1.5.0)
+      blankslate (~> 2.0)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -196,17 +200,19 @@ GEM
       molinillo (>= 0.5)
       semverse (>= 1.1, < 3.0)
     sslshake (1.0.13)
-    test-kitchen (1.15.0)
+    test-kitchen (1.16.0)
       mixlib-install (>= 1.2, < 3.0)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
       net-ssh (>= 2.9, < 5.0)
       net-ssh-gateway (~> 1.2)
       safe_yaml (~> 1.0)
-      thor (~> 0.18)
+      thor (~> 0.19, < 0.19.2)
     thor (0.19.1)
     timers (4.0.4)
       hitimes
+    toml (0.1.2)
+      parslet (~> 1.5.0)
     train (0.22.1)
       docker-api (~> 1.26)
       json (>= 1.8, < 3.0)
@@ -220,7 +226,7 @@ GEM
       hashie (>= 2.0.2, < 4.0.0)
     windows_chef_zero (2.0.0)
       test-kitchen (>= 1.2.1)
-    winrm (2.1.2)
+    winrm (2.1.3)
       builder (>= 2.1.2)
       erubis (~> 2.7)
       gssapi (~> 1.2)
@@ -255,4 +261,4 @@ DEPENDENCIES
   winrm-elevated
 
 BUNDLED WITH
-   1.13.7
+   1.13.4