Merge pull request #8339 from chef/ruby255

Update Ruby to 2.5.5 and nokogiri to 1.10.2

4 files changed, 24 insertions, 5 deletions

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 0f72e863c6..861843b7ed 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,5 +1,24 @@
 This file holds "in progress" release notes for the current release under development and is intended for consumption by the Chef Documentation team. Please see <https://docs.chef.io/release_notes.html> for the official Chef release notes.
 
+# Chef Client Release Notes 14.12:
+
+## Updated Resources
+
+### windows_service
+
+The windows_service resource no longer resets credentials on a service when using the :start action without the :configure action. Thanks [@jasonwbarnett](https://github.com/jasonwbarnett) for fixing this.
+
+### windows_certificate
+
+The windows_certificate resource now imports nested certificates while importing P7B certs.
+
+## Updated Components
+
+- nokogiri 1.10.1 -> 1.10.2
+- ruby 2.5.3 -> 2.5.5
+- InSpec 3.7.1 -> 3.9.0
+- The unused windows-api gem is no longer bundled with Chef on Windows hosts
+
 # Chef Client Release Notes 14.11:
 
 ## Updated Resources
diff --git a/kitchen-tests/kitchen.yml b/kitchen-tests/kitchen.yml
index fd8e5383ea..b86134a2d6 100644
--- a/kitchen-tests/kitchen.yml
+++ b/kitchen-tests/kitchen.yml
@@ -12,7 +12,7 @@ verifier:
 provisioner:
   name: chef_github
   chef_omnibus_url: "https://omnitruck.chef.io/install.sh"
-  chef_omnibus_install_options: "-c current"
+  chef_omnibus_install_options: "-c current -v 14"
   github_owner: "chef"
   github_repo: "chef"
   ohai_refname: "master"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 1798c4db89..f4a2326577 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: 8e902b14ff285a57846a41231edc939a9be399d6
   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.2)
-    aws-partitions (1.148.0)
+    aws-partitions (1.149.0)
     aws-sdk-core (3.48.3)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1.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"