summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keiser <john@johnkeiser.com>2016-04-01 08:58:24 -0700
committerJohn Keiser <john@johnkeiser.com>2016-04-01 08:58:24 -0700
commit71b11cbdbed9d6de961f4930fe62ec257996c6ea (patch)
tree8fab564f7d0704c97374d78704ead2734eebd2d1
parentd5e969e37c1f03a8357eee9f9c76ec5229161333 (diff)
downloadchef-71b11cbdbed9d6de961f4930fe62ec257996c6ea.tar.gz
Don't bring in json_pure (jmespath 1.2 brings it in) because it breaks us.jk/no-json-pure
-rw-r--r--omnibus/Gemfile4
1 files changed, 4 insertions, 0 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index 07d1e0c9f3..432145114c 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -3,6 +3,10 @@ source "https://rubygems.org"
gem "omnibus", git: "https://github.com/chef/omnibus.git"
gem "omnibus-software", git: "https://github.com/chef/omnibus-software.git"
+# omnibus pulls in aws-sdk which pulls in aws-sdk-core which pulls in jmespath which pulls in json_pure
+# json_pure breaks us. jmespath added it in 1.2.2. Pin to 1.1.
+gem 'jmespath', '< 1.2'
+
# pedump pessimistically pins multipart-post to a version from 2013 which makes
# bundler very unhappy. Remove this when upstream has merged zed-0xff/pedump#6 .
gem "pedump", git: "https://github.com/ksubrama/pedump.git", branch: "patch-1"