diff options
| author | Tim Smith <tsmith@chef.io> | 2021-03-25 09:59:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-25 09:59:18 -0700 |
| commit | cb72078df793a4d62383f64faf3c49a68985427e (patch) | |
| tree | c472bd4868332f9110cb6fa190db65a87c27f7f4 | |
| parent | 413867a31ce7c0fce66dadc85f9c2a0ae48a313a (diff) | |
| parent | c6e650b316aaedea82bced7cc980138e14cdc8f6 (diff) | |
| download | chef-cb72078df793a4d62383f64faf3c49a68985427e.tar.gz | |
Merge pull request #11244 from chef/15_gem_bumps
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | Gemfile | 5 | ||||
| -rw-r--r-- | Gemfile.lock | 8 | ||||
| -rw-r--r-- | chef.gemspec | 2 |
3 files changed, 7 insertions, 8 deletions
@@ -30,8 +30,6 @@ group(:omnibus_package) do gem "inspec-core", "~> 4.18" gem "inspec-core-bin", "~> 4.24" # need to provide the binaries for inspec gem "chef-vault" - gem "ed25519" # ed25519 ssh key support done here as it's a native gem we can't put in train - gem "bcrypt_pbkdf", ">= 1.1.0.rc1" # ed25519 ssh key support done here as it's a native gem we can't put in train end group(:omnibus_package, :pry) do @@ -84,6 +82,9 @@ eval_gemfile("./Gemfile.local") if File.exist?("./Gemfile.local") # For FFI to call into PowerShell we need the binaries and assemblies located # in the Ruby bindir. # The Powershell DLL source lives here: https://github.com/chef/chef-powershell-shim +# Every merge into that repo triggers a Habitat build and promotion. Running +# the rake :update_chef_exec_dll task in this (chef/chef) repo will pull down +# the built packages and copy the binaries to distro/ruby_bin_folder. # # We copy (and overwrite) these files every time "bundle <exec|install>" is # executed, just in case they have changed. diff --git a/Gemfile.lock b/Gemfile.lock index f5a1e255ea..1cb492d7fa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -32,7 +32,7 @@ PATH ffi (~> 1.9, >= 1.9.25) ffi-libarchive (~> 1.0, >= 1.0.3) ffi-yajl (~> 2.2) - highline (>= 1.6.9, < 2) + highline (>= 1.6.9, < 3) iniparse (~> 1.4) license-acceptance (>= 1.0.5, < 3) mixlib-archive (>= 0.4, < 2.0) @@ -64,7 +64,7 @@ PATH ffi (~> 1.9, >= 1.9.25) ffi-libarchive (~> 1.0, >= 1.0.3) ffi-yajl (~> 2.2) - highline (>= 1.6.9, < 2) + highline (>= 1.6.9, < 3) iniparse (~> 1.4) iso8601 (>= 0.12.1, < 0.14) license-acceptance (>= 1.0.5, < 3) @@ -183,7 +183,7 @@ GEM builder (>= 2.1.2) hashdiff (1.0.1) hashie (3.6.0) - highline (1.7.10) + highline (2.0.3) httpclient (2.8.3) iniparse (1.5.0) inspec-core (4.28.0) @@ -419,7 +419,6 @@ PLATFORMS DEPENDENCIES appbundler - bcrypt_pbkdf (>= 1.1.0.rc1) chef! chef-bin! chef-config! @@ -428,7 +427,6 @@ DEPENDENCIES chef-vault cheffish (~> 14) chefstyle (= 1.2.1) - ed25519 fauxhai-ng inspec-core (~> 4.18) inspec-core-bin (~> 4.24) diff --git a/chef.gemspec b/chef.gemspec index 297067818a..6734ad8eee 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -44,7 +44,7 @@ Gem::Specification.new do |s| s.add_dependency "net-sftp", ">= 2.1.2", "< 4.0" s.add_dependency "ed25519", "~> 1.2" # ed25519 ssh key support s.add_dependency "bcrypt_pbkdf", "~> 1.0" # ed25519 ssh key support - s.add_dependency "highline", ">= 1.6.9", "< 2" + s.add_dependency "highline", ">= 1.6.9", "< 3" s.add_dependency "tty-screen", "~> 0.6" # knife list s.add_dependency "erubis", "~> 2.7" s.add_dependency "diff-lcs", ">= 1.2.4", "< 1.4.0" # 1.4 breaks output |