Merge pull request #8304 from chef/loosen_deps

Loosen mixlib deps to allow for the latest versions

4 files changed, 47 insertions, 48 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 23d160ebb2..38c41eed47 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,18 +8,18 @@ GIT
 
 GIT
   remote: https://github.com/chef/ohai.git
-  revision: dd8aac97c78d23aa0afb698c1a76e5930ec9978e
+  revision: 05e507952d8dbff8e31528f1ebcab72664e99aa2
   branch: master
   specs:
-    ohai (15.0.29)
+    ohai (15.0.30)
       chef-config (>= 12.8, < 16)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
       ipaddress
       mixlib-cli (>= 1.7.0)
-      mixlib-config (~> 2.0)
-      mixlib-log (~> 2.0, >= 2.0.1)
-      mixlib-shellout (~> 2.0)
+      mixlib-config (>= 2.0, < 4.0)
+      mixlib-log (>= 2.0.1, < 4.0)
+      mixlib-shellout (>= 2.0, < 4.0)
       plist (~> 3.1)
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
@@ -40,9 +40,9 @@ PATH
       iniparse (~> 1.4)
       mixlib-archive (>= 0.4, < 2.0)
       mixlib-authentication (~> 2.1)
-      mixlib-cli (~> 1.7)
-      mixlib-log (~> 2.0, >= 2.0.3)
-      mixlib-shellout (~> 2.4)
+      mixlib-cli (>= 1.7, < 3.0)
+      mixlib-log (>= 2.0.3, < 4.0)
+      mixlib-shellout (>= 2.4, < 4.0)
       net-sftp (~> 2.1, >= 2.1.2)
       net-ssh (~> 4.2)
       net-ssh-multi (~> 1.2, >= 1.2.1)
@@ -65,9 +65,9 @@ PATH
       iso8601 (~> 0.12.1)
       mixlib-archive (>= 0.4, < 2.0)
       mixlib-authentication (~> 2.1)
-      mixlib-cli (~> 1.7)
-      mixlib-log (~> 2.0, >= 2.0.3)
-      mixlib-shellout (~> 2.4)
+      mixlib-cli (>= 1.7, < 3.0)
+      mixlib-log (>= 2.0.3, < 4.0)
+      mixlib-shellout (>= 2.4, < 4.0)
       net-sftp (~> 2.1, >= 2.1.2)
       net-ssh (~> 4.2)
       net-ssh-multi (~> 1.2, >= 1.2.1)
@@ -95,24 +95,23 @@ PATH
     chef-config (15.0.190)
       addressable
       fuzzyurl
