Back out more bumps, to avoid kitchen failingbtm/fix-deps

Signed-off-by: Bryan McLellan <btm@chef.io>

2 files changed, 84 insertions, 221 deletions

diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock
index 2dd4f48530..3d6e8d15c0 100644
--- a/kitchen-tests/Berksfile.lock
+++ b/kitchen-tests/Berksfile.lock
@@ -4,10 +4,10 @@ DEPENDENCIES
   php (~> 1.5.0)
   resolver
     git: https://github.com/chef-cookbooks/resolver.git
-    revision: d150ad6098560032d8d3fc701e013549f9e2ad2e
+    revision: 4ab8cb0dfee3696fb8a1e4398e95bff9f33fd6ab
 
 GRAPH
-  apt (6.1.3)
+  apt (6.0.1)
   base (0.1.0)
     apt (>= 0.0.0)
     build-essential (>= 0.0.0)
@@ -23,30 +23,31 @@ GRAPH
     sudo (>= 0.0.0)
     ubuntu (>= 0.0.0)
     users (>= 0.0.0)
-  build-essential (8.0.3)
+  build-essential (8.0.0)
     mingw (>= 1.1)
     seven_zip (>= 0.0.0)
-  chef-client (8.1.7)
-    cron (>= 2.0.0)
+  chef-client (8.0.0)
+    cron (>= 1.7.0)
     logrotate (>= 1.9.0)
-    windows (>= 2.0.0)
-  chef_hostname (0.6.0)
-  compat_resource (12.19.0)
-  cron (4.1.3)
+    windows (>= 1.42.0)
+  chef_hostname (0.5.0)
+  compat_resource (12.16.3)
+  cron (4.1.0)
     compat_resource (>= 0.0.0)
-  iis (6.7.2)
+  iis (5.1.0)
     windows (>= 2.0)
-  iptables (4.2.0)
-  logrotate (2.2.0)
-  mingw (2.0.1)
+  iptables (4.0.1)
+  logrotate (2.1.0)
+    compat_resource (>= 0.0.0)
+  mingw (2.0.0)
     seven_zip (>= 0.0.0)
   multipackage (4.0.0)
     compat_resource (>= 0.0.0)
-  mysql (8.4.0)
+  mysql (8.3.1)
   nscd (5.0.0)
-  ntp (3.5.1)
-  ohai (5.1.0)
-  openssh (2.4.1)
+  ntp (3.3.1)
+  ohai (5.0.2)
+  openssh (2.2.0)
     iptables (>= 1.0)
   php (1.5.0)
     build-essential (>= 0.0.0)
@@ -56,16 +57,16 @@ GRAPH
     xml (>= 0.0.0)
     yum-epel (>= 0.0.0)
   resolver (2.0.1)
-  selinux (2.0.3)
+  selinux (1.0.3)
   seven_zip (2.0.2)
     windows (>= 1.2.2)
-  sudo (3.5.3)
+  sudo (3.3.1)
   ubuntu (2.0.1)
     apt (>= 0.0.0)
-  users (5.1.0)
-  windows (3.1.1)
+  users (4.0.3)
+  windows (3.0.4)
     ohai (>= 4.0.0)
-  xml (3.1.2)
+  xml (3.1.1)
     build-essential (>= 0.0.0)
-  yum-epel (2.1.2)
+  yum-epel (2.1.1)
     compat_resource (>= 12.16.3)
diff --git a/kitchen-tests/Gemfile.lock b/kitchen-tests/Gemfile.lock
index 4c8f0dd0d6..8881c6b839 100644
--- a/kitchen-tests/Gemfile.lock
+++ b/kitchen-tests/Gemfile.lock
@@ -3,31 +3,35 @@ GEM
   specs:
     addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
-    artifactory (2.8.2)
-    aws-sdk (2.10.15)
-      aws-sdk-resources (= 2.10.15)
-    aws-sdk-core (2.10.15)
+    artifactory (2.8.1)
+    aws-sdk (2.9.1)
+      aws-sdk-resources (= 2.9.1)
+    aws-sdk-core (2.9.1)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.10.15)
-      aws-sdk-core (= 2.10.15)
-    aws-sigv4 (1.0.1)
-    berkshelf (6.2.1)
+    aws-sdk-resources (2.9.1)
+      aws-sdk-core (= 2.9.1)
+    aws-sigv4 (1.0.0)
+    berkshelf (5.6.4)
+      addressable (~> 2.3, >= 2.3.4)
+      berkshelf-api-client (>= 2.0.2, < 4.0)
       buff-config (~> 2.0)
       buff-extensions (~> 2.0)
