summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2016-02-05 09:26:02 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2016-02-05 09:26:02 -0800
commita4827d8df9647c8a2a891c1fcca2664b677073fa (patch)
treef4c25ff5d0ca2d77535d5f63c7b2baf322546667
parente23cef930e00bd3f8ec2117ccfc48370e776b36f (diff)
downloadchef-a4827d8df9647c8a2a891c1fcca2664b677073fa.tar.gz
bump bunder + rubygems
these versions pass in manhattan
-rw-r--r--omnibus/config/projects/chef.rb12
1 files changed, 2 insertions, 10 deletions
diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb
index 6a0f5eb96e..9457892e62 100644
--- a/omnibus/config/projects/chef.rb
+++ b/omnibus/config/projects/chef.rb
@@ -33,7 +33,6 @@ else
install_dir "#{default_root}/#{name}"
end
-override :bundler, version: "1.10.6"
if windows?
override :'ruby-windows', version: "2.0.0-p645"
@@ -46,15 +45,8 @@ else
override :ruby, version: "2.1.6"
end
-######
-# This points to jay's patched version for now to avoid a security
-# vulnerability and to allow pry to get installed on windows builds.
-# See the software definition for details.
-if windows?
- override :rubygems, version: "jdm/2.4.8-patched"
-else
- override :rubygems, version: "2.4.8"
-end
+override :bundler, version: "1.11.2"
+override :rubygems, version: "2.5.2"
# Chef Release version pinning
override :chef, version: "local_source"