Bump all deps to current15_bump

Avoid having to fix the openssl deprecation that only impacts ruby 2.8+

Signed-off-by: Tim Smith <tsmith@chef.io>

3 files changed, 87 insertions, 77 deletions

diff --git a/.rubocop.yml b/.rubocop.yml
index 1e0fd2effb..2b0d4af685 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -31,3 +31,7 @@ Lint/ShadowedException:
   Enabled: false
 Lint/UriEscapeUnescape:
   Enabled: false
+
+# These are fixed on master and not needed here
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: false
\ No newline at end of file
diff --git a/Gemfile.lock b/Gemfile.lock
index 05d7c5d3bc..ba82dbf543 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
 GIT
   remote: https://github.com/chef/chefstyle.git
-  revision: d8b485c06560bffe507ba519137a5aceb8ee0ac8
+  revision: 309b638d8434b8a98f7c54329947ea11c8373ef4
   branch: master
   specs:
-    chefstyle (1.0.5)
-      rubocop (= 0.83.0)
+    chefstyle (1.1.1)
+      rubocop (= 0.85.1)
 
 GIT
   remote: https://github.com/chef/ohai.git
@@ -134,7 +134,7 @@ GEM
     appbundler (0.13.2)
       mixlib-cli (>= 1.4, < 3.0)
       mixlib-shellout (>= 2.0, < 4.0)
-    ast (2.4.0)
+    ast (2.4.1)
     bcrypt_pbkdf (1.1.0.rc1)
     bcrypt_pbkdf (1.1.0.rc1-x64-mingw32)
     bcrypt_pbkdf (1.1.0.rc1-x86-mingw32)
@@ -157,12 +157,12 @@ GEM
     cheffish (14.0.13)
       chef-zero (~> 14.0)
       net-ssh
-    coderay (1.1.2)
+    coderay (1.1.3)
     concurrent-ruby (1.1.6)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     debug_inspector (0.0.3)
-    diff-lcs (1.3)
+    diff-lcs (1.4)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     ecma-re-validator (0.2.1)
@@ -175,9 +175,9 @@ GEM
       multipart-post (>= 1.2, < 3)
     fauxhai-ng (8.2.0)
       net-ssh
-    ffi (1.12.2)
-    ffi (1.12.2-x64-mingw32)
-    ffi (1.12.2-x86-mingw32)
+    ffi (1.13.1)
+    ffi (1.13.1-x64-mingw32)
+    ffi (1.13.1-x86-mingw32)
     ffi-libarchive (1.0.0)
       ffi (~> 1.0)
     ffi-win32-extensions (1.0.3)
@@ -205,7 +205,7 @@ GEM
     http_parser.rb (0.6.0)
     httpclient (2.8.3)
     iniparse (1.5.0)
-    inspec-core (4.18.114)
+    inspec-core (4.20.10)
       addressable (~> 2.4)
       chef-telemetry (~> 1.0)
       faraday (>= 0.9.0)
@@ -226,14 +226,14 @@ GEM
       sslshake (~> 1.2)
       term-ansicolor (~> 1.7)
       thor (>= 0.20, < 2.0)
-      tomlrb (~> 1.2)
+      tomlrb (~> 1.2.0)
       train-core (~> 3.0)
       tty-prompt (~> 0.17)
       tty-table (~> 0.10)
-    inspec-core-bin (4.18.114)
-      inspec-core (= 4.18.114)
+    inspec-core-bin (4.20.10)
+      inspec-core (= 4.20.10)
     ipaddress (0.8.3)
-    iso8601 (0.12.1)
+    iso8601 (0.12.2)
     json (2.3.0)
     json_schemer (0.2.11)
       ecma-re-validator (~> 0.2)
@@ -267,8 +267,8 @@ GEM
     multi_json (1.14.1)
     multipart-post (2.1.1)
     necromancer (0.5.1)
-    net-scp (2.0.0)
-      net-ssh (>= 2.6.5, < 6.0.0)
+    net-scp (3.0.0)
+      net-ssh (>= 2.6.5, < 7.0.0)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
     net-ssh (5.2.0)