-      chef (>= 12.7.2)
+      buff-shell_out (~> 1.0)
       cleanroom (~> 1.0)
-      concurrent-ruby (~> 1.0)
       faraday (~> 0.9)
       httpclient (~> 2.7)
       minitar (~> 0.5, >= 0.5.4)
       mixlib-archive (~> 0.4)
-      mixlib-shellout (~> 2.0)
       octokit (~> 4.0)
       retryable (~> 2.0)
       ridley (~> 5.0)
       solve (> 2.0, < 4.0)
       thor (~> 0.19, < 0.19.2)
+    berkshelf-api-client (3.0.0)
+      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)
@@ -43,139 +47,52 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef (12.21.1)
-      addressable
-      bundler (>= 1.10)
-      chef-config (= 12.21.1)
-      chef-zero (>= 4.8, < 13)
-      diff-lcs (~> 1.2, >= 1.2.4)
-      erubis (~> 2.7)
-      ffi-yajl (~> 2.2)
-      highline (~> 1.6, >= 1.6.9)
-      iniparse (~> 1.4)
-      mixlib-archive (~> 0.4)
-      mixlib-authentication (~> 1.4)
-      mixlib-cli (~> 1.7)
-      mixlib-log (~> 1.3)
-      mixlib-shellout (~> 2.0)
-      net-sftp (~> 2.1, >= 2.1.2)
-      net-ssh (>= 2.9, < 5.0)
-      net-ssh-multi (~> 1.2, >= 1.2.1)
-      ohai (>= 8.6.0.alpha.1, < 13)
-      plist (~> 3.2)
-      proxifier (~> 1.0)
-      rspec-core (~> 3.5)
-      rspec-expectations (~> 3.5)
-      rspec-mocks (~> 3.5)
-      rspec_junit_formatter (~> 0.2.0)
-      serverspec (~> 2.7)
-      specinfra (~> 2.10)
-      syslog-logger (~> 1.6)
-      uuidtools (~> 2.1.5)
-    chef (12.21.1-universal-mingw32)
-      addressable
-      bundler (>= 1.10)
-      chef-config (= 12.21.1)
-      chef-zero (>= 4.8, < 13)
-      diff-lcs (~> 1.2, >= 1.2.4)
-      erubis (~> 2.7)
-      ffi (~> 1.9)
-      ffi-yajl (~> 2.2)
-      highline (~> 1.6, >= 1.6.9)
-      iniparse (~> 1.4)
-      mixlib-archive (~> 0.4)
-      mixlib-authentication (~> 1.4)
-      mixlib-cli (~> 1.7)
-      mixlib-log (~> 1.3)
-      mixlib-shellout (~> 2.0)
-      net-sftp (~> 2.1, >= 2.1.2)
-      net-ssh (>= 2.9, < 5.0)
-      net-ssh-multi (~> 1.2, >= 1.2.1)
-      ohai (>= 8.6.0.alpha.1, < 13)
-      plist (~> 3.2)
-      proxifier (~> 1.0)
-      rspec-core (~> 3.5)
-      rspec-expectations (~> 3.5)
-      rspec-mocks (~> 3.5)
-      rspec_junit_formatter (~> 0.2.0)
-      serverspec (~> 2.7)
-      specinfra (~> 2.10)
-      syslog-logger (~> 1.6)
-      uuidtools (~> 2.1.5)
-      win32-api (~> 1.5.3)
-      win32-dir (~> 0.5.0)
-      win32-event (~> 0.6.1)
-      win32-eventlog (= 0.6.3)
-      win32-mmap (~> 0.4.1)
-      win32-mutex (~> 0.4.2)
-      win32-process (~> 0.8.2)
-      win32-service (~> 0.8.7)
-      windows-api (~> 0.4.4)
-      wmi-lite (~> 1.0)
-    chef-config (12.21.1)
+    chef-config (12.19.36)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
-    chef-zero (5.3.2)
-      ffi-yajl (~> 2.2)
-      hashie (>= 2.0, < 4.0)
-      mixlib-log (~> 1.3)
-      rack (~> 2.0)
-      uuidtools (~> 2.1)
     cleanroom (1.0.0)
     coderay (1.1.1)
-    concurrent-ruby (1.0.5)
     diff-lcs (1.3)
