Merge pull request #5297 from chef/jk/update

Update all dependencies

8 files changed, 103 insertions, 96 deletions

diff --git a/.travis.yml b/.travis.yml
index 58c10dffa2..95b69ed215 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,6 +27,7 @@ branches:
 env:
   global:
     - FORCE_FFI_YAJL=ext
+    - BUNDLE_ENABLE_TRAMPOLINE=1
 
 matrix:
   include:
diff --git a/Gemfile.lock b/Gemfile.lock
index d1af3006cd..32320dc6aa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/chef/chef-server
-  revision: dea545b10cbe209b89b30e782a58763407ba4526
+  revision: 8165dfd0524ee6076eda32727cbd0005c9348150
   specs:
     oc-chef-pedant (2.2.0)
-      activesupport (~> 3.2)
+      activesupport (~> 5.0)
       erubis (~> 2.7)
       mixlib-authentication (~> 1.4)
       mixlib-config (~> 2.0)
@@ -148,20 +148,22 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.22.4)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
+    activesupport (5.0.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
     addressable (2.4.0)
     appbundler (0.9.0)
       mixlib-cli (~> 1.4)
     artifactory (2.3.3)
     ast (2.3.0)
-    aws-sdk (2.5.10)
-      aws-sdk-resources (= 2.5.10)
-    aws-sdk-core (2.5.10)
+    aws-sdk (2.5.11)
+      aws-sdk-resources (= 2.5.11)
+    aws-sdk-core (2.5.11)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.5.10)
-      aws-sdk-core (= 2.5.10)
+    aws-sdk-resources (2.5.11)
+      aws-sdk-core (= 2.5.11)
     aws-sdk-v1 (1.66.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
@@ -210,6 +212,7 @@ GEM
       url
     coderay (1.1.1)
     colorize (0.8.1)
+    concurrent-ruby (1.0.2)
     cucumber (2.4.0)
       builder (>= 2.1.2)
       cucumber-core (~> 1.5.0)
@@ -324,6 +327,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
+    minitest (5.9.0)
     mixlib-archive (0.2.0)
       mixlib-log
     mixlib-authentication (1.4.1)
@@ -510,6 +514,8 @@ GEM
       polyglot (~> 0.3)
     typhoeus (0.8.0)
       ethon (>= 0.8.0)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
     ubuntu_ami (0.4.1)
     unf (0.1.4)
       unf_ext
diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock
index 9b28266017..95d797c5f7 100644
--- a/acceptance/Gemfile.lock
+++ b/acceptance/Gemfile.lock
@@ -11,12 +11,12 @@ GEM
   specs:
     addressable (2.4.0)
     artifactory (2.3.3)
-    aws-sdk (2.5.8)
-      aws-sdk-resources (= 2.5.8)
-    aws-sdk-core (2.5.8)
+    aws-sdk (2.5.11)
+      aws-sdk-resources (= 2.5.11)
+    aws-sdk-core (2.5.11)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.5.8)
-      aws-sdk-core (= 2.5.8)
+    aws-sdk-resources (2.5.11)
+      aws-sdk-core (= 2.5.11)
     berkshelf (4.3.5)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (~> 2.0, >= 2.0.2)
@@ -76,11 +76,12 @@ GEM
     hashie (3.4.4)
     hitimes (1.2.4)
     httpclient (2.7.2)
-    inspec (0.32.0)
+    inspec (0.33.2)
       hashie (~> 3.4)
       json (>= 1.8, < 3.0)
       method_source (~> 0.8)
       mixlib-log
+      parallel (~> 1.9)
       pry (~> 0)
       rainbow (~> 2)
       rspec (~> 3)
@@ -88,7 +89,7 @@ GEM
       rubyzip (~> 1.1)
       sslshake (~> 1)
       thor (~> 0.19)
-      train (>= 0.16.0, < 1.0)
+      train (>= 0.19.0, < 1.0)
     jmespath (1.3.1)
     json (2.0.2)
     kitchen-ec2 (1.1.0)
@@ -132,6 +133,7 @@ GEM
     nori (2.6.0)
     octokit (4.3.0)
       sawyer (~> 0.7.0, >= 0.5.3)
+    parallel (1.9.0)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock
index 50643c0d50..2eddaa27b5 100644
--- a/kitchen-tests/Berksfile.lock
+++ b/kitchen-tests/Berksfile.lock
@@ -3,7 +3,7 @@ DEPENDENCIES
     path: cookbooks/base
   php (~> 1.5.0)
   resolver
-    git: git://github.com/chef-cookbooks/resolver.git
+    git: https://github.com/chef-cookbooks/resolver.git
     revision: 8bf9034dabc47d29a07870e4059c32114f2c820a
   webapp
     path: cookbooks/webapp
