diff options
author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-10-03 20:06:31 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-03 20:06:31 -0700 |
commit | 00592d7b8ffe80896e6aef341247f980b7f49d1d (patch) | |
tree | e08dc8bba3d9f4564ec8c383e3ef013e4aefe6a1 | |
parent | a841165d9b8fd6f896e9a67e3ed7f5171c525bf3 (diff) | |
parent | ebfdc0a70977a2b1371192d81683d839366bc2d1 (diff) | |
download | chef-00592d7b8ffe80896e6aef341247f980b7f49d1d.tar.gz |
Merge pull request #5405 from chef/deps
update dependencies
-rw-r--r-- | Gemfile.lock | 35 | ||||
-rw-r--r-- | acceptance/Gemfile.lock | 18 | ||||
-rw-r--r-- | kitchen-tests/Berksfile.lock | 4 | ||||
-rw-r--r-- | kitchen-tests/Gemfile.lock | 20 | ||||
-rw-r--r-- | omnibus/Gemfile.lock | 2 | ||||
-rw-r--r-- | omnibus_overrides.rb | 2 |
6 files changed, 40 insertions, 41 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 6e0be9fb23..33b5593463 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/chef/chef-server - revision: aa7b99ac81ff4c018a0081e9a273b87b15342f12 + revision: 6fde9680c6efdcd0792bec840b7fe7f6fbee790f specs: oc-chef-pedant (2.2.0) activesupport (>= 4.2.7.1, < 6.0) @@ -125,12 +125,12 @@ GEM mixlib-cli (~> 1.4) artifactory (2.5.0) ast (2.3.0) - aws-sdk (2.6.4) - aws-sdk-resources (= 2.6.4) - aws-sdk-core (2.6.4) + aws-sdk (2.6.5) + aws-sdk-resources (= 2.6.5) + aws-sdk-core (2.6.5) jmespath (~> 1.0) - aws-sdk-resources (2.6.4) - aws-sdk-core (= 2.6.4) + aws-sdk-resources (2.6.5) + aws-sdk-core (= 2.6.5) aws-sdk-v1 (1.66.0) json (~> 1.4) nokogiri (>= 1.4.4) @@ -138,7 +138,7 @@ GEM binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) builder (3.2.2) - byebug (9.0.5) + byebug (9.0.6) chef-api (0.7.0) logify (~> 0.1) mime-types @@ -178,7 +178,6 @@ GEM simplecov url coderay (1.1.1) - colorize (0.8.1) concurrent-ruby (1.0.2) cucumber (2.4.0) builder (>= 2.1.2) @@ -214,7 +213,7 @@ GEM ffi ffi-yajl (2.3.0) libyajl2 (~> 1.2) - foodcritic (7.1.0) + foodcritic (8.0.0) cucumber-core (>= 1.3) erubis nokogiri (>= 1.5, < 2.0) @@ -241,9 +240,9 @@ GEM faraday (~> 0.8, < 0.10) hashie (>= 3.4) oauth2 (~> 1.0) - github_changelog_generator (1.13.1) - colorize (~> 0.7) - github_api (~> 0.12) + github_changelog_generator (1.13.2) + github_api (>= 0.14) + rainbow (>= 2.1) rake (>= 10.0) gssapi (1.2.0) ffi (>= 1.0.1) @@ -256,7 +255,7 @@ GEM thor hashie (3.4.6) highline (1.7.8) - http-cookie (1.0.2) + http-cookie (1.0.3) domain_name (~> 0.5) httpclient (2.8.2.4) i18n (0.7.0) @@ -301,7 +300,7 @@ GEM mixlib-log mixlib-cli (1.7.0) mixlib-config (2.2.4) - mixlib-install (2.0.0) + mixlib-install (2.0.3) artifactory mixlib-shellout mixlib-versioning @@ -363,12 +362,12 @@ GEM plist (3.2.0) poise (2.7.1) halite (~> 1.0) - poise-boiler (1.12.0) + poise-boiler (1.13.0) bundler chefspec (~> 5.0) codeclimate-test-reporter (~> 0.4) codecov (~> 0.0, >= 0.0.2) - foodcritic (~> 7.0) + foodcritic (~> 8.0) fuubar (~> 2.0) git (~> 1.2) halite (~> 1.2) @@ -430,7 +429,7 @@ GEM rspec-core (~> 3.5.0) rspec-expectations (~> 3.5.0) rspec-mocks (~> 3.5.0) - rspec-core (3.5.3) + rspec-core (3.5.4) rspec-support (~> 3.5.0) rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) @@ -541,7 +540,7 @@ GEM ffi-win32-extensions windows-api (0.4.4) win32-api (>= 1.4.5) - winrm (2.0.2) + winrm (2.0.3) builder (>= 2.1.2) erubis (~> 2.7) gssapi (~> 1.2) diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock index 20f8374cd9..55da7b77a8 100644 --- a/acceptance/Gemfile.lock +++ b/acceptance/Gemfile.lock @@ -11,12 +11,12 @@ GEM specs: addressable (2.4.0) artifactory (2.5.0) - aws-sdk (2.6.3) - aws-sdk-resources (= 2.6.3) - aws-sdk-core (2.6.3) + aws-sdk (2.6.5) + aws-sdk-resources (= 2.6.5) + aws-sdk-core (2.6.5) jmespath (~> 1.0) - aws-sdk-resources (2.6.3) - aws-sdk-core (= 2.6.3) + aws-sdk-resources (2.6.5) + aws-sdk-core (= 2.6.5) berkshelf (4.3.5) addressable (~> 2.3, >= 2.3.4) berkshelf-api-client (~> 2.0, >= 2.0.2) @@ -61,11 +61,11 @@ GEM cleanroom (1.0.0) coderay (1.1.1) diff-lcs (1.2.5) - docker-api (1.31.0) + docker-api (1.32.0) excon (>= 0.38.0) json erubis (2.7.0) - excon (0.52.0) + excon (0.53.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) ffi (1.9.14) @@ -163,7 +163,7 @@ GEM rspec-core (~> 3.5.0) rspec-expectations (~> 3.5.0) rspec-mocks (~> 3.5.0) - rspec-core (3.5.3) + rspec-core (3.5.4) rspec-support (~> 3.5.0) rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) @@ -211,7 +211,7 @@ GEM hashie (>= 2.0.2, < 4.0.0) windows_chef_zero (2.0.0) test-kitchen (>= 1.2.1) - winrm (2.0.2) + winrm (2.0.3) builder (>= 2.1.2) erubis (~> 2.7) gssapi (~> 1.2) diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock index 23cb1f45be..0a60ca95f6 100644 --- a/kitchen-tests/Berksfile.lock +++ b/kitchen-tests/Berksfile.lock @@ -29,7 +29,7 @@ GRAPH sudo (>= 0.0.0) ubuntu (>= 0.0.0) users (>= 0.0.0) - build-essential (6.0.6) + build-essential (7.0.0) compat_resource (>= 12.14) mingw (>= 1.1) seven_zip (>= 0.0.0) @@ -66,7 +66,7 @@ GRAPH mysql (>= 0.0.0) nscd (4.1.0) compat_resource (>= 0.0.0) - ntp (3.1.0) + ntp (3.2.0) ohai (4.2.2) compat_resource (>= 12.14) openssh (2.1.0) diff --git a/kitchen-tests/Gemfile.lock b/kitchen-tests/Gemfile.lock index 199e3a93cb..f1e544cc08 100644 --- a/kitchen-tests/Gemfile.lock +++ b/kitchen-tests/Gemfile.lock @@ -3,12 +3,12 @@ GEM specs: addressable (2.4.0) artifactory (2.5.0) - aws-sdk (2.6.3) - aws-sdk-resources (= 2.6.3) - aws-sdk-core (2.6.3) + aws-sdk (2.6.5) + aws-sdk-resources (= 2.6.5) + aws-sdk-core (2.6.5) jmespath (~> 1.0) - aws-sdk-resources (2.6.3) - aws-sdk-core (= 2.6.3) + aws-sdk-resources (2.6.5) + aws-sdk-core (= 2.6.5) berkshelf (5.1.0) addressable (~> 2.3, >= 2.3.4) berkshelf-api-client (>= 2.0.2, < 4.0) @@ -51,11 +51,11 @@ GEM cleanroom (1.0.0) coderay (1.1.1) diff-lcs (1.2.5) - docker-api (1.31.0) + docker-api (1.32.0) excon (>= 0.38.0) json erubis (2.7.0) - excon (0.52.0) + excon (0.53.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) ffi (1.9.14) @@ -111,7 +111,7 @@ GEM mixlib-authentication (1.4.1) mixlib-log mixlib-config (2.2.4) - mixlib-install (2.0.0) + mixlib-install (2.0.3) artifactory mixlib-shellout mixlib-versioning @@ -162,7 +162,7 @@ GEM rspec-core (~> 3.5.0) rspec-expectations (~> 3.5.0) rspec-mocks (~> 3.5.0) - rspec-core (3.5.3) + rspec-core (3.5.4) rspec-support (~> 3.5.0) rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) @@ -211,7 +211,7 @@ GEM hashie (>= 2.0.2, < 4.0.0) win32-process (0.8.3) ffi (>= 1.0.0) - winrm (2.0.2) + winrm (2.0.3) builder (>= 2.1.2) erubis (~> 2.7) gssapi (~> 1.2) diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 5d4febec32..48e184dc3c 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -127,7 +127,7 @@ GEM mixlib-log mixlib-cli (1.7.0) mixlib-config (2.2.4) - mixlib-install (2.0.2) + mixlib-install (2.0.3) artifactory mixlib-shellout mixlib-versioning diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 44134bfc9a..53946131cd 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -1,5 +1,5 @@ # DO NOT EDIT. Generated by "rake dependencies". Edit version_policy.rb instead. -override :rubygems, version: "2.6.6" +override :rubygems, version: "2.6.7" override :bundler, version: "1.12.5" override "libffi", version: "3.2.1" override "libiconv", version: "1.14" |