Merge pull request #5338 from chef/jk/update

Update all dependencies

5 files changed, 59 insertions, 58 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index d5fb101eda..2c0f19f1da 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/chef/chef-server
-  revision: 8165dfd0524ee6076eda32727cbd0005c9348150
+  revision: 608dbe94d15822a31849952e13549744fc40a702
   specs:
     oc-chef-pedant (2.2.0)
-      activesupport (~> 5.0)
+      activesupport (>= 4.2.7.1, < 6.0)
       erubis (~> 2.7)
       mixlib-authentication (~> 1.4)
       mixlib-config (~> 2.0)
@@ -156,14 +156,14 @@ GEM
     addressable (2.4.0)
     appbundler (0.9.0)
       mixlib-cli (~> 1.4)
-    artifactory (2.3.3)
+    artifactory (2.5.0)
     ast (2.3.0)
-    aws-sdk (2.5.11)
-      aws-sdk-resources (= 2.5.11)
-    aws-sdk-core (2.5.11)
+    aws-sdk (2.6.1)
+      aws-sdk-resources (= 2.6.1)
+    aws-sdk-core (2.6.1)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.5.11)
-      aws-sdk-core (= 2.5.11)
+    aws-sdk-resources (2.6.1)
+      aws-sdk-core (= 2.6.1)
     aws-sdk-v1 (1.66.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
@@ -200,7 +200,7 @@ GEM
     cheffish (4.0.0)
       chef-zero (~> 5.0)
       net-ssh
-    chefspec (5.0.0)
+    chefspec (5.1.1)
       chef (>= 12.0)
       fauxhai (~> 3.6)
       rspec (~> 3.0)
@@ -239,7 +239,7 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.10.0)
       faraday (>= 0.7.4, < 0.10)
-    fauxhai (3.8.0)
+    fauxhai (3.9.0)
       net-ssh
     ffi (1.9.14)
     ffi (1.9.14-x86-mingw32)
@@ -287,7 +287,7 @@ GEM
       chef (~> 12.0)
       stove (~> 4.0)
       thor
-    hashie (3.4.4)
+    hashie (3.4.6)
     highline (1.7.8)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
@@ -298,10 +298,10 @@ GEM
     ipaddress (0.8.3)
     jmespath (1.3.1)
     json (1.8.3)
-    jwt (1.5.4)
+    jwt (1.5.6)
     kitchen-docker (2.6.0.rc.0)
       test-kitchen (>= 1.0.0)
-    kitchen-ec2 (1.1.0)
+    kitchen-ec2 (1.2.0)
       aws-sdk (~> 2)
       excon
       multi_json
@@ -334,7 +334,7 @@ GEM
       mixlib-log
     mixlib-cli (1.7.0)
     mixlib-config (2.2.4)
-    mixlib-install (1.1.0)
+    mixlib-install (1.2.0)
       artifactory
       mixlib-shellout
       mixlib-versioning
@@ -390,7 +390,7 @@ GEM
       plist (~> 3.1)
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
-    parser (2.3.1.2)
+    parser (2.3.1.4)
       ast (~> 2.2)
     pkg-config (1.1.7)
     plist (3.2.0)
@@ -461,7 +461,7 @@ GEM
     ruby-prof (0.16.2)
     ruby-progressbar (1.8.1)
     ruby-shadow (2.5.0)
-    rubyntlm (0.6.0)
+    rubyntlm (0.6.1)
     rubyzip (1.2.0)
     rufus-lru (1.1.0)
     safe_yaml (1.0.4)
@@ -480,7 +480,7 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
-    specinfra (2.61.3)
+    specinfra (2.62.0)
       net-scp
       net-ssh (>= 2.7, < 4.0)
       net-telnet
@@ -490,8 +490,8 @@ GEM
       logify (~> 0.2)
     syslog-logger (1.6.8)
     systemu (2.6.5)
-    test-kitchen (1.12.0)
-      mixlib-install (~> 1.0, >= 1.0.4)
+    test-kitchen (1.13.0)
+      mixlib-install (~> 1.2)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
       net-ssh (>= 2.9, < 4.0)
@@ -546,7 +546,7 @@ GEM
       ffi-win32-extensions
     windows-api (0.4.4)
       win32-api (>= 1.4.5)
