diff options
| author | John Keiser <john@johnkeiser.com> | 2016-09-12 12:24:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-12 12:24:44 -0700 |
| commit | f0562c93c61306b1c417ebdad976b6748b95e811 (patch) | |
| tree | 58e7909af11e14c1c995d6e080fc72a5a9908bd0 | |
| parent | 1e8796cda6c1602df2d7d2107df32a650b678d75 (diff) | |
| parent | a48c31c57eee5334392840615720623011777851 (diff) | |
| download | chef-f0562c93c61306b1c417ebdad976b6748b95e811.tar.gz | |
Merge pull request #5308 from chef/jk/update
Update all dependencies again
| -rw-r--r-- | Gemfile.lock | 6 | ||||
| -rw-r--r-- | acceptance/Gemfile.lock | 2 | ||||
| -rw-r--r-- | kitchen-tests/Berksfile.lock | 6 | ||||
| -rw-r--r-- | kitchen-tests/Gemfile.lock | 6 | ||||
| -rw-r--r-- | version_policy.rb | 3 |
5 files changed, 12 insertions, 11 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 29533f9a2f..8ad0467efe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -24,9 +24,9 @@ GIT GIT remote: https://github.com/poise/poise-boiler - revision: 9b8d1393b0dc06af625e3dcc4c0e0a53b2975657 + revision: b2faa2bcfd128d5fcd781c2b727d05f6b818d74b specs: - poise-boiler (1.11.1.pre) + poise-boiler (1.12.1.pre) bundler chefspec (~> 5.0) codeclimate-test-reporter (~> 0.4) @@ -291,7 +291,7 @@ GEM highline (1.7.8) http-cookie (1.0.2) domain_name (~> 0.5) - httpclient (2.8.2.3) + httpclient (2.8.2.4) i18n (0.7.0) inifile (3.0.0) iniparse (1.4.2) diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock index 95d797c5f7..e8951abbf0 100644 --- a/acceptance/Gemfile.lock +++ b/acceptance/Gemfile.lock @@ -76,7 +76,7 @@ GEM hashie (3.4.4) hitimes (1.2.4) httpclient (2.7.2) - inspec (0.33.2) + inspec (0.34.0) hashie (~> 3.4) json (>= 1.8, < 3.0) method_source (~> 0.8) diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock index 2eddaa27b5..16d32a31d9 100644 --- a/kitchen-tests/Berksfile.lock +++ b/kitchen-tests/Berksfile.lock @@ -40,7 +40,7 @@ GRAPH chef-sugar (3.4.0) chef_hostname (0.4.1) compat_resource (>= 0.0.0) - compat_resource (12.14.1) + compat_resource (12.14.2) cron (1.7.6) database (2.3.1) aws (>= 0.0.0) @@ -88,7 +88,7 @@ GRAPH selinux (0.9.0) seven_zip (2.0.2) windows (>= 1.2.2) - sudo (2.11.0) + sudo (3.0.0) ubuntu (2.0.0) apt (>= 0.0.0) users (3.0.0) @@ -102,7 +102,7 @@ GRAPH xml (3.0.0) build-essential (>= 0.0.0) yum (4.0.0) - yum-epel (1.0.0) + yum-epel (1.0.1) yum (>= 3.6) yum-mysql-community (1.0.0) yum (>= 3.2) diff --git a/kitchen-tests/Gemfile.lock b/kitchen-tests/Gemfile.lock index 7c7368bdf6..36571ec015 100644 --- a/kitchen-tests/Gemfile.lock +++ b/kitchen-tests/Gemfile.lock @@ -67,8 +67,8 @@ GEM hashie (3.4.4) hitimes (1.2.4) hitimes (1.2.4-x86-mingw32) - httpclient (2.8.2.3) - inspec (0.33.2) + httpclient (2.8.2.4) + inspec (0.34.0) hashie (~> 3.4) json (>= 1.8, < 3.0) method_source (~> 0.8) @@ -85,7 +85,7 @@ GEM jmespath (1.3.1) json (2.0.2) kitchen-appbundle-updater (0.1.2) - kitchen-dokken (0.0.32) + kitchen-dokken (1.0.0) docker-api (~> 1.29) test-kitchen (~> 1.5) kitchen-ec2 (1.1.0) diff --git a/version_policy.rb b/version_policy.rb index 0a4475286d..bfe08e91e4 100644 --- a/version_policy.rb +++ b/version_policy.rb @@ -20,6 +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 "libffi" => "3.2.1", "libiconv" => "1.14", "liblzma" => "5.2.2", @@ -56,7 +57,7 @@ OMNIBUS_OVERRIDES = { # OMNIBUS_RUBYGEMS_AT_LATEST_VERSION = { rubygems: "rubygems-update", - bundler: "bundler", + # bundler: "bundler", # until we get working with 1.13.0 } # |