Merge pull request #9221 from chef/14_deps

Update all deps to the latest + openssl 1.0.2u

3 files changed, 64 insertions, 61 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 4603d9ec74..ef39e1736c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -97,8 +97,8 @@ GEM
       debug_inspector (>= 0.0.1)
     builder (3.2.4)
     byebug (11.0.1)
-    chef-vault (3.4.3)
-    chef-zero (14.0.13)
+    chef-vault (4.0.1)
+    chef-zero (14.0.17)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 4.0)
       mixlib-log (>= 2.0, < 4.0)
@@ -117,16 +117,16 @@ GEM
     docile (1.3.2)
     equatable (0.6.1)
     erubis (2.7.0)
-    faraday (0.17.1)
+    faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    ffi (1.11.3)
-    ffi (1.11.3-x64-mingw32)
-    ffi (1.11.3-x86-mingw32)
+    ffi (1.12.1)
+    ffi (1.12.1-x64-mingw32)
+    ffi (1.12.1-x86-mingw32)
     ffi-win32-extensions (1.0.3)
       ffi
-    ffi-yajl (2.3.1)
+    ffi-yajl (2.3.3)
       libyajl2 (~> 1.2)
     fuzzyurl (0.9.0)
     hashdiff (1.0.0)
@@ -163,15 +163,15 @@ GEM
     json (2.3.0)
     libyajl2 (1.2.0)
     method_source (0.9.2)
-    mixlib-archive (1.0.1)
+    mixlib-archive (1.0.5)
       mixlib-log
-    mixlib-archive (1.0.1-universal-mingw32)
+    mixlib-archive (1.0.5-universal-mingw32)
       mixlib-log
     mixlib-authentication (2.1.1)
     mixlib-cli (2.1.5)
-    mixlib-config (3.0.5)
+    mixlib-config (3.0.6)
       tomlrb
-    mixlib-log (3.0.1)
+    mixlib-log (3.0.8)
     mixlib-shellout (2.4.4)
     mixlib-shellout (2.4.4-universal-mingw32)
       win32-process (~> 0.8.2)
@@ -203,7 +203,7 @@ GEM
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
     parallel (1.19.1)
-    parser (2.7.0.0)
+    parser (2.7.0.2)
       ast (~> 2.4.0)
     parslet (1.8.2)
     pastel (0.7.3)
@@ -224,8 +224,8 @@ GEM
     pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    public_suffix (4.0.2)
-    rack (2.0.8)
+    public_suffix (4.0.3)
+    rack (2.1.1)
     rainbow (3.0.0)
     rake (12.3.0)
     rb-readline (0.5.5)
@@ -233,18 +233,18 @@ GEM
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
     rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
+    rspec-support (3.9.2)
     rspec_junit_formatter (0.2.3)
       builder (< 4)
       rspec-core (>= 2, < 4, != 2.12.0)
@@ -273,7 +273,7 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     slop (3.6.0)
-    specinfra (2.82.4)
+    specinfra (2.82.7)
       net-scp
       net-ssh (>= 2.7)
       net-telnet (= 0.1.1)
@@ -285,12 +285,14 @@ GEM
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)
     structured_warnings (0.4.0)
+    sync (0.5.0)
     syslog-logger (1.6.8)
     systemu (2.6.5)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
     thor (0.20.3)
-    tins (1.22.2)
+    tins (1.24.0)
+      sync
     tomlrb (1.2.9)
     train-core (1.7.6)
       json (>= 1.8, < 3.0)
@@ -315,12 +317,12 @@ GEM
     unicode-display_width (1.6.0)
     unicode_utils (1.4.0)
     uuidtools (2.1.5)
-    webmock (3.7.6)
+    webmock (3.8.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     win32-api (1.5.3-universal-mingw32)
-    win32-certstore (0.3.0)
+    win32-certstore (0.4.0)
       ffi
       mixlib-shellout
     win32-dir (0.5.1)
@@ -344,8 +346,8 @@ GEM
       ffi
       structured_warnings
     wisper (2.0.1)
-    wmi-lite (1.0.2)
-    yard (0.9.20)
+    wmi-lite (1.0.5)
+    yard (0.9.24)
 
 PLATFORMS
   ruby
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 9bd8978ed3..be1002d8a5 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/chef/omnibus
-  revision: 9fbb95fd6636a034874e9a7e3a1a02e4c8b74c2f
+  revision: 70855aab656d333622c51171828b4f41d04f6ef5
   branch: master
   specs:
-    omnibus (6.1.18)
+    omnibus (6.1.21)
       aws-sdk-s3 (~> 1)
       chef-cleanroom (~> 1.0)
       chef-sugar (>= 3.3)
@@ -14,11 +14,11 @@ GIT
       ohai (>= 13, < 16)
       pedump
       ruby-progressbar (~> 1.7)
-      thor (~> 0.18)
+      thor (>= 0.18, < 2.0)
 
 GIT
   remote: https://github.com/chef/omnibus-software
-  revision: 7402675e2042aa6bae26d6d7025924885b5da67b
+  revision: ebdd701bcf29f76ba7f1bbfc5e338b7c19287133
   branch: master
   specs:
     omnibus-software (4.0.0)
@@ -29,11 +29,11 @@ GEM
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    artifactory (3.0.5)
+    artifactory (3.0.12)
     awesome_print (1.8.0)
     aws-eventstream (1.0.3)
-    aws-partitions (1.260.0)
-    aws-sdk-core (3.86.0)
+    aws-partitions (1.263.0)
+    aws-sdk-core (3.89.1)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
@@ -147,7 +147,7 @@ GEM
       mixlib-shellout (>= 2.0, < 4.0)
       tomlrb (~> 1.2)
     chef-sugar (5.1.9)
-    chef-zero (14.0.13)
+    chef-zero (14.0.17)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 4.0)
       mixlib-log (>= 2.0, < 4.0)