-    winrm (2.0.1)
+    winrm (2.0.2)
       builder (>= 2.1.2)
       erubis (~> 2.7)
       gssapi (~> 1.2)
@@ -554,7 +554,7 @@ GEM
       httpclient (~> 2.2, >= 2.2.0.2)
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
-      rubyntlm (~> 0.6.0)
+      rubyntlm (~> 0.6.0, >= 0.6.1)
     winrm-elevated (1.0.0)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock
index 265f8eebf8..c1680665ca 100644
--- a/acceptance/Gemfile.lock
+++ b/acceptance/Gemfile.lock
@@ -77,7 +77,7 @@ GEM
     hashie (3.4.6)
     hitimes (1.2.4)
     httpclient (2.7.2)
-    inspec (0.34.1)
+    inspec (0.35.0)
       hashie (~> 3.4)
       json (>= 1.8, < 3.0)
       method_source (~> 0.8)
diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock
index 16d32a31d9..eba19b8864 100644
--- a/kitchen-tests/Berksfile.lock
+++ b/kitchen-tests/Berksfile.lock
@@ -12,7 +12,7 @@ GRAPH
   apache2 (3.2.2)
   apt (4.0.2)
     compat_resource (>= 12.10)
-  aws (3.4.1)
+  aws (4.0.0)
     ohai (>= 2.1.0)
   base (0.1.0)
     apt (>= 0.0.0)
@@ -38,10 +38,10 @@ GRAPH
     logrotate (>= 1.9.0)
     windows (>= 1.42.0)
   chef-sugar (3.4.0)
-  chef_hostname (0.4.1)
+  chef_hostname (0.4.2)
     compat_resource (>= 0.0.0)
-  compat_resource (12.14.2)
-  cron (1.7.6)
+  compat_resource (12.14.3)
+  cron (2.0.0)
   database (2.3.1)
     aws (>= 0.0.0)
     mysql (~> 5.0)
@@ -50,7 +50,8 @@ GRAPH
     xfs (>= 0.0.0)
   iis (5.0.0)
     windows (>= 1.34.6)
-  iptables (2.2.0)
+  iptables (3.0.0)
+    compat_resource (>= 12.14.3)
   logrotate (2.1.0)
     compat_resource (>= 0.0.0)
   mingw (1.2.4)
@@ -65,11 +66,10 @@ GRAPH
     mysql (>= 0.0.0)
   nscd (4.1.0)
     compat_resource (>= 0.0.0)
-  ntp (3.0.0)
-    windows (>= 1.38.0)
-  ohai (4.2.1)
+  ntp (3.1.0)
+  ohai (4.2.2)
     compat_resource (>= 12.14)
-  openssh (2.0.0)
+  openssh (2.1.0)
     iptables (>= 1.0)
   openssl (4.4.0)
     chef-sugar (>= 3.1.1)
@@ -91,7 +91,7 @@ GRAPH
   sudo (3.0.0)
   ubuntu (2.0.0)
     apt (>= 0.0.0)
-  users (3.0.0)
+  users (4.0.1)
   webapp (0.1.0)
     apache2 (~> 3.2.2)
     database (~> 2.3.1)
diff --git a/kitchen-tests/Gemfile.lock b/kitchen-tests/Gemfile.lock
index 36571ec015..d324684d31 100644
--- a/kitchen-tests/Gemfile.lock
+++ b/kitchen-tests/Gemfile.lock
@@ -2,19 +2,19 @@ GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.4.0)
-    artifactory (2.3.3)
-    aws-sdk (2.5.11)
-      aws-sdk-resources (= 2.5.11)
-    aws-sdk-core (2.5.11)
+    artifactory (2.5.0)
+    aws-sdk (2.6.1)
+      aws-sdk-resources (= 2.6.1)
+    aws-sdk-core (2.6.1)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.5.11)
-      aws-sdk-core (= 2.5.11)
-    berkshelf (5.0.0)
+    aws-sdk-resources (2.6.1)
+      aws-sdk-core (= 2.6.1)
+    berkshelf (5.1.0)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (>= 2.0.2, < 4.0)
       buff-config (~> 2.0)
       buff-extensions (~> 2.0)
-      buff-shell_out (~> 0.1)
+      buff-shell_out (~> 1.0)
       cleanroom (~> 1.0)
       faraday (~> 0.9)
       httpclient (~> 2.7)