@@ -278,9 +278,9 @@ GEM
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
     nori (2.6.0)
-    parallel (1.19.1)
-    parser (2.7.1.2)
-      ast (~> 2.4.0)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
     parslet (1.8.2)
     pastel (0.7.4)
       equatable (~> 0.6)
@@ -296,15 +296,15 @@ GEM
     pry-remote (0.1.8)
       pry (~> 0.9)
       slop (~> 3.0)
-    pry-stack_explorer (0.4.9.3)
-      binding_of_caller (>= 0.7)
-      pry (>= 0.9.11)
+    pry-stack_explorer (0.5.1)
+      binding_of_caller (~> 0.7)
+      pry (~> 0.13)
     public_suffix (4.0.5)
-    rack (2.2.2)
+    rack (2.2.3)
     rainbow (3.0.0)
     rake (12.3.3)
     rb-readline (0.5.5)
-    regexp_parser (1.7.0)
+    regexp_parser (1.7.1)
     rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
@@ -325,13 +325,17 @@ GEM
     rspec_junit_formatter (0.2.3)
       builder (< 4)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.83.0)
+    rubocop (0.85.1)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
       rexml
+      rubocop-ast (>= 0.0.3)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.0.3)
+      parser (>= 2.7.0.1)
     ruby-prof (1.2.0)
     ruby-progressbar (1.10.1)
     ruby-shadow (2.5.0)
@@ -340,7 +344,7 @@ GEM
     safe_yaml (1.0.5)
     semverse (3.0.0)
     slop (3.6.0)
-    sslshake (1.3.0)
+    sslshake (1.3.1)
     strings (0.1.8)
       strings-ansi (~> 0.1)
       unicode-display_width (~> 1.5)
@@ -355,13 +359,14 @@ GEM
     thor (1.0.1)
     tins (1.25.0)
       sync
-    tomlrb (1.3.0)
-    train-core (3.2.28)
+    tomlrb (1.2.9)
+    train-core (3.3.1)
       addressable (~> 2.5)
+      ffi (!= 1.13.0)
       json (>= 1.8, < 3.0)
       mixlib-shellout (>= 2.0, < 4.0)
-      net-scp (>= 1.2, < 3.0)
-      net-ssh (>= 2.9, < 6.0)
+      net-scp (>= 1.2, < 4.0)
+      net-ssh (>= 2.9, < 7.0)
     train-winrm (0.2.6)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
@@ -379,7 +384,7 @@ GEM
       tty-cursor (~> 0.7)
       tty-screen (~> 0.7)
       wisper (~> 2.0.0)
-    tty-screen (0.7.1)
+    tty-screen (0.8.0)
     tty-table (0.11.0)
       equatable (~> 0.6)
       necromancer (~> 0.5)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index f1988e64f6..3275c17a67 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/chef/omnibus
-  revision: 3327abfbe926622e8759a7001ebc0ed40e74a533
+  revision: d75718522deb9faeb3c21b50c60e94daf70ce9b6
   branch: master
   specs:
-    omnibus (7.0.10)
+    omnibus (7.0.13)
       aws-sdk-s3 (~> 1)
       chef-cleanroom (~> 1.0)
       chef-sugar (>= 3.3)
@@ -18,7 +18,7 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus-software
-  revision: 1193dc710f66809eb4abd69ea29b23234527acc5
+  revision: 2cf96c6c07de7d05ded6b45a0531feb10ae7cd9e
   branch: master
   specs:
     omnibus-software (4.0.0)
@@ -29,24 +29,24 @@ GEM
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    artifactory (3.0.13)
+    artifactory (3.0.15)
     awesome_print (1.8.0)
     aws-eventstream (1.1.0)
-    aws-partitions (1.319.0)
-    aws-sdk-core (3.96.1)
+    aws-partitions (1.332.0)
+    aws-sdk-core (3.100.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.31.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-kms (1.34.1)
+      aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.66.0)
-      aws-sdk-core (~> 3, >= 3.96.1)
+    aws-sdk-s3 (1.69.1)
+      aws-sdk-core (~> 3, >= 3.99.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.1.3)
-      aws-eventstream (~> 1.0, >= 1.0.2)
+    aws-sigv4 (1.2.0)
+      aws-eventstream (~> 1, >= 1.0.2)
     bcrypt_pbkdf (1.1.0.rc1)
     bcrypt_pbkdf (1.1.0.rc1-x64-mingw32)
     bcrypt_pbkdf (1.1.0.rc1-x86-mingw32)
