summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-04-03 12:28:31 -0700
committerTim Smith <tsmith@chef.io>2019-04-03 12:28:31 -0700
commit1e47342320d781fcb918f44617e4c2e4152b0028 (patch)
treefaa88906fcf51c08a868553352d516e43152538c
parentdea42892cf2cb2123b4214151eb9e890153c122f (diff)
downloadchef-1e47342320d781fcb918f44617e4c2e4152b0028.tar.gz
Update Ruby to 2.5.5 and nokogiri to 1.10.2
Ruby and nokogiri bugfixes. We're not impacted by the rubygems CVE fixes since we already bump rubygems ourselves. Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--omnibus/Gemfile.lock2
-rw-r--r--omnibus_overrides.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 1798c4db89..090d4b9d71 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -18,7 +18,7 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: 3f3bd5dd6d17212f2b90a2e45c63bf97224b48e6
+ revision: 2018a4ef1fbf75de998ed965835314fee1275a89
branch: master
specs:
omnibus-software (4.0.0)
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 1b789bc926..0a47ecbf7e 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -6,7 +6,7 @@
# software here: bundle exec rake dependencies:update_omnibus_gemfile_lock
override :rubygems, version: "2.7.9"
override :bundler, version: "1.17.3"
-override "nokogiri", version: "1.10.1"
+override "nokogiri", version: "1.10.2"
override "libffi", version: "3.2.1"
override "libiconv", version: "1.15"
override "liblzma", version: "5.2.4"
@@ -17,7 +17,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.5.3"
+override "ruby", version: "2.5.5"
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"