diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2018-03-01 14:59:42 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-01 14:59:42 -0800 |
| commit | 8c1c190550be4df58377ed051d2442c789693616 (patch) | |
| tree | c1c90ad97052b7150d70e007241c24320ec3c22c | |
| parent | 349786463576380e12bd58478449f1d977a53e00 (diff) | |
| parent | 87077d85dd62b309ec1b03d03a98fa98f61ef3f8 (diff) | |
| download | chef-8c1c190550be4df58377ed051d2442c789693616.tar.gz | |
Merge pull request #6930 from chef/lcg/bump-appbundler
use appbundler 0.11.1 for omnibus builds
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 5 | ||||
| -rw-r--r-- | omnibus_overrides.rb | 1 |
3 files changed, 4 insertions, 4 deletions
@@ -14,7 +14,7 @@ gem "chef-config", path: File.expand_path("../chef-config", __FILE__) if File.ex gem "cheffish", "~> 13" # required for rspec tests group(:omnibus_package) do - gem "appbundler", "= 0.10.0" + gem "appbundler" gem "rb-readline" gem "inspec", "~> 1" gem "chef-vault" diff --git a/Gemfile.lock b/Gemfile.lock index 1ef304becc..5bf8989edd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -113,8 +113,9 @@ GEM remote: https://rubygems.org/ specs: addressable (2.4.0) - appbundler (0.10.0) + appbundler (0.11.1) mixlib-cli (~> 1.4) + mixlib-shellout (~> 2.0) ast (2.4.0) backports (3.11.1) binding_of_caller (0.8.0) @@ -388,7 +389,7 @@ PLATFORMS x86-mingw32 DEPENDENCIES - appbundler (= 0.10.0) + appbundler bundler-audit chef! chef-config! diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 20fd2a2c2c..51c5df4a01 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -3,7 +3,6 @@ # try to keep it machine-parsable. override :rubygems, version: "2.7.6" override :bundler, version: "1.16.1" -override "appbundler", version: "v0.10.0" override "nokogiri", version: "1.8.1" override "libffi", version: "3.2.1" override "libiconv", version: "1.15" |