@@ -64,18 +64,18 @@ GEM
       solve (~> 4.0)
       thor (>= 0.20)
     builder (3.2.4)
-    chef (16.1.0)
+    chef (16.2.44)
       addressable
       bcrypt_pbkdf (= 1.1.0.rc1)
       bundler (>= 1.10)
-      chef-config (= 16.1.0)
-      chef-utils (= 16.1.0)
+      chef-config (= 16.2.44)
+      chef-utils (= 16.2.44)
       chef-vault
       chef-zero (>= 14.0.11)
       diff-lcs (~> 1.2, >= 1.2.4)
       ed25519 (~> 1.2)
       erubis (~> 2.7)
-      ffi (~> 1.9, >= 1.9.25)
+      ffi (>= 1.9.25)
       ffi-libarchive
       ffi-yajl (~> 2.2)
       highline (>= 1.6.9, < 3)
@@ -86,8 +86,8 @@ GEM
       mixlib-cli (>= 2.1.1, < 3.0)
       mixlib-log (>= 2.0.3, < 4.0)
       mixlib-shellout (>= 3.0.3, < 4.0)
-      net-sftp (~> 2.1, >= 2.1.2)
-      net-ssh (>= 4.2, < 6)
+      net-sftp (>= 2.1.2, < 4.0)
+      net-ssh (>= 4.2, < 7)
       net-ssh-multi (~> 1.2, >= 1.2.1)
       ohai (~> 16.0)
       pastel
@@ -98,18 +98,18 @@ GEM
       train-winrm (>= 0.2.5)
       tty-screen (~> 0.6)
       uuidtools (~> 2.1.5)
-    chef (16.1.0-universal-mingw32)
+    chef (16.2.44-universal-mingw32)
       addressable
       bcrypt_pbkdf (= 1.1.0.rc1)
       bundler (>= 1.10)
-      chef-config (= 16.1.0)
-      chef-utils (= 16.1.0)
+      chef-config (= 16.2.44)
+      chef-utils (= 16.2.44)
       chef-vault
       chef-zero (>= 14.0.11)
       diff-lcs (~> 1.2, >= 1.2.4)
       ed25519 (~> 1.2)
       erubis (~> 2.7)
-      ffi (~> 1.9, >= 1.9.25)
+      ffi (>= 1.9.25)
       ffi-libarchive
       ffi-yajl (~> 2.2)
       highline (>= 1.6.9, < 3)
@@ -121,8 +121,8 @@ GEM
       mixlib-cli (>= 2.1.1, < 3.0)
       mixlib-log (>= 2.0.3, < 4.0)
       mixlib-shellout (>= 3.0.3, < 4.0)
-      net-sftp (~> 2.1, >= 2.1.2)
-      net-ssh (>= 4.2, < 6)
+      net-sftp (>= 2.1.2, < 4.0)
+      net-ssh (>= 4.2, < 7)
       net-ssh-multi (~> 1.2, >= 1.2.1)
       ohai (~> 16.0)
       pastel
@@ -145,15 +145,15 @@ GEM
       win32-taskscheduler (~> 2.0)
       wmi-lite (~> 1.0)
     chef-cleanroom (1.0.2)
-    chef-config (16.1.0)
+    chef-config (16.2.44)
       addressable
-      chef-utils (= 16.1.0)
+      chef-utils (= 16.2.44)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
       tomlrb (~> 1.2)
     chef-sugar (5.1.9)
-    chef-utils (16.1.0)
+    chef-utils (16.2.44)
     chef-vault (4.0.1)
     chef-zero (15.0.0)
       ffi-yajl (~> 2.2)
@@ -164,16 +164,16 @@ GEM
     citrus (3.0.2)
     cleanroom (1.0.0)
     concurrent-ruby (1.1.6)
