diff options
| author | Tim Smith <tsmith@chef.io> | 2020-09-09 13:46:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-09 13:46:44 -0700 |
| commit | fcb9db7b487589b31b0c946a43c640b8a4653b0e (patch) | |
| tree | a6f977c75836427aaf591cc172e35b7656ab516a | |
| parent | 151cea027699d29d901acd5f6cc16fd8e9c560b4 (diff) | |
| parent | a0197d6dd7fdce17c1005b7395159e1db022d314 (diff) | |
| download | chef-fcb9db7b487589b31b0c946a43c640b8a4653b0e.tar.gz | |
Merge pull request #10406 from chef/bump_license
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | Gemfile.lock | 6 | ||||
| -rw-r--r-- | chef.gemspec | 2 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 230d30d21b..d8159c8471 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,7 +8,7 @@ GIT GIT remote: https://github.com/chef/ohai.git - revision: ea979c15f3293e54bf516b81379e0234e185e9c0 + revision: 483240891921d72f172067d15a50a97d52761c4b branch: master specs: ohai (16.5.0) @@ -43,7 +43,7 @@ PATH ffi-yajl (~> 2.2) highline (>= 1.6.9, < 3) iniparse (~> 1.4) - license-acceptance (~> 1.0, >= 1.0.5) + license-acceptance (>= 1.0.5, < 3) mixlib-archive (>= 0.4, < 2.0) mixlib-authentication (>= 2.1, < 4) mixlib-cli (>= 2.1.1, < 3.0) @@ -80,7 +80,7 @@ PATH highline (>= 1.6.9, < 3) iniparse (~> 1.4) iso8601 (>= 0.12.1, < 0.14) - license-acceptance (~> 1.0, >= 1.0.5) + license-acceptance (>= 1.0.5, < 3) mixlib-archive (>= 0.4, < 2.0) mixlib-authentication (>= 2.1, < 4) mixlib-cli (>= 2.1.1, < 3.0) diff --git a/chef.gemspec b/chef.gemspec index 78b1f0c3c2..77140a6b15 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |s| s.add_dependency "train-core", "~> 3.2", ">= 3.2.28" # 3.2.28 fixes sudo prompts. See https://github.com/chef/chef/pull/9635 s.add_dependency "train-winrm", ">= 0.2.5" - s.add_dependency "license-acceptance", "~> 1.0", ">= 1.0.5" + s.add_dependency "license-acceptance", ">= 1.0.5", "< 3" s.add_dependency "mixlib-cli", ">= 2.1.1", "< 3.0" s.add_dependency "mixlib-log", ">= 2.0.3", "< 4.0" s.add_dependency "mixlib-authentication", ">= 2.1", "< 4" diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 05dc7529cc..4458b409bc 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -32,7 +32,7 @@ GEM artifactory (3.0.15) awesome_print (1.8.0) aws-eventstream (1.1.0) - aws-partitions (1.365.0) + aws-partitions (1.366.0) aws-sdk-core (3.105.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) @@ -176,7 +176,7 @@ GEM ffi (1.13.1-x86-mingw32) ffi-libarchive (1.0.4) ffi (~> 1.0) - ffi-win32-extensions (1.0.3) + ffi-win32-extensions (1.0.4) ffi ffi-yajl (2.3.4) libyajl2 (~> 1.2) @@ -248,7 +248,7 @@ GEM octokit (4.18.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) - ohai (16.4.12) + ohai (16.5.0) chef-config (>= 12.8, < 17) chef-utils (>= 16.0, < 17) ffi (~> 1.9) |