diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-02-05 09:47:33 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2016-02-05 09:47:33 -0800 |
| commit | d1cf34b059a16a81e0fc48de52ba29863bb41fe6 (patch) | |
| tree | 3f16ec4688f46f8435658dd3133bf116d2233c92 /omnibus/config | |
| parent | 795b21d0244f3e2d3ba8b145d16244e42b836ae0 (diff) | |
| parent | a4827d8df9647c8a2a891c1fcca2664b677073fa (diff) | |
| download | chef-d1cf34b059a16a81e0fc48de52ba29863bb41fe6.tar.gz | |
Merge pull request #4532 from chef/lcg/bump-bundler-rubygems
bump bunder + rubygems
Diffstat (limited to 'omnibus/config')
| -rw-r--r-- | omnibus/config/projects/chef.rb | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb index 1dde5cfe85..c8ba4e74bb 100644 --- a/omnibus/config/projects/chef.rb +++ b/omnibus/config/projects/chef.rb @@ -34,7 +34,6 @@ else install_dir "#{default_root}/#{name}" end -override :bundler, version: "1.10.6" if windows? override :'ruby-windows', version: "2.0.0-p645" @@ -47,15 +46,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" |