-    diff-lcs (1.3)
+    diff-lcs (1.4)
     ed25519 (1.2.4)
     equatable (0.6.1)
     erubi (1.9.0)
     erubis (2.7.0)
     faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-    ffi (1.12.2)
-    ffi (1.12.2-x64-mingw32)
-    ffi (1.12.2-x86-mingw32)
+    ffi (1.13.1)
+    ffi (1.13.1-x64-mingw32)
+    ffi (1.13.1-x86-mingw32)
     ffi-libarchive (1.0.0)
       ffi (~> 1.0)
     ffi-win32-extensions (1.0.3)
@@ -191,7 +191,7 @@ GEM
     iniparse (1.5.0)
     iostruct (0.0.4)
     ipaddress (0.8.3)
-    iso8601 (0.12.1)
+    iso8601 (0.12.2)
     jmespath (1.4.0)
     json (2.3.0)
     kitchen-vagrant (1.6.1)
@@ -233,11 +233,11 @@ GEM
     multi_json (1.14.1)
     multipart-post (2.1.1)
     necromancer (0.5.1)
-    net-scp (2.0.0)
-      net-ssh (>= 2.6.5, < 6.0.0)
-    net-sftp (2.1.2)
-      net-ssh (>= 2.6.5)
-    net-ssh (5.2.0)
+    net-scp (3.0.0)
+      net-ssh (>= 2.6.5, < 7.0.0)
+    net-sftp (3.0.0)
+      net-ssh (>= 5.0.0, < 7.0.0)
+    net-ssh (6.1.0)
     net-ssh-gateway (2.0.0)
       net-ssh (>= 4.0.0)
     net-ssh-multi (1.2.1)
@@ -247,7 +247,7 @@ GEM
     octokit (4.18.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (16.1.1)
+    ohai (16.2.0)
       chef-config (>= 12.8, < 17)
       chef-utils (>= 16.0, < 17)
       ffi (~> 1.9)
@@ -274,7 +274,7 @@ GEM
     progressbar (1.10.1)
     proxifier (1.0.3)
     public_suffix (4.0.5)
-    rack (2.2.2)
+    rack (2.2.3)
     rainbow (3.0.0)
     retryable (3.0.5)
     ruby-progressbar (1.10.1)
@@ -295,7 +295,7 @@ GEM
     structured_warnings (0.4.0)
     syslog-logger (1.6.8)
     systemu (2.6.5)
-    test-kitchen (2.5.1)
+    test-kitchen (2.5.2)
       bcrypt_pbkdf (~> 1.0)
       ed25519 (~> 1.2)
       license-acceptance (~> 1.0, >= 1.0.11)
@@ -304,20 +304,21 @@ GEM
       net-scp (>= 1.1, < 4.0)
       net-ssh (>= 2.9, < 7.0)
       net-ssh-gateway (>= 1.2, < 3.0)
-      thor (~> 0.19)
+      thor (>= 0.19, < 2.0)
       winrm (~> 2.0)
       winrm-elevated (~> 1.0)
       winrm-fs (~> 1.1)
-    thor (0.20.3)
+    thor (1.0.1)
     toml-rb (2.0.1)
       citrus (~> 3.0, > 3.0)
     tomlrb (1.3.0)
-    train-core (3.2.28)
+    train-core (3.3.1)
       addressable (~> 2.5)
+      ffi (!= 1.13.0)
       json (>= 1.8, < 3.0)
       mixlib-shellout (>= 2.0, < 4.0)
-      net-scp (>= 1.2, < 3.0)
-      net-ssh (>= 2.9, < 6.0)
+      net-scp (>= 1.2, < 4.0)
+      net-ssh (>= 2.9, < 7.0)
     train-winrm (0.2.6)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
@@ -335,7 +336,7 @@ GEM
       tty-cursor (~> 0.7)
       tty-screen (~> 0.7)
       wisper (~> 2.0.0)
-    tty-screen (0.7.1)
+    tty-screen (0.8.0)
     unicode-display_width (1.7.0)
     unicode_utils (1.4.0)
     uuidtools (2.1.5)