-    docker-api (1.33.6)
+    docker-api (1.33.2)
       excon (>= 0.38.0)
       json
     erubis (2.7.0)
-    excon (0.57.1)
-    faraday (0.12.2)
+    excon (0.55.0)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.18)
-    ffi (1.9.18-x64-mingw32)
     ffi (1.9.18-x86-mingw32)
-    ffi-win32-extensions (1.0.3)
-      ffi
-    ffi-yajl (2.3.1)
-      libyajl2 (~> 1.2)
     fuzzyurl (0.9.0)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
-    hashie (3.5.6)
-    highline (1.7.8)
-    hitimes (1.2.5)
-    hitimes (1.2.5-x86-mingw32)
-    htmlentities (4.3.4)
+    hashie (3.5.5)
+    hitimes (1.2.4)
+    hitimes (1.2.4-x86-mingw32)
     httpclient (2.8.3)
-    iniparse (1.4.4)
-    inspec (1.31.1)
-      addressable (~> 2.4)
+    inspec (1.18.0)
+      addressable (~> 2.5)
       faraday (>= 0.9.0)
       hashie (~> 3.4)
-      htmlentities
       json (>= 1.8, < 3.0)
       method_source (~> 0.8)
       mixlib-log
+      nokogiri (~> 1.6)
       parallel (~> 1.9)
-      parslet (~> 1.5)
       pry (~> 0)
       rainbow (~> 2)
       rspec (~> 3)
       rspec-its (~> 1.2)
       rubyzip (~> 1.1)
-      semverse
-      sslshake (~> 1.2)
+      sslshake (~> 1)
       thor (~> 0.19)
       toml (~> 0.1)
-      train (>= 0.24.0, < 1.0)
-    ipaddress (0.8.3)
+      train (>= 0.22.0, < 1.0)
     jmespath (1.3.1)
-    json (2.1.0)
+    json (2.0.3)
     kitchen-appbundle-updater (0.2.0)
     kitchen-dokken (1.1.0)
       docker-api (~> 1.33)
@@ -186,24 +103,23 @@ GEM
       multi_json
       retryable (~> 2.0)
       test-kitchen (~> 1.4, >= 1.4.1)
-    kitchen-inspec (0.19.0)
+    kitchen-inspec (0.17.0)
       hashie (~> 3.4)
       inspec (>= 0.34.0, < 2.0.0)
       test-kitchen (~> 1.6)
-    kitchen-vagrant (1.1.0)
+    kitchen-vagrant (1.0.2)
       test-kitchen (~> 1.4)
-    libyajl2 (1.2.0)
     little-plugger (1.1.4)
