diff options
| -rw-r--r-- | acceptance/Gemfile.lock | 16 | ||||
| -rw-r--r-- | kitchen-tests/Gemfile.lock | 12 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 18 | ||||
| -rw-r--r-- | omnibus_overrides.rb | 2 | ||||
| -rw-r--r-- | version_policy.rb | 4 |
5 files changed, 28 insertions, 24 deletions
diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock index 3fe4c3d6f4..108fb83509 100644 --- a/acceptance/Gemfile.lock +++ b/acceptance/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://github.com/chef/chef-acceptance.git - revision: 49458ec493dbd12588680eea9f2f9beb76463d09 + revision: 4abda84e2fadd0452b77a8a88d4fd534843ced55 specs: chef-acceptance (0.2.0) mixlib-shellout (~> 2.0) @@ -11,12 +11,12 @@ GEM specs: addressable (2.4.0) artifactory (2.3.2) - aws-sdk (2.3.1) - aws-sdk-resources (= 2.3.1) - aws-sdk-core (2.3.1) + aws-sdk (2.3.2) + aws-sdk-resources (= 2.3.2) + aws-sdk-core (2.3.2) jmespath (~> 1.0) - aws-sdk-resources (2.3.1) - aws-sdk-core (= 2.3.1) + aws-sdk-resources (2.3.2) + aws-sdk-core (= 2.3.2) berkshelf (4.3.2) addressable (~> 2.3, >= 2.3.4) berkshelf-api-client (~> 2.0, >= 2.0.2) @@ -188,7 +188,7 @@ GEM solve (2.0.3) molinillo (~> 0.4.2) semverse (~> 1.1) - test-kitchen (1.7.3) + test-kitchen (1.8.0) mixlib-install (~> 1.0, >= 1.0.4) mixlib-shellout (>= 1.2, < 3.0) net-scp (~> 1.1) @@ -203,7 +203,7 @@ GEM hashie (>= 2.0.2, < 4.0.0) windows_chef_zero (2.0.0) test-kitchen (>= 1.2.1) - winrm (1.8.0) + winrm (1.8.1) builder (>= 2.1.2) gssapi (~> 1.2) gyoku (~> 1.0) diff --git a/kitchen-tests/Gemfile.lock b/kitchen-tests/Gemfile.lock index 04d7012d56..3067871ab3 100644 --- a/kitchen-tests/Gemfile.lock +++ b/kitchen-tests/Gemfile.lock @@ -14,12 +14,12 @@ GEM specs: addressable (2.4.0) artifactory (2.3.2) - aws-sdk (2.3.1) - aws-sdk-resources (= 2.3.1) - aws-sdk-core (2.3.1) + aws-sdk (2.3.2) + aws-sdk-resources (= 2.3.2) + aws-sdk-core (2.3.2) jmespath (~> 1.0) - aws-sdk-resources (2.3.1) - aws-sdk-core (= 2.3.1) + aws-sdk-resources (2.3.2) + aws-sdk-core (= 2.3.2) berkshelf (4.3.2) addressable (~> 2.3, >= 2.3.4) berkshelf-api-client (~> 2.0, >= 2.0.2) @@ -139,7 +139,7 @@ GEM solve (2.0.3) molinillo (~> 0.4.2) semverse (~> 1.1) - test-kitchen (1.7.3) + test-kitchen (1.8.0) mixlib-install (~> 1.0, >= 1.0.4) mixlib-shellout (>= 1.2, < 3.0) net-scp (~> 1.1) diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 76f2ef0f46..879e8ecf4f 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,13 +1,13 @@ GIT remote: https://github.com/chef/omnibus-software.git - revision: b03a220058ff29b9522d7f3ebc335e396647680c + revision: 7e566482a86aca8b94e77285242b6a526fe77ffe specs: omnibus-software (4.0.0) omnibus (>= 5.2.0) GIT remote: https://github.com/chef/omnibus.git - revision: acebe9d9a85930422cda6077e93302e9392ef842 + revision: b62510242eceae2f52f2701f6ee0c4ef48ae8b4a specs: omnibus (5.4.0) aws-sdk (~> 2) @@ -38,12 +38,12 @@ GEM addressable (2.3.8) artifactory (2.3.2) awesome_print (1.6.1) - aws-sdk (2.3.1) - aws-sdk-resources (= 2.3.1) - aws-sdk-core (2.3.1) + aws-sdk (2.3.2) + aws-sdk-resources (= 2.3.2) + aws-sdk-core (2.3.2) jmespath (~> 1.0) - aws-sdk-resources (2.3.1) - aws-sdk-core (= 2.3.1) + aws-sdk-resources (2.3.2) + aws-sdk-core (= 2.3.2) berkshelf (3.3.0) addressable (~> 2.3.4) berkshelf-api-client (~> 1.2) @@ -130,7 +130,7 @@ GEM rspec-core (~> 3.2) rspec-expectations (~> 3.2) rspec-mocks (~> 3.2) - mixlib-cli (1.5.0) + mixlib-cli (1.6.0) mixlib-config (2.2.1) mixlib-install (1.0.11) artifactory @@ -231,7 +231,7 @@ GEM hashie (>= 2.0.2, < 4.0.0) win32-process (0.8.3) ffi (>= 1.0.0) - winrm (1.8.0) + winrm (1.8.1) builder (>= 2.1.2) gssapi (~> 1.2) gyoku (~> 1.0) diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 00a99966e7..3414f217fa 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated by "rake dependencies". Edit version_policy.rb instead. override :rubygems, version: "2.6.4" -override :bundler, version: "1.12.2" +override :bundler, version: "1.12.3" override "libffi", version: "3.2.1" override "libiconv", version: "1.14" override "liblzma", version: "5.2.2" diff --git a/version_policy.rb b/version_policy.rb index 59ebd58160..8d450010d3 100644 --- a/version_policy.rb +++ b/version_policy.rb @@ -71,12 +71,16 @@ OMNIBUS_RUBYGEMS_AT_LATEST_VERSION = { # jwt - expected to update with new oauth2 release # mini_portile2 - should go away *entirely* with new nokogiri release (not a dep anymore) # slop - expected to disappear with new pry release +# stove - halite pins to ~> 3.2 in 1.2.1 +# rubocop - chef-style pins to 0.39.0 in 0.3.1 # ACCEPTABLE_OUTDATED_GEMS = %w{ gherkin jwt mini_portile2 slop + stove + rubocop } # |