From c54e40fbb0c26ef739acbca2c9a05be6f4702b4b Mon Sep 17 00:00:00 2001 From: "Christopher A. Snapp" Date: Thu, 17 Oct 2019 10:00:19 -0600 Subject: [PATCH] Update pinned version of chef-infra to 15.4.45 Signed-off-by: Christopher A. Snapp --- oc-chef-pedant/Gemfile.lock | 24 ++++++++--------- omnibus_overrides.rb | 2 +- src/chef-server-ctl/Gemfile.lock | 30 ++++++++++----------- src/chef-server-ctl/chef-server-ctl.gemspec | 2 +- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/oc-chef-pedant/Gemfile.lock b/oc-chef-pedant/Gemfile.lock index f0df3d9a91..70e0bfeef3 100644 --- a/oc-chef-pedant/Gemfile.lock +++ b/oc-chef-pedant/Gemfile.lock @@ -29,11 +29,11 @@ GEM debug_inspector (>= 0.0.1) builder (3.2.3) byebug (11.0.1) - chef (15.3.14) + chef (15.4.45) addressable bcrypt_pbkdf (~> 1.0) bundler (>= 1.10) - chef-config (= 15.3.14) + chef-config (= 15.4.45) chef-zero (>= 14.0.11) diff-lcs (~> 1.2, >= 1.2.4) ed25519 (~> 1.2) @@ -56,17 +56,17 @@ GEM plist (~> 3.2) proxifier (~> 1.0) syslog-logger (~> 1.6) - train-core (~> 3.0) - train-winrm + train-core (~> 3.1) + train-winrm (>= 0.2.5) tty-screen (~> 0.6) uuidtools (~> 2.1.5) - chef-config (15.3.14) + chef-config (15.4.45) addressable fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) tomlrb (~> 1.2) - chef-zero (14.0.12) + chef-zero (14.0.13) ffi-yajl (~> 2.2) hashie (>= 2.0, < 4.0) mixlib-log (>= 2.0, < 4.0) @@ -125,7 +125,7 @@ GEM tomlrb mixlib-log (3.0.1) mixlib-shellout (3.0.7) - multi_json (1.13.1) + multi_json (1.14.1) necromancer (0.5.0) net-http-spy (0.2.1) net-scp (2.0.0) @@ -192,7 +192,7 @@ GEM rspec_junit_formatter (0.4.1) rspec-core (>= 2, < 4, != 2.12.0) rubyntlm (0.6.2) - rubyzip (1.2.4) + rubyzip (1.3.0) strings (0.1.6) strings-ansi (~> 0.1) unicode-display_width (~> 1.5) @@ -202,15 +202,15 @@ GEM systemu (2.6.5) thread_safe (0.3.6) tomlrb (1.2.8) - train-core (3.0.3) + train-core (3.1.4) json (>= 1.8, < 3.0) mixlib-shellout (>= 2.0, < 4.0) net-scp (>= 1.2, < 3.0) net-ssh (>= 2.9, < 6.0) - train-winrm (0.2.4) + train-winrm (0.2.5) winrm (~> 2.0) winrm-fs (~> 1.0) - tty-box (0.4.1) + tty-box (0.5.0) pastel (~> 0.7.2) strings (~> 0.1.6) tty-cursor (~> 0.7) @@ -247,7 +247,7 @@ GEM logging (>= 1.6.1, < 3.0) rubyzip (~> 1.1) winrm (~> 2.0) - wisper (2.0.0) + wisper (2.0.1) wmi-lite (1.0.2) PLATFORMS diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 3657c0a4c5..b4ed67061a 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -7,7 +7,7 @@ override :rubygems, version: "3.0.3" override :bundler, version: "1.17.2" # pin to avoid double bundle error override :'omnibus-ctl', version: "master" -override :chef, version: "v15.4.20" +override :chef, version: "v15.4.45" override :ohai, version: "v15.3.1" override :ruby, version: "2.6.3" diff --git a/src/chef-server-ctl/Gemfile.lock b/src/chef-server-ctl/Gemfile.lock index 047ada2b25..36b7f32713 100644 --- a/src/chef-server-ctl/Gemfile.lock +++ b/src/chef-server-ctl/Gemfile.lock @@ -17,7 +17,7 @@ PATH specs: chef-server-ctl (1.0.0) appbundler - chef (~> 15.3.14) + chef (~> 15.4.45) chef_backup ffi-yajl (>= 1.2.0) highline (~> 1.6, >= 1.6.9) @@ -46,11 +46,11 @@ GEM bcrypt (3.1.13) bcrypt_pbkdf (1.0.1) builder (3.2.3) - chef (15.3.14) + chef (15.4.45) addressable bcrypt_pbkdf (~> 1.0) bundler (>= 1.10) - chef-config (= 15.3.14) + chef-config (= 15.4.45) chef-zero (>= 14.0.11) diff-lcs (~> 1.2, >= 1.2.4) ed25519 (~> 1.2) @@ -73,17 +73,17 @@ GEM plist (~> 3.2) proxifier (~> 1.0) syslog-logger (~> 1.6) - train-core (~> 3.0) - train-winrm + train-core (~> 3.1) + train-winrm (>= 0.2.5) tty-screen (~> 0.6) uuidtools (~> 2.1.5) - chef-config (15.3.14) + chef-config (15.4.45) addressable fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) tomlrb (~> 1.2) - chef-zero (14.0.12) + chef-zero (14.0.13) ffi-yajl (~> 2.2) hashie (>= 2.0, < 4.0) mixlib-log (>= 2.0, < 4.0) @@ -135,7 +135,7 @@ GEM method_source (0.9.2) mime-types (3.3) mime-types-data (~> 3.2015) - mime-types-data (3.2019.0904) + mime-types-data (3.2019.1009) mixlib-archive (1.0.1) mixlib-log mixlib-authentication (2.1.1) @@ -144,7 +144,7 @@ GEM tomlrb mixlib-log (3.0.1) mixlib-shellout (3.0.7) - multi_json (1.13.1) + multi_json (1.14.1) necromancer (0.5.0) net-scp (2.0.0) net-ssh (>= 2.6.5, < 6.0.0) @@ -217,8 +217,8 @@ GEM unicode-display_width (>= 1.4.0, < 1.7) ruby-progressbar (1.10.1) rubyntlm (0.6.2) - rubyzip (1.2.4) - sequel (5.24.0) + rubyzip (1.3.0) + sequel (5.25.0) strings (0.1.6) strings-ansi (~> 0.1) unicode-display_width (~> 1.5) @@ -229,15 +229,15 @@ GEM toml (0.2.0) parslet (~> 1.8.0) tomlrb (1.2.8) - train-core (3.0.3) + train-core (3.1.4) json (>= 1.8, < 3.0) mixlib-shellout (>= 2.0, < 4.0) net-scp (>= 1.2, < 3.0) net-ssh (>= 2.9, < 6.0) - train-winrm (0.2.4) + train-winrm (0.2.5) winrm (~> 2.0) winrm-fs (~> 1.0) - tty-box (0.4.1) + tty-box (0.5.0) pastel (~> 0.7.2) strings (~> 0.1.6) tty-cursor (~> 0.7) @@ -272,7 +272,7 @@ GEM logging (>= 1.6.1, < 3.0) rubyzip (~> 1.1) winrm (~> 2.0) - wisper (2.0.0) + wisper (2.0.1) wmi-lite (1.0.2) PLATFORMS diff --git a/src/chef-server-ctl/chef-server-ctl.gemspec b/src/chef-server-ctl/chef-server-ctl.gemspec index 4ef8a2c9a9..bdc0b6860d 100644 --- a/src/chef-server-ctl/chef-server-ctl.gemspec +++ b/src/chef-server-ctl/chef-server-ctl.gemspec @@ -47,7 +47,7 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency "omnibus-ctl" # Gemfile has us getting latest from git spec.add_runtime_dependency "license-acceptance" - spec.add_runtime_dependency "chef", "~> 15.3.14" + spec.add_runtime_dependency "chef", "~> 15.4.45" spec.add_runtime_dependency "appbundler"