@@ -163,14 +163,14 @@ GEM
     equatable (0.6.1)
     erubi (1.9.0)
     erubis (2.7.0)
-    faraday (0.17.1)
+    faraday (1.0.0)
       multipart-post (>= 1.2, < 3)
-    ffi (1.11.3)
-    ffi (1.11.3-x64-mingw32)
-    ffi (1.11.3-x86-mingw32)
+    ffi (1.12.1)
+    ffi (1.12.1-x64-mingw32)
+    ffi (1.12.1-x86-mingw32)
     ffi-win32-extensions (1.0.3)
       ffi
-    ffi-yajl (2.3.1)
+    ffi-yajl (2.3.3)
       libyajl2 (~> 1.2)
     fuzzyurl (0.9.0)
     gssapi (1.3.0)
@@ -185,7 +185,7 @@ GEM
     ipaddress (0.8.3)
     iso8601 (0.12.1)
     jmespath (1.4.0)
-    kitchen-vagrant (1.6.0)
+    kitchen-vagrant (1.6.1)
       test-kitchen (>= 1.4, < 3)
     libyajl2 (1.2.0)
     license-acceptance (1.0.13)
@@ -193,34 +193,34 @@ GEM
       tomlrb (~> 1.2)
       tty-box (~> 0.3)
       tty-prompt (~> 0.18)
-    license_scout (1.0.29)
+    license_scout (1.1.3)
       ffi-yajl (~> 2.2)
       mixlib-shellout (>= 2.2, < 4.0)
-      toml-rb (~> 1.0)
+      toml-rb (>= 1, < 3)
     little-plugger (1.1.4)
     logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
     method_source (0.9.2)
     minitar (0.9)
-    mixlib-archive (1.0.1)
+    mixlib-archive (1.0.5)
       mixlib-log
-    mixlib-archive (1.0.1-universal-mingw32)
+    mixlib-archive (1.0.5-universal-mingw32)
       mixlib-log
     mixlib-authentication (2.1.1)
     mixlib-cli (2.1.5)
-    mixlib-config (3.0.5)
+    mixlib-config (3.0.6)
       tomlrb
-    mixlib-install (3.11.24)
+    mixlib-install (3.11.26)
       mixlib-shellout
       mixlib-versioning
       thor
-    mixlib-log (3.0.1)
-    mixlib-shellout (3.0.7)
-    mixlib-shellout (3.0.7-universal-mingw32)
+    mixlib-log (3.0.8)
+    mixlib-shellout (3.0.9)
+    mixlib-shellout (3.0.9-universal-mingw32)
       win32-process (~> 0.8.2)
       wmi-lite (~> 1.0)
-    mixlib-versioning (1.2.7)
+    mixlib-versioning (1.2.12)
     molinillo (0.6.6)
     multi_json (1.14.1)
     multipart-post (2.0.0)
@@ -237,7 +237,8 @@ GEM
       net-ssh-gateway (>= 1.2.0)
     net-telnet (0.1.1)
     nori (2.6.0)
-    octokit (4.14.0)
+    octokit (4.15.0)
+      faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     ohai (14.14.0)
       chef-config (>= 12.8, < 15)
@@ -272,25 +273,25 @@ GEM
     pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    public_suffix (4.0.2)
-    rack (2.0.8)
+    public_suffix (4.0.3)
+    rack (2.1.1)
     retryable (3.0.5)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
     rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
+    rspec-support (3.9.2)
     rspec_junit_formatter (0.2.3)
       builder (< 4)
       rspec-core (>= 2, < 4, != 2.12.0)
@@ -307,10 +308,10 @@ GEM
       rspec-its
       specinfra (~> 2.72)
     sfl (2.3)
-    solve (4.0.2)
+    solve (4.0.3)
       molinillo (~> 0.6)
       semverse (>= 1.1, < 4.0)
-    specinfra (2.82.4)
+    specinfra (2.82.7)
       net-scp
       net-ssh (>= 2.7)
       net-telnet (= 0.1.1)
@@ -337,7 +338,7 @@ GEM
       winrm-elevated (~> 1.0)
       winrm-fs (~> 1.1)
     thor (0.20.3)
-    toml-rb (1.1.2)
+    toml-rb (2.0.1)
       citrus (~> 3.0, > 3.0)
     tomlrb (1.2.9)
     tty-box (0.5.0)
@@ -359,7 +360,7 @@ GEM
     unicode_utils (1.4.0)
     uuidtools (2.1.5)
     win32-api (1.5.3-universal-mingw32)
-    win32-certstore (0.3.0)
+    win32-certstore (0.4.0)
       ffi
       mixlib-shellout
     win32-dir (0.5.1)
@@ -401,7 +402,7 @@ GEM
       rubyzip (~> 2.0)
       winrm (~> 2.0)
     wisper (2.0.1)
-    wmi-lite (1.0.2)
+    wmi-lite (1.0.5)
     zhexdump (0.0.2)
 
 PLATFORMS
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index f46599ad42..3cb356a580 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -15,7 +15,7 @@ override "libxslt", version: "1.1.34"
 override "libyaml", version: "0.1.7"
 override "makedepend", version: "1.0.5"
 override "ncurses", version: "5.9"
-override "openssl", version: "1.0.2t"
+override "openssl", version: "1.0.2u"
 override "pkg-config-lite", version: "0.28-1"
 override "ruby", version: "2.5.7"
 override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18"