Pin version of rainbow gem and update deps.

We need to pin rainbow until the next version of rubygems is released as
it is causing build failures in travis.

Signed-off-by: Ryan Hass <rhass@users.noreply.github.com>

7 files changed, 11 insertions, 8 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 391803237b..a85bc1aaae 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/chef/chef-server
-  revision: ca50cdb2ea75f7920e6c7a601b7b3ef8980be913
+  revision: e32b083df4820d8d78ad92094aa2b209e08d3f31
   specs:
     oc-chef-pedant (2.2.0)
       activesupport (>= 4.2.7.1, < 6.0)
diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock
index 2ef7973792..6d8f40436a 100644
--- a/kitchen-tests/Berksfile.lock
+++ b/kitchen-tests/Berksfile.lock
@@ -100,7 +100,7 @@ GRAPH
     compat_resource (>= 12.14.7)
   openssh (2.1.1)
     iptables (>= 1.0)
-  openssl (6.1.0)
+  openssl (6.1.1)
   php (1.5.0)
     build-essential (>= 0.0.0)
     iis (>= 0.0.0)
diff --git a/kitchen-tests/Gemfile b/kitchen-tests/Gemfile
index ad89269a75..4b6b595d1f 100644
--- a/kitchen-tests/Gemfile
+++ b/kitchen-tests/Gemfile
@@ -9,3 +9,4 @@ gem "kitchen-vagrant"
 gem "ridley"
 gem "test-kitchen"
 gem "vagrant-wrapper"
+gem "rainbow", ">= 2.1.0", "< 2.2"
diff --git a/kitchen-tests/Gemfile.lock b/kitchen-tests/Gemfile.lock
index 83715f58b0..86aa1f9aec 100644
--- a/kitchen-tests/Gemfile.lock
+++ b/kitchen-tests/Gemfile.lock
@@ -12,7 +12,7 @@ GEM
     aws-sdk-resources (2.6.48)
       aws-sdk-core (= 2.6.48)
     aws-sigv4 (1.0.0)
-    berkshelf (5.3.0)
+    berkshelf (5.4.0)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (>= 2.0.2, < 4.0)
       buff-config (~> 2.0)
@@ -145,7 +145,7 @@ GEM
       method_source (~> 0.8.1)
       slop (~> 3.4)
     public_suffix (2.0.5)
-    rainbow (2.2.1)
+    rainbow (2.1.0)
     retryable (2.0.4)
     ridley (5.1.0)
       addressable
@@ -248,6 +248,7 @@ DEPENDENCIES
   kitchen-ec2
   kitchen-inspec
   kitchen-vagrant
+  rainbow (>= 2.1.0, < 2.2)
   ridley
   test-kitchen
   vagrant-wrapper
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index 735b371c62..2bcc49ea24 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 gem "omnibus", github: "chef/omnibus", branch: "rhass/COOL-502_with_gcc_investigate"
-gem "omnibus-software", github: "chef/omnibus-software", branch: "shain/ruby_windows_monster"
+gem "omnibus-software", github: "chef/omnibus-software", branch: "rhass/COOL-657_ecc-algorithm-support+ruby_windows_monster"
 gem "license_scout", github: "chef/license_scout"
 
 gem "pedump"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 9e430e6afc..4409ea83ed 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -8,8 +8,8 @@ GIT
 
 GIT
   remote: git://github.com/chef/omnibus-software.git
-  revision: f4b1c0f2682907967d10c64850f9c607070697dd
-  branch: shain/ruby_windows_monster
+  revision: e17ce57df791747037142a91089eb880c08b6fb5
+  branch: rhass/COOL-657_ecc-algorithm-support+ruby_windows_monster
   specs:
     omnibus-software (4.0.0)
       chef-sugar (>= 3.4.0)
@@ -17,7 +17,7 @@ GIT
 
 GIT
   remote: git://github.com/chef/omnibus.git
-  revision: 7fc5529b89327c7b1df457f3ac1f60cd2a9d8f64
+  revision: dce5283a85a44484a66a8a84991beba92e46fd12
   branch: rhass/COOL-502_with_gcc_investigate
   specs:
     omnibus (5.5.0)
diff --git a/version_policy.rb b/version_policy.rb
index 5621ea43ff..a16e7ad500 100644
--- a/version_policy.rb
+++ b/version_policy.rb
@@ -21,6 +21,7 @@ OMNIBUS_OVERRIDES = {
   ## according to comment in omnibus-sw, latest versions don't work on solaris
   # https://github.com/chef/omnibus-software/blob/aefb7e79d29ca746c3f843673ef5e317fa3cba54/config/software/libtool.rb#L23
   :bundler => "1.12.5", # until we figure out how to work with 1.13.0
+  :rainbow => "2.1.0", # Currently pinned until rubygems is updated
   "libffi" => "3.2.1",
   "libiconv" => "1.14",
   "liblzma" => "5.2.2",