@@ -29,9 +29,8 @@ GRAPH
     sudo (>= 0.0.0)
     ubuntu (>= 0.0.0)
     users (>= 0.0.0)
-    yum-epel (>= 0.0.0)
-  build-essential (6.0.4)
-    compat_resource (>= 12.10)
+  build-essential (6.0.5)
+    compat_resource (>= 12.14)
     mingw (>= 1.1)
     seven_zip (>= 0.0.0)
   chef-client (5.0.0)
@@ -39,10 +38,9 @@ GRAPH
     logrotate (>= 1.9.0)
     windows (>= 1.42.0)
   chef-sugar (3.4.0)
-  chef_handler (1.4.0)
   chef_hostname (0.4.1)
     compat_resource (>= 0.0.0)
-  compat_resource (12.10.7)
+  compat_resource (12.14.1)
   cron (1.7.6)
   database (2.3.1)
     aws (>= 0.0.0)
@@ -50,7 +48,7 @@ GRAPH
     mysql-chef_gem (~> 0.0)
     postgresql (>= 1.0.0)
     xfs (>= 0.0.0)
-  iis (4.2.0)
+  iis (5.0.0)
     windows (>= 1.34.6)
   iptables (2.2.0)
   logrotate (2.1.0)
@@ -67,10 +65,10 @@ GRAPH
     mysql (>= 0.0.0)
   nscd (4.1.0)
     compat_resource (>= 0.0.0)
-  ntp (2.0.0)
+  ntp (3.0.0)
     windows (>= 1.38.0)
-  ohai (4.2.0)
-    compat_resource (>= 12.10)
+  ohai (4.2.1)
+    compat_resource (>= 12.14)
   openssh (2.0.0)
     iptables (>= 1.0)
   openssl (4.4.0)
@@ -88,10 +86,10 @@ GRAPH
     openssl (~> 4.0)
   resolver (1.3.1)
   selinux (0.9.0)
-  seven_zip (2.0.1)
+  seven_zip (2.0.2)
     windows (>= 1.2.2)
   sudo (2.11.0)
-  ubuntu (1.2.1)
+  ubuntu (2.0.0)
     apt (>= 0.0.0)
   users (3.0.0)
   webapp (0.1.0)
@@ -99,14 +97,12 @@ GRAPH
     database (~> 2.3.1)
     mysql (~> 5.6.3)
     php (~> 1.5.0)
-  windows (1.44.3)
-    chef_handler (>= 0.0.0)
+  windows (2.0.2)
   xfs (2.0.1)
-  xml (2.0.0)
+  xml (3.0.0)
     build-essential (>= 0.0.0)
-    chef-sugar (>= 0.0.0)
-  yum (3.11.0)
-  yum-epel (0.7.1)
-    yum (>= 3.6.3)
-  yum-mysql-community (0.3.0)
+  yum (4.0.0)
+  yum-epel (1.0.0)
+    yum (>= 3.6)
+  yum-mysql-community (1.0.0)
     yum (>= 3.2)
diff --git a/kitchen-tests/Gemfile.lock b/kitchen-tests/Gemfile.lock
index 172bd9e418..7c7368bdf6 100644
--- a/kitchen-tests/Gemfile.lock
+++ b/kitchen-tests/Gemfile.lock
@@ -3,20 +3,18 @@ GEM
   specs:
     addressable (2.4.0)
     artifactory (2.3.3)
-    aws-sdk (2.5.5)
-      aws-sdk-resources (= 2.5.5)
-    aws-sdk-core (2.5.5)
+    aws-sdk (2.5.11)
+      aws-sdk-resources (= 2.5.11)
+    aws-sdk-core (2.5.11)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.5.5)
-      aws-sdk-core (= 2.5.5)
-    berkshelf (4.3.5)
+    aws-sdk-resources (2.5.11)
+      aws-sdk-core (= 2.5.11)
+    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)
@@ -24,18 +22,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)
@@ -69,12 +67,13 @@ GEM
     hashie (3.4.4)
     hitimes (1.2.4)
     hitimes (1.2.4-x86-mingw32)
-    httpclient (2.7.2)
-    inspec (0.31.0)
+    httpclient (2.8.2.3)
+    inspec (0.33.2)
       hashie (~> 3.4)
-      json (~> 1.8)
+      json (>= 1.8, < 3.0)
       method_source (~> 0.8)
-      molinillo (~> 0)
+      mixlib-log
+      parallel (~> 1.9)
       pry (~> 0)
       rainbow (~> 2)
       rspec (~> 3)
@@ -82,9 +81,9 @@ GEM
       rubyzip (~> 1.1)
       sslshake (~> 1)
       thor (~> 0.19)
-      train (>= 0.16.0, < 1.0)
+      train (>= 0.19.0, < 1.0)
     jmespath (1.3.1)
