diff options
-rw-r--r-- | Gemfile.lock | 32 | ||||
-rw-r--r-- | acceptance/Gemfile.lock | 20 | ||||
-rw-r--r-- | kitchen-tests/Gemfile.lock | 22 | ||||
-rw-r--r-- | omnibus/Gemfile.lock | 18 | ||||
-rw-r--r-- | omnibus_overrides.rb | 2 | ||||
-rw-r--r-- | version_policy.rb | 2 |
6 files changed, 48 insertions, 48 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 55c03a0cfe..f437e4c3e9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/chef/chef-server - revision: e5b2c917b7d06d4e09e27bdb09e4e1ad7648e437 + revision: 35fecbfa957b7d67eea5c1225377ba7ee85d54c9 specs: oc-chef-pedant (2.2.0) activesupport (>= 4.2.7.1, < 6.0) @@ -16,11 +16,11 @@ GIT GIT remote: https://github.com/chef/chefstyle.git - revision: ba0cfca677c8dc66de471cbd3da37d000a93dce0 + revision: 7e47afd6141d3c44a11322916e3fc85c89aa9b59 branch: master specs: - chefstyle (0.4.0) - rubocop (= 0.45.0) + chefstyle (0.5.0) + rubocop (= 0.47.1) GIT remote: https://github.com/rubysec/bundler-audit.git @@ -139,13 +139,13 @@ GEM mixlib-cli (~> 1.4) artifactory (2.6.0) ast (2.3.0) - aws-sdk (2.7.3) - aws-sdk-resources (= 2.7.3) - aws-sdk-core (2.7.3) + aws-sdk (2.7.5) + aws-sdk-resources (= 2.7.5) + aws-sdk-core (2.7.5) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.7.3) - aws-sdk-core (= 2.7.3) + aws-sdk-resources (2.7.5) + aws-sdk-core (= 2.7.5) aws-sigv4 (1.0.0) backports (3.6.8) binding_of_caller (0.7.2) @@ -170,7 +170,7 @@ GEM mixlib-log (~> 1.3) rack (~> 2.0) uuidtools (~> 2.1) - cheffish (4.1.0) + cheffish (4.1.1) chef-zero (~> 5.0) net-ssh chefspec (5.3.0) @@ -204,7 +204,7 @@ GEM erubis (2.7.0) ethon (0.10.1) ffi (>= 1.3.0) - excon (0.54.0) + excon (0.55.0) faraday (0.11.0) multipart-post (>= 1.2, < 3) faraday-http-cache (2.0.0) @@ -344,7 +344,7 @@ GEM plist (~> 3.1) systemu (~> 2.6.4) wmi-lite (~> 1.0) - parser (2.3.3.1) + parser (2.4.0.0) ast (~> 2.2) plist (3.2.0) poise (2.7.2) @@ -434,8 +434,8 @@ GEM rspec_junit_formatter (0.2.3) builder (< 4) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (0.45.0) - parser (>= 2.3.1.1, < 3.0) + rubocop (0.47.1) + parser (>= 2.3.3.1, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.7) @@ -444,7 +444,7 @@ GEM ruby-progressbar (1.8.1) ruby-shadow (2.5.0) rubyntlm (0.6.1) - rubyzip (1.2.0) + rubyzip (1.2.1) rufus-lru (1.1.0) safe_yaml (1.0.4) sawyer (0.8.1) @@ -462,7 +462,7 @@ GEM simplecov-html (~> 0.10.0) simplecov-html (0.10.0) slop (3.6.0) - specinfra (2.66.8) + specinfra (2.66.9) net-scp net-ssh (>= 2.7, < 5.0) net-telnet diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock index e33389f135..9ec035fdda 100644 --- a/acceptance/Gemfile.lock +++ b/acceptance/Gemfile.lock @@ -12,13 +12,13 @@ GEM addressable (2.5.0) public_suffix (~> 2.0, >= 2.0.2) artifactory (2.6.0) - aws-sdk (2.7.3) - aws-sdk-resources (= 2.7.3) - aws-sdk-core (2.7.3) + aws-sdk (2.7.5) + aws-sdk-resources (= 2.7.5) + aws-sdk-core (2.7.5) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.7.3) - aws-sdk-core (= 2.7.3) + aws-sdk-resources (2.7.5) + aws-sdk-core (= 2.7.5) aws-sigv4 (1.0.0) berkshelf (4.3.5) addressable (~> 2.3, >= 2.3.4) @@ -68,7 +68,7 @@ GEM excon (>= 0.38.0) json erubis (2.7.0) - excon (0.54.0) + excon (0.55.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) ffi (1.9.17) @@ -80,7 +80,7 @@ GEM hashie (3.5.1) hitimes (1.2.4) httpclient (2.7.2) - inspec (1.12.0) + inspec (1.14.0) faraday (>= 0.9.0) hashie (~> 3.4) json (>= 1.8, < 3.0) @@ -115,7 +115,7 @@ GEM little-plugger (~> 1.1) multi_json (~> 1.10) method_source (0.8.2) - minitar (0.5.4) + minitar (0.6.1) mixlib-archive (0.4.1) mixlib-log mixlib-authentication (1.4.1) @@ -186,7 +186,7 @@ GEM builder (< 4) rspec-core (>= 2, < 4, != 2.12.0) rubyntlm (0.6.1) - rubyzip (1.2.0) + rubyzip (1.2.1) safe_yaml (1.0.4) sawyer (0.8.1) addressable (>= 2.3.5, < 2.6) @@ -256,4 +256,4 @@ DEPENDENCIES winrm-elevated BUNDLED WITH - 1.12.5 + 1.13.7 diff --git a/kitchen-tests/Gemfile.lock b/kitchen-tests/Gemfile.lock index 2274469443..ad9d1c7112 100644 --- a/kitchen-tests/Gemfile.lock +++ b/kitchen-tests/Gemfile.lock @@ -4,13 +4,13 @@ GEM addressable (2.5.0) public_suffix (~> 2.0, >= 2.0.2) artifactory (2.6.0) - aws-sdk (2.7.3) - aws-sdk-resources (= 2.7.3) - aws-sdk-core (2.7.3) + aws-sdk (2.7.5) + aws-sdk-resources (= 2.7.5) + aws-sdk-core (2.7.5) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.7.3) - aws-sdk-core (= 2.7.3) + aws-sdk-resources (2.7.5) + aws-sdk-core (= 2.7.5) aws-sigv4 (1.0.0) berkshelf (5.6.2) addressable (~> 2.3, >= 2.3.4) @@ -58,7 +58,7 @@ GEM excon (>= 0.38.0) json erubis (2.7.0) - excon (0.54.0) + excon (0.55.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) ffi (1.9.17) @@ -72,7 +72,7 @@ GEM hitimes (1.2.4) hitimes (1.2.4-x86-mingw32) httpclient (2.8.3) - inspec (1.12.0) + inspec (1.14.0) faraday (>= 0.9.0) hashie (~> 3.4) json (>= 1.8, < 3.0) @@ -111,7 +111,7 @@ GEM little-plugger (~> 1.1) multi_json (~> 1.10) method_source (0.8.2) - minitar (0.5.4) + minitar (0.6.1) mixlib-archive (0.4.1) mixlib-log mixlib-authentication (1.4.1) @@ -128,7 +128,7 @@ GEM win32-process (~> 0.8.2) wmi-lite (~> 1.0) mixlib-versioning (1.1.0) - molinillo (0.5.5) + molinillo (0.5.6) multi_json (1.12.1) multipart-post (2.0.0) net-scp (1.2.1) @@ -186,7 +186,7 @@ GEM builder (< 4) rspec-core (>= 2, < 4, != 2.12.0) rubyntlm (0.6.1) - rubyzip (1.2.0) + rubyzip (1.2.1) safe_yaml (1.0.4) sawyer (0.8.1) addressable (>= 2.3.5, < 2.6) @@ -255,4 +255,4 @@ DEPENDENCIES vagrant-wrapper BUNDLED WITH - 1.12.5 + 1.13.7 diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index d52a70b5de..8e6a4a3449 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://github.com/chef/license_scout.git - revision: ae7f2412751dcb411d2bb60abe2086d8ae7ae86f + revision: f90293a9753652fb64994a14de4108e503c06632 specs: license_scout (0.1.2) ffi-yajl (~> 2.2) @@ -39,13 +39,13 @@ GEM public_suffix (~> 2.0, >= 2.0.2) artifactory (2.6.0) awesome_print (1.7.0) - aws-sdk (2.7.3) - aws-sdk-resources (= 2.7.3) - aws-sdk-core (2.7.3) + aws-sdk (2.7.5) + aws-sdk-resources (= 2.7.5) + aws-sdk-core (2.7.5) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.7.3) - aws-sdk-core (= 2.7.3) + aws-sdk-resources (2.7.5) + aws-sdk-core (= 2.7.5) aws-sigv4 (1.0.0) berkshelf (4.3.5) addressable (~> 2.3, >= 2.3.4) @@ -123,7 +123,7 @@ GEM little-plugger (~> 1.1) multi_json (~> 1.10) method_source (0.8.2) - minitar (0.5.4) + minitar (0.6.1) mixlib-archive (0.4.1) mixlib-log mixlib-authentication (1.4.1) @@ -205,7 +205,7 @@ GEM varia_model (~> 0.4.0) ruby-progressbar (1.8.1) rubyntlm (0.6.1) - rubyzip (1.2.0) + rubyzip (1.2.1) safe_yaml (1.0.4) sawyer (0.8.1) addressable (>= 2.3.5, < 2.6) @@ -267,4 +267,4 @@ DEPENDENCIES winrm-fs (~> 1.0) BUNDLED WITH - 1.12.5 + 1.13.7 diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 69af8dbd44..75ccfe5385 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.10" -override :bundler, version: "1.12.5" +override :bundler, version: "1.13.7" override :rainbow, version: "2.1.0" override "libffi", version: "3.2.1" override "libiconv", version: "1.14" diff --git a/version_policy.rb b/version_policy.rb index a16e7ad500..1716c2fcd5 100644 --- a/version_policy.rb +++ b/version_policy.rb @@ -20,7 +20,7 @@ OMNIBUS_OVERRIDES = { # Lower level library pins ## according to comment in omnibus-sw, latest versions don't work on solaris # https://github.com/chef/omnibus-software/blob/aefb7e79d29ca746c3f843673ef5e317fa3cba54/config/software/libtool.rb#L23 - :bundler => "1.12.5", # until we figure out how to work with 1.13.0 + :bundler => "1.13.7", # until we figure out how to work with 1.13.0 :rainbow => "2.1.0", # Currently pinned until rubygems is updated "libffi" => "3.2.1", "libiconv" => "1.14", |