summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan McLellan <btm@chef.io>2019-11-04 16:56:22 -0500
committerGitHub <noreply@github.com>2019-11-04 16:56:22 -0500
commit89f2aac1d6938f2165d829632847d40e705a03f0 (patch)
tree72dda4670fb67adc2ce0742910292e7059de551f
parent3b9a17306796a71c67561d49784e459e192fcf24 (diff)
parent51ed0c2fa3462b2f6f6196d1bd62e37b1e67ec3a (diff)
downloadchef-89f2aac1d6938f2165d829632847d40e705a03f0.tar.gz
Merge pull request #9054 from chef/bump_lib_deps
Update lixml2, libxslt, and nokogiri to the latest
-rw-r--r--omnibus/Gemfile.lock4
-rw-r--r--omnibus_overrides.rb6
2 files changed, 5 insertions, 5 deletions
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index f59dcc12c6..6c471de330 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -18,7 +18,7 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: a16abe91fac43170f5c9ecc97d55cd0c0fa9a0c6
+ revision: 9068533963f936e8d615c6860b6089126b091f3d
branch: master
specs:
omnibus-software (4.0.0)
@@ -280,7 +280,7 @@ GEM
structured_warnings (0.4.0)
syslog-logger (1.6.8)
systemu (2.6.5)
- test-kitchen (2.3.3)
+ test-kitchen (2.3.4)
bcrypt_pbkdf (~> 1.0)
ed25519 (~> 1.2)
license-acceptance (~> 1.0, >= 1.0.11)
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 06382af2b5..81737b43e6 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -10,12 +10,12 @@ override "libffi", version: "3.2.1"
override "libiconv", version: "1.15"
override "liblzma", version: "5.2.4"
override "libtool", version: "2.4.2"
-override "libxml2", version: "2.9.9"
-override "libxslt", version: "1.1.30"
+override "libxml2", version: "2.9.10"
+override "libxslt", version: "1.1.34"
override "libyaml", version: "0.1.7"
override "makedepend", version: "1.0.5"
override "ncurses", version: "5.9"
-override "nokogiri", version: "1.10.4"
+override "nokogiri", version: "1.10.5"
override "openssl", version: "1.0.2t"
override "pkg-config-lite", version: "0.28-1"
override "ruby", version: "2.6.5"