-    json (1.8.3)
+    json (2.0.2)
     kitchen-appbundle-updater (0.1.2)
     kitchen-dokken (0.0.32)
       docker-api (~> 1.29)
@@ -95,7 +94,7 @@ GEM
       multi_json
       retryable (~> 2.0)
       test-kitchen (~> 1.4, >= 1.4.1)
-    kitchen-inspec (0.15.0)
+    kitchen-inspec (0.15.1)
       inspec (>= 0.22.0, < 1.0.0)
       test-kitchen (~> 1.6)
     kitchen-vagrant (0.20.0)
@@ -110,7 +109,7 @@ GEM
       mixlib-log
     mixlib-authentication (1.4.1)
       mixlib-log
-    mixlib-config (2.2.2)
+    mixlib-config (2.2.4)
     mixlib-install (1.1.0)
       artifactory
       mixlib-shellout
@@ -121,7 +120,7 @@ GEM
       win32-process (~> 0.8.2)
       wmi-lite (~> 1.0)
     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)
@@ -133,17 +132,18 @@ GEM
     nori (2.6.0)
     octokit (4.3.0)
       sawyer (~> 0.7.0, >= 0.5.3)
+    parallel (1.9.0)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       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)
@@ -155,13 +155,13 @@ 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)
       rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.2)
+    rspec-core (3.5.3)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -179,13 +179,13 @@ 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)
     sslshake (1.0.12)
-    test-kitchen (1.11.1)
+    test-kitchen (1.12.0)
       mixlib-install (~> 1.0, >= 1.0.4)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
@@ -196,33 +196,34 @@ GEM
     thor (0.19.1)
     timers (4.0.4)
       hitimes
-    train (0.17.0)
+    train (0.19.0)
       docker-api (~> 1.26)
-      json (~> 1.8)
+      json (>= 1.8, < 3.0)
       mixlib-shellout (~> 2.0)
       net-scp (~> 1.2)
       net-ssh (>= 2.9, < 4.0)
-      winrm (~> 1.6)
-      winrm-fs (~> 0.3)
+      winrm (~> 2.0)
+      winrm-fs (~> 1.0)
     vagrant-wrapper (2.0.3)
-    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)
     win32-process (0.8.3)
       ffi (>= 1.0.0)
-    winrm (1.8.1)
+    winrm (2.0.1)
       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-fs (0.4.3)
+    winrm-fs (1.0.0)
       erubis (~> 2.7)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)
-      winrm (~> 1.5)
+      winrm (~> 2.0)
     wmi-lite (1.0.0)
 
 PLATFORMS
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index d6d5c48245..895a756c8a 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -50,12 +50,12 @@ GEM
     addressable (2.4.0)
     artifactory (2.3.3)
     awesome_print (1.7.0)
-    aws-sdk (2.5.8)
-      aws-sdk-resources (= 2.5.8)
-    aws-sdk-core (2.5.8)
+    aws-sdk (2.5.11)
+      aws-sdk-resources (= 2.5.11)
+    aws-sdk-core (2.5.11)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.5.8)
-      aws-sdk-core (= 2.5.8)
+    aws-sdk-resources (2.5.11)
+      aws-sdk-core (= 2.5.11)
     berkshelf (4.3.5)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (~> 2.0, >= 2.0.2)
@@ -160,7 +160,7 @@ GEM
     nori (2.6.0)
     octokit (4.3.0)
       sawyer (~> 0.7.0, >= 0.5.3)
-    ohai (8.19.2)
+    ohai (8.20.0)
       chef-config (>= 12.5.0.alpha.1, < 13)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 289d6df1f4..44134bfc9a 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -10,10 +10,10 @@ override "libxslt", version: "1.1.29"
 override "libyaml", version: "0.1.6"
 override "makedepend", version: "1.0.5"
 override "ncurses", version: "5.9"
-override "openssl", version: "1.0.2h"
 override "pkg-config-lite", version: "0.28-1"
 override "ruby", version: "2.3.1"
 override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18"
 override "util-macros", version: "1.19.0"
 override "xproto", version: "7.0.28"
 override "zlib", version: "1.2.8"
+override "openssl", version: "1.0.2h"
diff --git a/version_policy.rb b/version_policy.rb
index aa6ec3e4f4..0a4475286d 100644
--- a/version_policy.rb
+++ b/version_policy.rb
@@ -79,6 +79,7 @@ ACCEPTABLE_OUTDATED_GEMS = [
   "rubocop",    # chefstyle pins this, will often be somewhat behind
   "slop",       # expected to disappear with pry 0.11
   "typhoeus",   # Until the travis gem updates to 1.0.
+  "cucumber-core", # Until cucumber 2.0
 ]
 
 #