summaryrefslogtreecommitdiff
path: root/version_policy.rb
diff options
context:
space:
mode:
authorMatt Wrock <matt@mattwrock.com>2016-06-21 10:11:04 -0700
committerMatt Wrock <matt@mattwrock.com>2016-06-21 10:11:04 -0700
commit1575a6696969fdabf06be4bca222eea8fbcfaeec (patch)
treea2fd9427f59af1f95c0c0d464bb9718cf27c9996 /version_policy.rb
parentde78e3902a6b1743f0d69bbac073c274ed85cb80 (diff)
downloadchef-1575a6696969fdabf06be4bca222eea8fbcfaeec.tar.gz
update nokogiri and dependencies
Diffstat (limited to 'version_policy.rb')
-rw-r--r--version_policy.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/version_policy.rb b/version_policy.rb
index 128b52d0ba..b8bead7bef 100644
--- a/version_policy.rb
+++ b/version_policy.rb
@@ -26,8 +26,8 @@ OMNIBUS_OVERRIDES = {
## according to comment in omnibus-sw, the very latest versions don't work on solaris
# https://github.com/chef/omnibus-software/blob/aefb7e79d29ca746c3f843673ef5e317fa3cba54/config/software/libtool.rb#L23
"libtool" => "2.4.2",
- "libxml2" => "2.9.3",
- "libxslt" => "1.1.28",
+ "libxml2" => "2.9.4",
+ "libxslt" => "1.1.29",
"libyaml" => "0.1.6",
"makedepend" => "1.0.5",
"ncurses" => "5.9",
@@ -73,7 +73,6 @@ OMNIBUS_RUBYGEMS_AT_LATEST_VERSION = {
# slop - expected to disappear with new pry release
# stove - halite pins to ~> 3.2 in 1.2.1
# rubocop - chef-style pins to 0.39.0 in 0.3.1
-# TODO remove nokogiri when we can update to 1.6.8
#
ACCEPTABLE_OUTDATED_GEMS = %w{
gherkin
@@ -82,7 +81,6 @@ ACCEPTABLE_OUTDATED_GEMS = %w{
slop
stove
rubocop
- nokogiri
}
#