-    logging (2.2.2)
+    logging (2.2.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
     method_source (0.8.2)
+    mini_portile (0.6.2)
     minitar (0.6.1)
     mixlib-archive (0.4.1)
       mixlib-log
     mixlib-authentication (1.4.1)
       mixlib-log
-    mixlib-cli (1.7.0)
     mixlib-config (2.2.4)
     mixlib-install (2.1.12)
       artifactory
@@ -211,8 +127,8 @@ GEM
       mixlib-versioning
       thor
     mixlib-log (1.7.1)
-    mixlib-shellout (2.3.2)
-    mixlib-shellout (2.3.2-universal-mingw32)
+    mixlib-shellout (2.2.7)
+    mixlib-shellout (2.2.7-universal-mingw32)
       win32-process (~> 0.8.2)
       wmi-lite (~> 1.0)
     mixlib-versioning (1.1.0)
@@ -221,47 +137,29 @@ GEM
     multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-sftp (2.1.2)
-      net-ssh (>= 2.6.5)
     net-ssh (4.1.0)
     net-ssh-gateway (1.3.0)
       net-ssh (>= 2.6.5)
-    net-ssh-multi (1.2.1)
-      net-ssh (>= 2.6.5)
-      net-ssh-gateway (>= 1.2.0)
-    net-telnet (0.1.1)
-    nio4r (2.1.0)
+    nio4r (2.0.0)
+    nokogiri (1.6.6.4)
+      mini_portile (~> 0.6.0)
+    nokogiri (1.6.6.4-x86-mingw32)
+      mini_portile (~> 0.6.0)
     nori (2.6.0)
-    octokit (4.7.0)
+    octokit (4.6.2)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (8.24.1)
-      chef-config (>= 12.5.0.alpha.1, < 14)
-      ffi (~> 1.9)
-      ffi-yajl (~> 2.2)
-      ipaddress
-      mixlib-cli
-      mixlib-config (~> 2.0)
-      mixlib-log (>= 1.7.1, < 2.0)
-      mixlib-shellout (~> 2.0)
-      plist (~> 3.1)
-      systemu (~> 2.6.4)
-      wmi-lite (~> 1.0)
-    parallel (1.11.2)
+    parallel (1.11.1)
     parslet (1.5.0)
       blankslate (~> 2.0)
-    plist (3.3.0)
-    proxifier (1.0.3)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
     public_suffix (2.0.5)
-    rack (2.0.3)
-    rainbow (2.2.2)
-      rake
+    rainbow (2.2.1)
     rake (12.0.0)
     retryable (2.0.4)
-    ridley (5.1.1)
+    ridley (5.1.0)
       addressable
       buff-config (~> 2.0)
       buff-extensions (~> 2.0)
@@ -271,7 +169,7 @@ GEM
       celluloid-io (~> 0.16.1)
       chef-config (>= 12.5.0)
       erubis
-      faraday (~> 0.9)
+      faraday (~> 0.9.0)
       hashie (>= 2.0.2, < 4.0.0)
       httpclient (~> 2.7)
       json (>= 1.7.7)
@@ -279,50 +177,34 @@ GEM
       retryable (~> 2.0)
       semverse (~> 2.0)
       varia_model (~> 0.6)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
+      rspec-support (~> 3.5.0)
     rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.6.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
-    rspec_junit_formatter (0.2.3)
-      builder (< 4)
-      rspec-core (>= 2, < 4, != 2.12.0)
-    rubyntlm (0.6.2)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    rubyntlm (0.6.1)
     rubyzip (1.2.1)
     safe_yaml (1.0.4)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
     semverse (2.0.0)
-    serverspec (2.39.1)
-      multi_json
-      rspec (~> 3.0)
-      rspec-its
-      specinfra (~> 2.68)
-    sfl (2.3)
     slop (3.6.0)
     solve (3.1.0)
       molinillo (>= 0.5)
       semverse (>= 1.1, < 3.0)
-    specinfra (2.69.0)
-      net-scp
-      net-ssh (>= 2.7, < 5.0)
-      net-telnet
-      sfl
-    sslshake (1.2.0)
-    syslog-logger (1.6.8)
-    systemu (2.6.5)
+    sslshake (1.1.0)
     test-kitchen (1.16.0)
       mixlib-install (>= 1.2, < 3.0)
       mixlib-shellout (>= 1.2, < 3.0)
@@ -336,7 +218,7 @@ GEM
       hitimes
     toml (0.1.2)
       parslet (~> 1.5.0)
-    train (0.25.0)
+    train (0.23.0)
       docker-api (~> 1.26)
       json (>= 1.8, < 3.0)
       mixlib-shellout (~> 2.0)
@@ -344,32 +226,13 @@ GEM
       net-ssh (>= 2.9, < 5.0)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
-    uuidtools (2.1.5)
     vagrant-wrapper (2.0.3)
     varia_model (0.6.0)
       buff-extensions (~> 2.0)
       hashie (>= 2.0.2, < 4.0.0)
-    win32-api (1.5.3-universal-mingw32)
-    win32-dir (0.5.1)
-      ffi (>= 1.0.0)
-    win32-event (0.6.3)
-      win32-ipc (>= 0.6.0)
-    win32-eventlog (0.6.3)
-      ffi
-    win32-ipc (0.7.0)
-      ffi
-    win32-mmap (0.4.2)
-      ffi
-    win32-mutex (0.4.3)
-      win32-ipc (>= 0.6.0)
     win32-process (0.8.3)
       ffi (>= 1.0.0)
-    win32-service (0.8.10)
-      ffi
-      ffi-win32-extensions
-    windows-api (0.4.4)
-      win32-api (>= 1.4.5)
-    winrm (2.2.3)
+    winrm (2.1.3)
       builder (>= 2.1.2)
       erubis (~> 2.7)
       gssapi (~> 1.2)
@@ -387,7 +250,6 @@ GEM
 
 PLATFORMS
   ruby
-  x64-mingw32
   x86-mingw32
 
 DEPENDENCIES
@@ -404,4 +266,4 @@ DEPENDENCIES
   vagrant-wrapper
 
 BUNDLED WITH
-   1.15.1
+   1.14.6