From 90a104f25477fb7b69cccf805b56ca2b81829c26 Mon Sep 17 00:00:00 2001 From: Ryan Hass Date: Fri, 28 Apr 2017 17:32:54 -0700 Subject: Update all the things for Chef 12. Signed-off-by: Ryan Hass --- Gemfile | 2 +- Gemfile.lock | 185 +++++++++++++------------------------------ acceptance/Gemfile | 1 + acceptance/Gemfile.lock | 76 ++++++++++-------- kitchen-tests/Berksfile.lock | 67 ++++++++-------- kitchen-tests/Gemfile | 1 + kitchen-tests/Gemfile.lock | 78 +++++++++--------- omnibus/Gemfile.lock | 10 +-- omnibus_overrides.rb | 2 +- 9 files changed, 184 insertions(+), 238 deletions(-) diff --git a/Gemfile b/Gemfile index b3fa6b01a3..8367134d5b 100644 --- a/Gemfile +++ b/Gemfile @@ -14,7 +14,7 @@ gem "chef", path: "." gem "chef-config", path: File.expand_path("../chef-config", __FILE__) if File.exist?(File.expand_path("../chef-config", __FILE__)) gem "rake" gem "bundler" -gem "cheffish" # required for rspec tests +gem "cheffish", ">= 4.1.1", "< 13" # required for rspec tests group(:omnibus_package) do gem "appbundler" diff --git a/Gemfile.lock b/Gemfile.lock index ef2824f0aa..cc8e7c3c97 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/chef/chef-server - revision: 53b28425d56005a92b0e3bb153f95b505168354a + revision: f61bf120d68d8a432fee536529b036e6d0e0a2c2 specs: oc-chef-pedant (2.2.0) activesupport (>= 4.2.7.1, < 6.0) @@ -16,7 +16,7 @@ GIT GIT remote: https://github.com/chef/chefstyle.git - revision: 7e47afd6141d3c44a11322916e3fc85c89aa9b59 + revision: b2bf89dd11270e169fd2315495c98095d4a19090 branch: master specs: chefstyle (0.5.0) @@ -128,7 +128,7 @@ PATH GEM remote: https://rubygems.org/ specs: - activesupport (5.0.1) + activesupport (5.1.0) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) @@ -136,17 +136,9 @@ GEM addressable (2.4.0) appbundler (0.10.0) mixlib-cli (~> 1.4) - artifactory (2.6.0) + artifactory (2.8.1) ast (2.3.0) - aws-sdk (2.7.7) - aws-sdk-resources (= 2.7.7) - aws-sdk-core (2.7.7) - aws-sigv4 (~> 1.0) - jmespath (~> 1.0) - aws-sdk-resources (2.7.7) - aws-sdk-core (= 2.7.7) - aws-sigv4 (1.0.0) - backports (3.6.8) + backports (3.8.0) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) builder (3.2.3) @@ -154,36 +146,32 @@ GEM chef-api (0.7.0) logify (~> 0.1) mime-types - chef-provisioning (2.1.0) - cheffish (~> 4.0) + chef-provisioning (2.3.2) + cheffish (>= 4.0, < 14.0) inifile (>= 2.0.2) mixlib-install (>= 1.0, < 3.0) net-scp (~> 1.0) net-ssh (>= 2.9, < 5.0) net-ssh-gateway (~> 1.2) + winrm (~> 2.0) + winrm-elevated (~> 1.0) winrm-fs (~> 1.0) chef-sugar (3.4.0) - chef-zero (5.3.0) + chef-zero (5.3.2) ffi-yajl (~> 2.2) hashie (>= 2.0, < 4.0) mixlib-log (~> 1.3) rack (~> 2.0) uuidtools (~> 2.1) - cheffish (4.1.1) + cheffish (5.0.1) chef-zero (~> 5.0) net-ssh - chefspec (5.4.0) - chef (>= 12.0) - fauxhai (~> 3.6) + chefspec (7.0.0) + chef (>= 12.14.89) + fauxhai (>= 4, < 6) rspec (~> 3.0) - codeclimate-test-reporter (0.6.0) - simplecov (>= 0.7.1, < 1.0.0) - codecov (0.1.9) - json - simplecov - url coderay (1.1.1) - concurrent-ruby (1.0.4) + concurrent-ruby (1.0.5) cucumber (2.4.0) builder (>= 2.1.2) cucumber-core (~> 1.5.0) @@ -198,27 +186,26 @@ GEM debug_inspector (0.0.2) diff-lcs (1.3) docile (1.1.5) - domain_name (0.5.20161129) + domain_name (0.5.20170404) unf (>= 0.0.5, < 1.0.0) erubis (2.7.0) ethon (0.10.1) ffi (>= 1.3.0) - excon (0.55.0) - faraday (0.11.0) + faraday (0.12.1) multipart-post (>= 1.2, < 3) faraday-http-cache (2.0.0) faraday (~> 0.8) faraday_middleware (0.11.0.1) faraday (>= 0.7.4, < 1.0) - fauxhai (3.10.0) + fauxhai (4.1.0) net-ssh - ffi (1.9.17) - ffi (1.9.17-x86-mingw32) + ffi (1.9.18) + ffi (1.9.18-x86-mingw32) ffi-win32-extensions (1.0.3) ffi ffi-yajl (2.3.0) libyajl2 (~> 1.2) - foodcritic (8.2.0) + foodcritic (11.0.0) cucumber-core (>= 1.3) erubis nokogiri (>= 1.5, < 2.0) @@ -226,52 +213,34 @@ GEM rufus-lru (~> 1.0) treetop (~> 1.4) yajl-ruby (~> 1.1) - fuubar (2.2.0) - rspec-core (~> 3.0) - ruby-progressbar (~> 1.4) fuzzyurl (0.9.0) - gh (0.15.0) + gh (0.15.1) addressable (~> 2.4.0) backports faraday (~> 0.8) multi_json (~> 1.0) net-http-persistent (~> 2.9) net-http-pipeline - gherkin (4.0.0) - git (1.3.0) + gherkin (4.1.1) gssapi (1.2.0) ffi (>= 1.0.1) gyoku (1.3.1) builder (>= 2.1.2) - halite (1.4.0) + halite (1.6.0) bundler - chef (~> 12.0) - stove (~> 4.0) + chef (>= 12.0, < 14.0) + stove (~> 5.0) thor - hashie (3.5.3) + hashie (3.5.5) highline (1.7.8) http-cookie (1.0.3) domain_name (~> 0.5) httpclient (2.8.3) - i18n (0.8.0) + i18n (0.8.1) inifile (3.0.0) iniparse (1.4.2) ipaddress (0.8.3) - jmespath (1.3.1) - json (2.0.3) - kitchen-docker (2.6.0) - test-kitchen (>= 1.0.0) - kitchen-ec2 (1.3.0) - aws-sdk (~> 2) - excon - multi_json - retryable (~> 2.0) - test-kitchen (~> 1.4, >= 1.4.1) - kitchen-sync (2.1.2) - net-sftp - test-kitchen (>= 1.0.0) - kitchen-vagrant (1.0.1) - test-kitchen (~> 1.4) + json (2.1.0) knife-windows (1.9.0) winrm (~> 2.1) winrm-elevated (~> 1.0) @@ -279,7 +248,7 @@ GEM addressable (~> 2.3) libyajl2 (1.2.0) little-plugger (1.1.4) - logging (2.1.0) + logging (2.2.2) little-plugger (~> 1.1) multi_json (~> 1.10) logify (0.2.0) @@ -316,7 +285,7 @@ GEM net-ssh (>= 2.6.5) net-sftp (2.1.2) net-ssh (>= 2.6.5) - net-ssh (4.0.1) + net-ssh (4.1.0) net-ssh-gateway (1.3.0) net-ssh (>= 2.6.5) net-ssh-multi (1.2.1) @@ -324,12 +293,12 @@ GEM net-ssh-gateway (>= 1.2.0) net-telnet (0.1.1) netrc (0.11.0) - nokogiri (1.7.0.1) + nokogiri (1.7.1) mini_portile2 (~> 2.1.0) - nokogiri (1.7.0.1-x86-mingw32) + nokogiri (1.7.1-x86-mingw32) mini_portile2 (~> 2.1.0) nori (2.6.0) - octokit (4.6.2) + octokit (4.7.0) sawyer (~> 0.8.0, >= 0.5.3) ohai (8.23.0) chef-config (>= 12.5.0.alpha.1, < 13) @@ -345,39 +314,10 @@ GEM wmi-lite (~> 1.0) parser (2.4.0.0) ast (~> 2.2) - plist (3.2.0) + plist (3.3.0) poise (2.7.2) halite (~> 1.0) - poise-boiler (1.13.2) - bundler - chefspec (~> 5.0) - codeclimate-test-reporter (~> 0.4) - codecov (~> 0.0, >= 0.0.2) - foodcritic (>= 7, < 9) - fuubar (~> 2.0) - git (~> 1.2) - halite (~> 1.2) - kitchen-docker (>= 2.6.0.rc.0) - kitchen-ec2 (~> 1.0) - kitchen-sync (~> 2.1) - kitchen-vagrant - mixlib-shellout (>= 1.4, < 3.0) - poise-profiler (~> 1.0) - pry - pry-byebug - rake (>= 10.4, < 12.0) - rspec (~> 3.2) - rspec-its (~> 1.2) - simplecov (~> 0.9) - test-kitchen (~> 1.7, >= 1.7.1) - travis (~> 1.8, >= 1.8.1) - vagrant-wrapper - winrm (>= 1.6, < 3) - winrm-fs (>= 0.4, < 2) - yard (~> 0.8) - yard-classmethods (~> 1.0) - poise-profiler (1.0.1) - halite (~> 1.0) + poise-boiler (0) polyglot (0.3.5) powerpack (0.1.1) proxifier (1.0.3) @@ -398,20 +338,20 @@ GEM json websocket (~> 1.0) rack (2.0.1) - rainbow (2.2.1) - rake (11.3.0) + rainbow (2.2.2) + rake + rake (12.0.0) rb-readline (0.5.4) - rest-client (2.0.0) + rest-client (2.0.2) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rest-client (2.0.0-x86-mingw32) + rest-client (2.0.2-x86-mingw32) ffi (~> 1.9) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - retriable (3.0.0) - retryable (2.0.4) + retriable (3.0.2) rspec (3.5.0) rspec-core (~> 3.5.0) rspec-expectations (~> 3.5.0) @@ -442,10 +382,9 @@ GEM ruby-prof (0.16.2) ruby-progressbar (1.8.1) ruby-shadow (2.5.0) - rubyntlm (0.6.1) + rubyntlm (0.6.2) rubyzip (1.2.1) rufus-lru (1.1.0) - safe_yaml (1.0.4) sawyer (0.8.1) addressable (>= 2.3.5, < 2.6) faraday (~> 0.8, < 1.0) @@ -455,34 +394,26 @@ GEM rspec-its specinfra (~> 2.53) sfl (2.3) - simplecov (0.13.0) + simplecov (0.14.1) docile (~> 1.1.0) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.0) slop (3.6.0) - specinfra (2.66.9) + specinfra (2.67.9) net-scp net-ssh (>= 2.7, < 5.0) net-telnet sfl - stove (4.1.1) + stove (5.1.0) chef-api (~> 0.5) logify (~> 0.2) syslog-logger (1.6.8) systemu (2.6.5) - test-kitchen (1.15.0) - mixlib-install (>= 1.2, < 3.0) - mixlib-shellout (>= 1.2, < 3.0) - net-scp (~> 1.1) - net-ssh (>= 2.9, < 5.0) - net-ssh-gateway (~> 1.2) - safe_yaml (~> 1.0) - thor (~> 0.18) thor (0.19.4) - thread_safe (0.3.5) - tomlrb (1.2.3) - travis (1.8.6) + thread_safe (0.3.6) + tomlrb (1.2.4) + travis (1.8.8) backports faraday (~> 0.9) faraday_middleware (~> 0.9, >= 0.9.1) @@ -495,16 +426,14 @@ GEM polyglot (~> 0.3) typhoeus (0.8.0) ethon (>= 0.8.0) - tzinfo (1.2.2) + tzinfo (1.2.3) thread_safe (~> 0.1) unf (0.1.4) unf_ext - unf_ext (0.0.7.2) - unf_ext (0.0.7.2-x86-mingw32) - unicode-display_width (1.1.3) - url (0.3.2) + unf_ext (0.0.7.4) + unf_ext (0.0.7.4-x86-mingw32) + unicode-display_width (1.2.1) uuidtools (2.1.5) - vagrant-wrapper (2.0.3) websocket (1.2.4) win32-api (1.5.3-universal-mingw32) win32-dir (0.5.1) @@ -526,7 +455,7 @@ GEM ffi-win32-extensions windows-api (0.4.4) win32-api (>= 1.4.5) - winrm (2.1.2) + winrm (2.2.2) builder (>= 2.1.2) erubis (~> 2.7) gssapi (~> 1.2) @@ -545,9 +474,7 @@ GEM winrm (~> 2.0) wmi-lite (1.0.0) yajl-ruby (1.3.0) - yard (0.9.8) - yard-classmethods (1.0.0) - yard + yard (0.9.9) PLATFORMS ruby @@ -561,7 +488,7 @@ DEPENDENCIES chef-config! chef-provisioning chef-sugar - cheffish + cheffish (>= 4.1.1, < 13) chefspec chefstyle! cucumber (>= 2.4.0) diff --git a/acceptance/Gemfile b/acceptance/Gemfile index 41a18c9914..b13ae08e94 100644 --- a/acceptance/Gemfile +++ b/acceptance/Gemfile @@ -10,6 +10,7 @@ gem "kitchen-inspec" gem "test-kitchen" gem "winrm-elevated" gem "berkshelf" +gem "chef-config", ">= 12.5.1.alpha.1", "< 13" # Pin to 1.2.3 because current mixlib-install has a problem where unstable # packages are not always immediately available via the omnitruck API. diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock index 8dfb2ec217..05f91d1b8f 100644 --- a/acceptance/Gemfile.lock +++ b/acceptance/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://github.com/chef/chef-acceptance.git - revision: e92ddae46d2126864698b9c8e4fc4ec2dcc46c55 + revision: 3877c344098021ac66134e8edb5eb805d14d4643 specs: chef-acceptance (0.2.0) mixlib-shellout (~> 2.0) @@ -9,18 +9,18 @@ GIT GEM remote: https://rubygems.org/ specs: - addressable (2.5.0) + addressable (2.5.1) public_suffix (~> 2.0, >= 2.0.2) - artifactory (2.6.0) - aws-sdk (2.7.5) - aws-sdk-resources (= 2.7.5) - aws-sdk-core (2.7.5) + artifactory (2.8.1) + aws-sdk (2.9.14) + aws-sdk-resources (= 2.9.14) + aws-sdk-core (2.9.14) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.7.5) - aws-sdk-core (= 2.7.5) + aws-sdk-resources (2.9.14) + aws-sdk-core (= 2.9.14) aws-sigv4 (1.0.0) - berkshelf (5.6.2) + berkshelf (5.6.4) addressable (~> 2.3, >= 2.3.4) berkshelf-api-client (>= 2.0.2, < 4.0) buff-config (~> 2.0) @@ -40,6 +40,7 @@ GEM faraday (~> 0.9) httpclient (~> 2.7) ridley (>= 4.5, < 6.0) + blankslate (2.1.2.4) buff-config (2.0.0) buff-extensions (~> 2.0) varia_model (~> 0.6) @@ -54,7 +55,7 @@ GEM celluloid-io (0.16.2) celluloid (>= 0.16.0) nio4r (>= 1.1.0) - chef-config (12.18.31) + chef-config (12.19.36) addressable fuzzyurl mixlib-config (~> 2.0) @@ -62,54 +63,56 @@ GEM cleanroom (1.0.0) coderay (1.1.1) diff-lcs (1.3) - docker-api (1.33.2) + docker-api (1.33.4) excon (>= 0.38.0) json erubis (2.7.0) excon (0.55.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) - ffi (1.9.17) + ffi (1.9.18) fuzzyurl (0.9.0) gssapi (1.2.0) ffi (>= 1.0.1) gyoku (1.3.1) builder (>= 2.1.2) - hashie (3.5.1) + hashie (3.5.5) hitimes (1.2.4) httpclient (2.8.3) - inspec (1.14.1) + inspec (1.22.0) + addressable (~> 2.4) faraday (>= 0.9.0) hashie (~> 3.4) json (>= 1.8, < 3.0) method_source (~> 0.8) mixlib-log parallel (~> 1.9) + parslet (~> 1.5) pry (~> 0) rainbow (~> 2) rspec (~> 3) rspec-its (~> 1.2) - rspec_junit_formatter (~> 0.2.3) rubyzip (~> 1.1) - sslshake (~> 1) + sslshake (~> 1.2) thor (~> 0.19) + toml (~> 0.1) train (>= 0.22.0, < 1.0) jmespath (1.3.1) - json (2.0.3) - kitchen-ec2 (1.2.0) + json (2.1.0) + kitchen-ec2 (1.3.2) aws-sdk (~> 2) excon multi_json retryable (~> 2.0) test-kitchen (~> 1.4, >= 1.4.1) - kitchen-inspec (0.17.0) + kitchen-inspec (0.18.0) hashie (~> 3.4) inspec (>= 0.34.0, < 2.0.0) test-kitchen (~> 1.6) - kitchen-vagrant (1.0.0) + kitchen-vagrant (1.1.0) test-kitchen (~> 1.4) little-plugger (1.1.4) - logging (2.1.0) + logging (2.2.2) little-plugger (~> 1.1) multi_json (~> 1.10) method_source (0.8.2) @@ -126,25 +129,28 @@ GEM mixlib-log (1.7.1) mixlib-shellout (2.2.7) mixlib-versioning (1.1.0) - molinillo (0.5.6) + molinillo (0.5.7) multi_json (1.12.1) multipart-post (2.0.0) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (4.0.1) + net-ssh (4.1.0) net-ssh-gateway (1.3.0) net-ssh (>= 2.6.5) nio4r (2.0.0) nori (2.6.0) - octokit (4.6.2) + octokit (4.7.0) sawyer (~> 0.8.0, >= 0.5.3) - parallel (1.10.0) + parallel (1.11.1) + parslet (1.5.0) + blankslate (~> 2.0) pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) public_suffix (2.0.5) - rainbow (2.2.1) + rainbow (2.2.2) + rake rake (12.0.0) retryable (2.0.4) ridley (5.1.0) @@ -181,10 +187,7 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.5.0) rspec-support (3.5.0) - rspec_junit_formatter (0.2.3) - builder (< 4) - rspec-core (>= 2, < 4, != 2.12.0) - rubyntlm (0.6.1) + rubyntlm (0.6.2) rubyzip (1.2.1) safe_yaml (1.0.4) sawyer (0.8.1) @@ -195,19 +198,21 @@ GEM solve (3.1.0) molinillo (>= 0.5) semverse (>= 1.1, < 3.0) - sslshake (1.0.13) - test-kitchen (1.15.0) + sslshake (1.2.0) + test-kitchen (1.16.0) mixlib-install (>= 1.2, < 3.0) mixlib-shellout (>= 1.2, < 3.0) net-scp (~> 1.1) net-ssh (>= 2.9, < 5.0) net-ssh-gateway (~> 1.2) safe_yaml (~> 1.0) - thor (~> 0.18) + thor (~> 0.19, < 0.19.2) thor (0.19.1) timers (4.0.4) hitimes - train (0.22.1) + toml (0.1.2) + parslet (~> 1.5.0) + train (0.23.0) docker-api (~> 1.26) json (>= 1.8, < 3.0) mixlib-shellout (~> 2.0) @@ -220,7 +225,7 @@ GEM hashie (>= 2.0.2, < 4.0.0) windows_chef_zero (2.0.0) test-kitchen (>= 1.2.1) - winrm (2.1.2) + winrm (2.2.2) builder (>= 2.1.2) erubis (~> 2.7) gssapi (~> 1.2) @@ -244,6 +249,7 @@ PLATFORMS DEPENDENCIES berkshelf chef-acceptance! + chef-config (>= 12.5.1.alpha.1, < 13) inspec kitchen-ec2 kitchen-inspec diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock index 6d8f40436a..917cf9c5af 100644 --- a/kitchen-tests/Berksfile.lock +++ b/kitchen-tests/Berksfile.lock @@ -14,7 +14,7 @@ DEPENDENCIES php (~> 1.5.0) resolver git: https://github.com/chef-cookbooks/resolver.git - revision: 8bf9034dabc47d29a07870e4059c32114f2c820a + revision: ba87eab5e806c087fee74f1a316db13525a4d716 GRAPH apt (4.0.2) @@ -52,37 +52,39 @@ GRAPH sudo (>= 0.0.0) ubuntu (>= 0.0.0) users (>= 0.0.0) - build-essential (7.0.3) - compat_resource (>= 12.16.3) + build-essential (8.0.1) mingw (>= 1.1) seven_zip (>= 0.0.0) - chef-client (7.1.0) + chef-client (8.0.1) cron (>= 1.7.0) logrotate (>= 1.9.0) windows (>= 1.42.0) chef-sugar (3.4.0) - chef_hostname (0.4.2) + chef_hostname (0.5.0) + compat_resource (12.19.0) + cron (4.1.1) compat_resource (>= 0.0.0) - compat_resource (12.16.3) - cron (3.0.0) database (6.1.1) postgresql (>= 1.0.0) - firewall (2.5.3) + firewall (2.6.1) chef-sugar (>= 0.0.0) - httpd (0.4.4) - compat_resource (>= 12.14.6) - iis (5.0.5) - windows (>= 1.34.6) - iptables (3.1.0) - compat_resource (>= 12.14.3) + httpd (0.4.5) + compat_resource (>= 12.16.3) + iis (6.3.1) + windows (>= 2.0) + inifile_chef_gem (0.1.0) + build-essential (>= 0.0.0) + iptables (4.2.0) logrotate (2.1.0) compat_resource (>= 0.0.0) - mariadb (1.0.1) + mariadb (1.5.0) apt (>= 0.0.0) + build-essential (>= 0.0.0) + selinux_policy (~> 2.0) yum (>= 0.0.0) yum-epel (>= 0.0.0) - mingw (1.2.5) - compat_resource (>= 12.16.3) + yum-scl (>= 0.0.0) + mingw (2.0.1) seven_zip (>= 0.0.0) multipackage (4.0.0) compat_resource (>= 0.0.0) @@ -93,14 +95,12 @@ GRAPH build-essential (>= 0.0.0) mariadb (>= 0.0.0) mysql (>= 6.0) - nscd (4.1.0) - compat_resource (>= 0.0.0) + nscd (5.0.0) ntp (3.3.1) - ohai (4.2.3) - compat_resource (>= 12.14.7) - openssh (2.1.1) + ohai (5.0.4) + openssh (2.3.1) iptables (>= 1.0) - openssl (6.1.1) + openssl (7.0.1) php (1.5.0) build-essential (>= 0.0.0) iis (>= 0.0.0) @@ -108,27 +108,32 @@ GRAPH windows (>= 0.0.0) xml (>= 0.0.0) yum-epel (>= 0.0.0) - postgresql (6.0.1) + postgresql (6.1.1) build-essential (>= 2.0.0) compat_resource (>= 12.16.3) openssl (>= 4.0) rbac (1.0.3) - resolver (1.3.1) + resolver (2.0.1) selinux (0.9.0) + selinux_policy (2.0.1) + compat_resource (>= 12.16.3) seven_zip (2.0.2) windows (>= 1.2.2) smf (2.2.8) rbac (>= 1.0.1) - sudo (3.3.1) - ubuntu (2.0.0) + sudo (3.4.0) + ubuntu (2.0.1) apt (>= 0.0.0) - users (4.0.3) - windows (2.1.1) + users (5.0.0) + windows (3.0.5) ohai (>= 4.0.0) xml (3.1.1) build-essential (>= 0.0.0) - yum (4.1.0) + yum (5.0.1) yum-epel (2.1.1) compat_resource (>= 12.16.3) - yum-mysql-community (2.0.3) + yum-mysql-community (2.1.0) compat_resource (>= 12.16.3) + yum-scl (0.2.0) + inifile_chef_gem (>= 0.0.0) + yum (>= 0.0.0) diff --git a/kitchen-tests/Gemfile b/kitchen-tests/Gemfile index 707a38a7f6..2e45aed766 100644 --- a/kitchen-tests/Gemfile +++ b/kitchen-tests/Gemfile @@ -10,3 +10,4 @@ gem "kitchen-vagrant" gem "ridley" gem "test-kitchen" gem "vagrant-wrapper" +gem "chef-config", ">= 12.5.1.alpha.1", "< 13" diff --git a/kitchen-tests/Gemfile.lock b/kitchen-tests/Gemfile.lock index b9d14397f1..e569e31dac 100644 --- a/kitchen-tests/Gemfile.lock +++ b/kitchen-tests/Gemfile.lock @@ -1,18 +1,18 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.5.0) + addressable (2.5.1) public_suffix (~> 2.0, >= 2.0.2) - artifactory (2.6.0) - aws-sdk (2.7.5) - aws-sdk-resources (= 2.7.5) - aws-sdk-core (2.7.5) + artifactory (2.8.1) + aws-sdk (2.9.14) + aws-sdk-resources (= 2.9.14) + aws-sdk-core (2.9.14) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.7.5) - aws-sdk-core (= 2.7.5) + aws-sdk-resources (2.9.14) + aws-sdk-core (= 2.9.14) aws-sigv4 (1.0.0) - berkshelf (5.6.2) + berkshelf (5.6.4) addressable (~> 2.3, >= 2.3.4) berkshelf-api-client (>= 2.0.2, < 4.0) buff-config (~> 2.0) @@ -32,6 +32,7 @@ GEM faraday (~> 0.9) httpclient (~> 2.7) ridley (>= 4.5, < 6.0) + blankslate (2.1.2.4) buff-config (2.0.0) buff-extensions (~> 2.0) varia_model (~> 0.6) @@ -46,7 +47,7 @@ GEM celluloid-io (0.16.2) celluloid (>= 0.16.0) nio4r (>= 1.1.0) - chef-config (12.18.31) + chef-config (12.19.36) addressable fuzzyurl mixlib-config (~> 2.0) @@ -54,60 +55,62 @@ GEM cleanroom (1.0.0) coderay (1.1.1) diff-lcs (1.3) - docker-api (1.33.2) + docker-api (1.33.4) excon (>= 0.38.0) json erubis (2.7.0) excon (0.55.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) - ffi (1.9.17) - ffi (1.9.17-x86-mingw32) + ffi (1.9.18) + ffi (1.9.18-x86-mingw32) fuzzyurl (0.9.0) gssapi (1.2.0) ffi (>= 1.0.1) gyoku (1.3.1) builder (>= 2.1.2) - hashie (3.5.1) + hashie (3.5.5) hitimes (1.2.4) hitimes (1.2.4-x86-mingw32) httpclient (2.8.3) - inspec (1.14.1) + inspec (1.22.0) + addressable (~> 2.4) faraday (>= 0.9.0) hashie (~> 3.4) json (>= 1.8, < 3.0) method_source (~> 0.8) mixlib-log parallel (~> 1.9) + parslet (~> 1.5) pry (~> 0) rainbow (~> 2) rspec (~> 3) rspec-its (~> 1.2) - rspec_junit_formatter (~> 0.2.3) rubyzip (~> 1.1) - sslshake (~> 1) + sslshake (~> 1.2) thor (~> 0.19) + toml (~> 0.1) train (>= 0.22.0, < 1.0) jmespath (1.3.1) - json (2.0.3) - kitchen-appbundle-updater (0.1.2) + json (2.1.0) + kitchen-appbundle-updater (0.2.0) kitchen-dokken (1.1.0) docker-api (~> 1.33) test-kitchen (~> 1.13) - kitchen-ec2 (1.2.0) + kitchen-ec2 (1.3.2) aws-sdk (~> 2) excon multi_json retryable (~> 2.0) test-kitchen (~> 1.4, >= 1.4.1) - kitchen-inspec (0.17.0) + kitchen-inspec (0.18.0) hashie (~> 3.4) inspec (>= 0.34.0, < 2.0.0) test-kitchen (~> 1.6) - kitchen-vagrant (1.0.0) + kitchen-vagrant (1.1.0) test-kitchen (~> 1.4) little-plugger (1.1.4) - logging (2.1.0) + logging (2.2.2) little-plugger (~> 1.1) multi_json (~> 1.10) method_source (0.8.2) @@ -128,25 +131,28 @@ GEM win32-process (~> 0.8.2) wmi-lite (~> 1.0) mixlib-versioning (1.1.0) - molinillo (0.5.6) + molinillo (0.5.7) multi_json (1.12.1) multipart-post (2.0.0) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (4.0.1) + net-ssh (4.1.0) net-ssh-gateway (1.3.0) net-ssh (>= 2.6.5) nio4r (2.0.0) nori (2.6.0) - octokit (4.6.2) + octokit (4.7.0) sawyer (~> 0.8.0, >= 0.5.3) - parallel (1.10.0) + parallel (1.11.1) + parslet (1.5.0) + blankslate (~> 2.0) pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) public_suffix (2.0.5) - rainbow (2.2.1) + rainbow (2.2.2) + rake rake (12.0.0) retryable (2.0.4) ridley (5.1.0) @@ -183,10 +189,7 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.5.0) rspec-support (3.5.0) - rspec_junit_formatter (0.2.3) - builder (< 4) - rspec-core (>= 2, < 4, != 2.12.0) - rubyntlm (0.6.1) + rubyntlm (0.6.2) rubyzip (1.2.1) safe_yaml (1.0.4) sawyer (0.8.1) @@ -197,19 +200,21 @@ GEM solve (3.1.0) molinillo (>= 0.5) semverse (>= 1.1, < 3.0) - sslshake (1.0.13) - test-kitchen (1.15.0) + sslshake (1.2.0) + test-kitchen (1.16.0) mixlib-install (>= 1.2, < 3.0) mixlib-shellout (>= 1.2, < 3.0) net-scp (~> 1.1) net-ssh (>= 2.9, < 5.0) net-ssh-gateway (~> 1.2) safe_yaml (~> 1.0) - thor (~> 0.18) + thor (~> 0.19, < 0.19.2) thor (0.19.1) timers (4.0.4) hitimes - train (0.22.1) + toml (0.1.2) + parslet (~> 1.5.0) + train (0.23.0) docker-api (~> 1.26) json (>= 1.8, < 3.0) mixlib-shellout (~> 2.0) @@ -223,7 +228,7 @@ GEM hashie (>= 2.0.2, < 4.0.0) win32-process (0.8.3) ffi (>= 1.0.0) - winrm (2.1.2) + winrm (2.2.2) builder (>= 2.1.2) erubis (~> 2.7) gssapi (~> 1.2) @@ -245,6 +250,7 @@ PLATFORMS DEPENDENCIES berkshelf + chef-config (>= 12.5.1.alpha.1, < 13) kitchen-appbundle-updater kitchen-dokken (< 2.0) kitchen-ec2 diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index fa4e60ce92..50ce6ccfb1 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -38,13 +38,13 @@ GEM public_suffix (~> 2.0, >= 2.0.2) artifactory (2.8.1) awesome_print (1.7.0) - aws-sdk (2.9.13) - aws-sdk-resources (= 2.9.13) - aws-sdk-core (2.9.13) + aws-sdk (2.9.14) + aws-sdk-resources (= 2.9.14) + aws-sdk-core (2.9.14) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.9.13) - aws-sdk-core (= 2.9.13) + aws-sdk-resources (2.9.14) + aws-sdk-core (= 2.9.14) aws-sigv4 (1.0.0) berkshelf (4.3.5) addressable (~> 2.3, >= 2.3.4) diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 69a5a7af05..7e4e917e34 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.10" +override :rubygems, version: "2.6.11" override :bundler, version: "1.12.5" override "libffi", version: "3.2.1" override "libiconv", version: "1.14" -- cgit v1.2.1