let ruby+rubygems float

3 files changed, 6 insertions, 13 deletions

diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index 12001d1c17..162668e3e1 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 gem "omnibus", github: "chef/omnibus"
-gem "omnibus-software", github: "chef/omnibus-software"
+gem "omnibus-software", github: "chef/omnibus-software", branch: "lcg/bundler-rubygems-float"
 
 # This development group is installed by default when you run `bundle install`,
 # but if you are using Omnibus in a CI-based infrastructure, you do not need
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index fde9c090aa..84d36a3f98 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,6 +1,7 @@
 GIT
   remote: git://github.com/chef/omnibus-software.git
-  revision: 4aefb7ae85b1ddc441ec93e012ca47adc81b2922
+  revision: e1d614d90503891a95b45e07355d5bae8544b9cd
+  branch: lcg/bundler-rubygems-float
   specs:
     omnibus-software (4.0.0)
 
diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb
index 4242e0fef0..43628c08f8 100644
--- a/omnibus/config/projects/chef.rb
+++ b/omnibus/config/projects/chef.rb
@@ -32,8 +32,6 @@ else
   install_dir "#{default_root}/#{name}"
 end
 
-override :bundler,        version: "1.10.6"
-
 if windows?
   override :'ruby-windows', version: "2.0.0-p645"
   # Leave dev-kit pinned to 4.5 because 4.7 is 20MB larger and we don't want
@@ -45,15 +43,9 @@ 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
+# if you pin either of these, please document why
+# override :rubygems,     version: "2.4.8"
+# override :bundler,      version: "1.10.6"
 
 # Chef Release version pinning
 override :chef, version: "local_source"