diff options
author | Tim Smith <tsmith@chef.io> | 2019-02-06 14:23:23 -0800 |
---|---|---|
committer | Tim Smith <tsmith@chef.io> | 2019-02-06 14:23:23 -0800 |
commit | 959f34d5fe3d591a90b7bf9ee6d86c439afcbeb9 (patch) | |
tree | a4072b0591f3cc9aa2ea2cbd62bf752eef753350 | |
parent | 2dcbbd2dfb0604f9af1051ea77898798ee5221e9 (diff) | |
download | chef-959f34d5fe3d591a90b7bf9ee6d86c439afcbeb9.tar.gz |
Update nokogiri to 1.10.1nokogiri_13
This is the latest and greatest release with a ton of bug fixes over the previous version.
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r-- | Gemfile.lock | 2 | ||||
-rw-r--r-- | omnibus/Gemfile.lock | 30 | ||||
-rw-r--r-- | omnibus_overrides.rb | 2 |
3 files changed, 17 insertions, 17 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 9195b053cd..f822ca680f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -123,7 +123,7 @@ GEM excon (0.62.0) faraday (0.15.4) multipart-post (>= 1.2, < 3) - faraday_middleware (0.12.2) + faraday_middleware (0.13.1) faraday (>= 0.7.4, < 1.0) ffi (1.10.0) ffi (1.10.0-x64-mingw32) diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 6e8fdb0848..89ba5b7b50 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/chef/omnibus - revision: c1f49993ce7daeac6fbb4352e8787468d81a1121 + revision: bf006801aa98595383904ea65c098846d8c12ea4 branch: master specs: - omnibus (6.0.12) + omnibus (6.0.18) aws-sdk-s3 (~> 1) chef-sugar (>= 3.3) cleanroom (~> 1.0) @@ -18,7 +18,7 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: 222f2955a04b6e57c841faf58d1879ab7280e734 + revision: f341152c973e02da707a5a408cfb19cccaf54e45 branch: master specs: omnibus-software (4.0.0) @@ -32,7 +32,7 @@ GEM public_suffix (>= 2.0.2, < 4.0) awesome_print (1.8.0) aws-eventstream (1.0.1) - aws-partitions (1.133.0) + aws-partitions (1.136.0) aws-sdk-core (3.46.0) aws-eventstream (~> 1.0) aws-partitions (~> 1.0) @@ -63,10 +63,10 @@ GEM debug_inspector (>= 0.0.1) builder (3.2.3) byebug (10.0.2) - chef (14.8.12) + chef (14.10.9) addressable bundler (>= 1.10) - chef-config (= 14.8.12) + chef-config (= 14.10.9) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -74,7 +74,7 @@ GEM ffi-yajl (~> 2.2) highline (~> 1.6, >= 1.6.9) iniparse (~> 1.4) - mixlib-archive (~> 0.4) + mixlib-archive (>= 0.4, < 2.0) mixlib-authentication (~> 2.1) mixlib-cli (~> 1.7) mixlib-log (~> 2.0, >= 2.0.3) @@ -93,10 +93,10 @@ GEM specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (14.8.12-universal-mingw32) + chef (14.10.9-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.8.12) + chef-config (= 14.10.9) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -105,7 +105,7 @@ GEM highline (~> 1.6, >= 1.6.9) iniparse (~> 1.4) iso8601 (~> 0.12.1) - mixlib-archive (~> 0.4) + mixlib-archive (>= 0.4, < 2.0) mixlib-authentication (~> 2.1) mixlib-cli (~> 1.7) mixlib-log (~> 2.0, >= 2.0.3) @@ -136,7 +136,7 @@ GEM win32-taskscheduler (~> 2.0) windows-api (~> 0.4.4) wmi-lite (~> 1.0) - chef-config (14.8.12) + chef-config (14.10.9) addressable fuzzyurl mixlib-config (>= 2.2.12, < 3.0) @@ -199,7 +199,7 @@ GEM mixlib-cli (1.7.0) mixlib-config (2.2.18) tomlrb - mixlib-install (3.11.5) + mixlib-install (3.11.11) mixlib-shellout mixlib-versioning thor @@ -318,7 +318,7 @@ GEM tomlrb (1.2.8) uuidtools (2.1.5) win32-api (1.5.3-universal-mingw32) - win32-certstore (0.2.2) + win32-certstore (0.2.4) ffi mixlib-shellout win32-dir (0.5.1) @@ -338,7 +338,7 @@ GEM win32-service (1.0.1) ffi ffi-win32-extensions - win32-taskscheduler (2.0.0) + win32-taskscheduler (2.0.4) ffi structured_warnings windows-api (0.4.4) @@ -381,4 +381,4 @@ DEPENDENCIES winrm-fs (~> 1.0) BUNDLED WITH - 1.17.1 + 1.17.3 diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 8358d304ea..8334d35a52 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -3,7 +3,7 @@ # try to keep it machine-parsable. override :rubygems, version: "2.6.14" override :bundler, version: "1.15.4" -override "nokogiri", version: "1.8.5" +override "nokogiri", version: "1.10.1" override "libffi", version: "3.2.1" override "libiconv", version: "1.15" override "liblzma", version: "5.2.4" |