use ruby 2.5tm/ruby_25

Signed-off-by: Thom May <thom@chef.io>

3 files changed, 17 insertions, 14 deletions

diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index 652a6e69b8..0442cc8fd8 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 gem "omnibus", git: "https://github.com/chef/omnibus"
-gem "omnibus-software", git: "https://github.com/chef/omnibus-software"
+gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "tm/fix_rb_25"
 gem "license_scout", git: "https://github.com/chef/license_scout"
 
 gem "pedump"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 928cc8eeaf..a0cd9f30cd 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -9,7 +9,7 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus
-  revision: f6f9973bd65af06a6b3077b3ee094ca203b1d612
+  revision: fccb08790cad4cf03deebb817561539dfe16cc7c
   specs:
     omnibus (5.6.1)
       aws-sdk (~> 2)
@@ -26,7 +26,8 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus-software
-  revision: 918dcb6b883ce2edb1528040875257b8e9b1c79f
+  revision: 39a9606ec96340d1fd49f04653b533991fd01853
+  branch: tm/fix_rb_25
   specs:
     omnibus-software (4.0.0)
       chef-sugar (>= 3.4.0)
@@ -38,13 +39,13 @@ GEM
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     awesome_print (1.8.0)
-    aws-sdk (2.10.112)
-      aws-sdk-resources (= 2.10.112)
-    aws-sdk-core (2.10.112)
+    aws-sdk (2.10.123)
+      aws-sdk-resources (= 2.10.123)
+    aws-sdk-core (2.10.123)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.10.112)
-      aws-sdk-core (= 2.10.112)
+    aws-sdk-resources (2.10.123)
+      aws-sdk-core (= 2.10.123)
     aws-sigv4 (1.0.2)
     berkshelf (4.3.5)
       addressable (~> 2.3, >= 2.3.4)
@@ -68,7 +69,7 @@ GEM
       faraday (~> 0.9.1)
       httpclient (~> 2.7.0)
       ridley (~> 4.5)
-    binding_of_caller (0.7.3)
+    binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     buff-config (1.0.1)
       buff-extensions (~> 1.0)
@@ -85,11 +86,12 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (13.6.4)
+    chef-config (13.7.16)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
+      tomlrb (~> 1.2)
     chef-sugar (3.6.0)
     citrus (3.0.2)
     cleanroom (1.0.0)
@@ -141,7 +143,7 @@ GEM
       wmi-lite (~> 1.0)
     mixlib-versioning (1.2.2)
     molinillo (0.4.5)
-    multi_json (1.12.2)
+    multi_json (1.13.1)
     multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
@@ -152,7 +154,7 @@ GEM
     nori (2.6.0)
     octokit (4.8.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (8.25.1)
+    ohai (8.26.1)
       chef-config (>= 12.5.0.alpha.1, < 14)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
@@ -212,7 +214,7 @@ GEM
       molinillo (~> 0.4.2)
       semverse (~> 1.1)
     systemu (2.6.5)
-    test-kitchen (1.19.2)
+    test-kitchen (1.20.0)
       mixlib-install (~> 3.6)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
@@ -227,6 +229,7 @@ GEM
       hitimes
     toml-rb (1.1.1)
       citrus (~> 3.0, > 3.0)
+    tomlrb (1.2.6)
     varia_model (0.4.1)
       buff-extensions (~> 1.0)
       hashie (>= 2.0.2, < 4.0.0)
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 8da7dc9940..2edc151fc5 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -14,7 +14,7 @@ override "libyaml", version: "0.1.7"
 override "makedepend", version: "1.0.5"
 override "ncurses", version: "5.9"
 override "pkg-config-lite", version: "0.28-1"
-override "ruby", version: "2.4.3"
+override "ruby", version: "2.5.0"
 override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18"
 override "util-macros", version: "1.19.0"
 override "xproto", version: "7.0.28"