@@ -34,16 +34,17 @@ GEM
       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)
+    buff-ruby_engine (1.0.0)
+    buff-shell_out (1.1.0)
+      buff-ruby_engine (~> 1.0)
     builder (3.2.2)
     celluloid (0.16.0)
       timers (~> 4.0.0)
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (12.13.37)
+    chef-config (12.14.60)
+      addressable
       fuzzyurl
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
@@ -64,11 +65,11 @@ GEM
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
-    hashie (3.4.4)
+    hashie (3.4.6)
     hitimes (1.2.4)
     hitimes (1.2.4-x86-mingw32)
     httpclient (2.8.2.4)
-    inspec (0.34.0)
+    inspec (0.35.0)
       hashie (~> 3.4)
       json (>= 1.8, < 3.0)
       method_source (~> 0.8)
@@ -88,7 +89,7 @@ GEM
     kitchen-dokken (1.0.0)
       docker-api (~> 1.29)
       test-kitchen (~> 1.5)
-    kitchen-ec2 (1.1.0)
+    kitchen-ec2 (1.2.0)
       aws-sdk (~> 2)
       excon
       multi_json
@@ -110,7 +111,7 @@ GEM
     mixlib-authentication (1.4.1)
       mixlib-log
     mixlib-config (2.2.4)
-    mixlib-install (1.1.0)
+    mixlib-install (1.2.0)
       artifactory
       mixlib-shellout
       mixlib-versioning
@@ -120,7 +121,7 @@ GEM
       win32-process (~> 0.8.2)
       wmi-lite (~> 1.0)
     mixlib-versioning (1.1.0)
-    molinillo (0.5.0)
+    molinillo (0.5.1)
     multi_json (1.12.1)
     multipart-post (2.0.0)
     net-scp (1.2.1)
@@ -139,12 +140,12 @@ GEM
       slop (~> 3.4)
     rainbow (2.1.0)
     retryable (2.0.4)
-    ridley (5.0.0)
+    ridley (5.1.0)
       addressable
       buff-config (~> 2.0)
       buff-extensions (~> 2.0)
       buff-ignore (~> 1.2)
-      buff-shell_out (~> 0.1)
+      buff-shell_out (~> 1.0)
       celluloid (~> 0.16.0)
       celluloid-io (~> 0.16.1)
       chef-config (>= 12.5.0)
@@ -173,7 +174,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    rubyntlm (0.6.0)
+    rubyntlm (0.6.1)
     rubyzip (1.2.0)
     safe_yaml (1.0.4)
     sawyer (0.7.0)
@@ -185,8 +186,8 @@ GEM
       molinillo (~> 0.4)
       semverse (>= 1.1, < 3.0)
     sslshake (1.0.12)
-    test-kitchen (1.12.0)
-      mixlib-install (~> 1.0, >= 1.0.4)
+    test-kitchen (1.13.0)
+      mixlib-install (~> 1.2)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
       net-ssh (>= 2.9, < 4.0)
@@ -196,7 +197,7 @@ GEM
     thor (0.19.1)
     timers (4.0.4)
       hitimes
-    train (0.19.0)
+    train (0.19.1)
       docker-api (~> 1.26)
       json (>= 1.8, < 3.0)
       mixlib-shellout (~> 2.0)
@@ -210,7 +211,7 @@ GEM
       hashie (>= 2.0.2, < 4.0.0)
     win32-process (0.8.3)
       ffi (>= 1.0.0)
-    winrm (2.0.1)
+    winrm (2.0.2)
       builder (>= 2.1.2)
       erubis (~> 2.7)
       gssapi (~> 1.2)
@@ -218,7 +219,7 @@ GEM
       httpclient (~> 2.2, >= 2.2.0.2)
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
-      rubyntlm (~> 0.6.0)
+      rubyntlm (~> 0.6.0, >= 0.6.1)
     winrm-fs (1.0.0)
       erubis (~> 2.7)
       logging (>= 1.6.1, < 3.0)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 1512f36319..9c022cedf0 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/chef/license_scout.git
-  revision: dbd17c0a99a12e16dd7af27798df863366efc289
+  revision: 3f62c55a03a5d7452daad3c713824ec1561e37f1
   specs:
     license_scout (0.1.2)
       ffi-yajl (~> 2.2)