-      mixlib-config (>= 2.2.12, < 3.0)
-      mixlib-shellout (~> 2.0)
+      mixlib-config (>= 2.2.12, < 4.0)
+      mixlib-shellout (>= 2.0, < 4.0)
       tomlrb (~> 1.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    appbundler (0.11.6)
-      mixlib-cli (~> 1.4)
-      mixlib-shellout (~> 2.0)
+    addressable (2.4.0)
+    appbundler (0.12.0)
+      mixlib-cli (>= 1.4, < 3.0)
+      mixlib-shellout (>= 2.0, < 4.0)
     ast (2.4.0)
     backports (3.12.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.3)
-    byebug (11.0.0)
+    byebug (11.0.1)
     chef-vault (3.4.3)
     chef-zero (14.0.11)
       ffi-yajl (~> 2.2)
@@ -193,7 +192,7 @@ GEM
     mixlib-archive (1.0.1-universal-mingw32)
       mixlib-log
     mixlib-authentication (2.1.1)
-    mixlib-cli (1.7.0)
+    mixlib-cli (2.0.1)
     mixlib-config (2.2.18)
       tomlrb
     mixlib-log (2.0.9)
@@ -239,7 +238,6 @@ GEM
     pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    public_suffix (3.0.3)
     pusher-client (0.6.2)
       json
       websocket (~> 1.0)
diff --git a/chef-config/chef-config.gemspec b/chef-config/chef-config.gemspec
index 547735bb55..b6bc5da1c9 100644
--- a/chef-config/chef-config.gemspec
+++ b/chef-config/chef-config.gemspec
@@ -15,8 +15,8 @@ Gem::Specification.new do |spec|
 
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "mixlib-shellout", "~> 2.0"
-  spec.add_dependency "mixlib-config", ">= 2.2.12", "< 3.0"
+  spec.add_dependency "mixlib-shellout", ">= 2.0", "< 4.0"
+  spec.add_dependency "mixlib-config", ">= 2.2.12", "< 4.0"
   spec.add_dependency "fuzzyurl"
   spec.add_dependency "addressable"
   spec.add_dependency "tomlrb", "~> 1.2"
diff --git a/chef.gemspec b/chef.gemspec
index 1f3c6e4291..bb0c1f290e 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -17,10 +17,10 @@ Gem::Specification.new do |s|
 
   s.add_dependency "chef-config", "= #{Chef::VERSION}"
 
-  s.add_dependency "mixlib-cli", "~> 1.7"
-  s.add_dependency "mixlib-log", "~> 2.0", ">= 2.0.3"
+  s.add_dependency "mixlib-cli", ">= 1.7", "< 3.0"
+  s.add_dependency "mixlib-log", ">= 2.0.3", "< 4.0"
   s.add_dependency "mixlib-authentication", "~> 2.1"
-  s.add_dependency "mixlib-shellout", "~> 2.4"
+  s.add_dependency "mixlib-shellout", ">= 2.4", "< 4.0"
   s.add_dependency "mixlib-archive", ">= 0.4", "< 2.0"
   s.add_dependency "ohai", "~> 15.0"
 
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 608865db7a..e85c9846bc 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,24 +1,24 @@
 GIT
   remote: https://github.com/chef/omnibus
-  revision: 10151d127fef039839ce0e6072b68fe695b1d3c5
+  revision: 7c1e039856513835f728b4e0c5a4106c339e99c2
   branch: master
   specs:
-    omnibus (6.0.19)
+    omnibus (6.0.20)
       aws-sdk-s3 (~> 1)
       chef-sugar (>= 3.3)
       cleanroom (~> 1.0)
       ffi-yajl (~> 2.2)
       license_scout (~> 1.0)
-      mixlib-shellout (~> 2.0)
+      mixlib-shellout (>= 2.0, < 4.0)
       mixlib-versioning
-      ohai (>= 13, < 15)
+      ohai (>= 13, < 16)
       pedump
       ruby-progressbar (~> 1.7)
       thor (~> 0.18)
 
 GIT
   remote: https://github.com/chef/omnibus-software
-  revision: 44f52c320c3fe866e4d4186319fb6b5537f0656f
+  revision: 93d8f49c8a5add0efd03a05c3311e49eea82b5ed
   branch: master
   specs:
     omnibus-software (4.0.0)
@@ -33,30 +33,31 @@ GEM
     awesome_print (1.8.0)
     aws-eventstream (1.0.2)
     aws-partitions (1.144.0)
-    aws-sdk-core (3.46.2)
-      aws-eventstream (~> 1.0)
+    aws-sdk-core (3.48.0)
+      aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1.0)
-      aws-sigv4 (~> 1.0)
+      aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.13.0)
-      aws-sdk-core (~> 3, >= 3.39.0)
-      aws-sigv4 (~> 1.0)
-    aws-sdk-s3 (1.31.0)
-      aws-sdk-core (~> 3, >= 3.39.0)
+    aws-sdk-kms (1.15.0)
+      aws-sdk-core (~> 3, >= 3.48.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.33.0)
+      aws-sdk-core (~> 3, >= 3.48.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.0)
-    aws-sigv4 (1.0.3)
-    berkshelf (7.0.7)
+    aws-sigv4 (1.1.0)
+      aws-eventstream (~> 1.0, >= 1.0.2)
+    berkshelf (7.0.8)
       chef (>= 13.6.52)
       chef-config
       cleanroom (~> 1.0)
       concurrent-ruby (~> 1.0)
       minitar (>= 0.6)
-      mixlib-archive (~> 0.4)
+      mixlib-archive (>= 0.4, < 2.0)
       mixlib-config (>= 2.2.5)
-      mixlib-shellout (~> 2.0)
+      mixlib-shellout (>= 2.0, < 4.0)
       octokit (~> 4.0)
-      retryable (~> 2.0)
+      retryable (>= 2.0, < 4.0)
       solve (~> 4.0)
       thor (>= 0.20)
     builder (3.2.3)
@@ -173,7 +174,7 @@ GEM
     ipaddress (0.8.3)
     iso8601 (0.12.1)
     jmespath (1.4.0)
-    kitchen-vagrant (1.4.0)
+    kitchen-vagrant (1.5.0)
       test-kitchen (~> 1.4)
     libyajl2 (1.2.0)
     license_scout (1.0.22)
@@ -185,9 +186,9 @@ GEM
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
     minitar (0.8)
-    mixlib-archive (0.4.20)
+    mixlib-archive (1.0.1)
       mixlib-log
-    mixlib-archive (0.4.20-universal-mingw32)
+    mixlib-archive (1.0.1-universal-mingw32)
       mixlib-log
     mixlib-authentication (2.1.1)
     mixlib-cli (1.7.0)
@@ -243,7 +244,7 @@ GEM
     proxifier (1.0.3)
     public_suffix (3.0.3)
     rack (2.0.6)
-    retryable (2.0.4)
+    retryable (3.0.4)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)