summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2018-03-01 14:27:30 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2018-03-01 14:27:30 -0800
commit87077d85dd62b309ec1b03d03a98fa98f61ef3f8 (patch)
treec1c90ad97052b7150d70e007241c24320ec3c22c
parent349786463576380e12bd58478449f1d977a53e00 (diff)
downloadchef-87077d85dd62b309ec1b03d03a98fa98f61ef3f8.tar.gz
use appbundler 0.11.1 for omnibus builds
already working for kitchen-appbundle-updater in travis Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock5
-rw-r--r--omnibus_overrides.rb1
3 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index d79b0fb7a7..81109eb6f5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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"