Merge branch 'chef-16' into evanahlberg/BS-167

12 files changed, 84 insertions, 82 deletions

diff --git a/.expeditor/habitat-test.pipeline.yml b/.expeditor/habitat-test.pipeline.yml
index 836f9c91f4..1df53a8d59 100644
--- a/.expeditor/habitat-test.pipeline.yml
+++ b/.expeditor/habitat-test.pipeline.yml
@@ -8,7 +8,6 @@ expeditor:
           limit: 1
 
 steps:
-
 - label: ":linux: Validate Linux"
   commands:
     - sudo ./.expeditor/scripts/install-hab.sh x86_64-linux
@@ -35,7 +34,7 @@ steps:
 
 - label: ":windows: Validate Habitat Builds of Chef Infra"
   commands:
-    - .expeditor/scripts/habitat-test.ps1 $EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64WINDOWS
+    - .expeditor/scripts/habitat-test.ps1 -WindowsArtifact $EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64WINDOWS
   expeditor:
     executor:
       windows:
diff --git a/.expeditor/scripts/ensure-minimum-viable-hab.ps1 b/.expeditor/scripts/ensure-minimum-viable-hab.ps1
index 5d1bf1f54b..44fdd79548 100644
--- a/.expeditor/scripts/ensure-minimum-viable-hab.ps1
+++ b/.expeditor/scripts/ensure-minimum-viable-hab.ps1
@@ -16,6 +16,4 @@ catch {
     Write-Host "--- :habicat: Installing the version of Habitat required"
     Set-ExecutionPolicy Bypass -Scope Process -Force
     Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/habitat-sh/habitat/main/components/hab/install.ps1'))
-}
-Write-Host "--- :habicat: Refreshing the Path"
-$env:Path = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User") + ";C:\ProgramData\Habitat;"
+}
\ No newline at end of file
diff --git a/.expeditor/scripts/habitat-test.ps1 b/.expeditor/scripts/habitat-test.ps1
index 824cbf94b5..0dbcf3e4af 100644
--- a/.expeditor/scripts/habitat-test.ps1
+++ b/.expeditor/scripts/habitat-test.ps1
@@ -1,15 +1,16 @@
+param ($WindowsArtifact = $(throw "WindowsArtifact parameter is required."))
 $ErrorActionPreference = 'Stop'
 
 $ScriptRoute = [System.IO.Path]::GetFullPath([System.IO.Path]::Combine($PSScriptRoot, "ensure-minimum-viable-hab.ps1"))
 & "$ScriptRoute"
 # . ./scripts/ensure-minimum-viable-hab.ps1
-Write-Host "--- Installing $EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64WINDOWS"
+Write-Host "--- Installing $WindowsArtifact"
 $env:Path = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User")
-hab pkg install $EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64WINDOWS
+hab pkg install $WindowsArtifact
 
-if (-not $?) { throw "Unable to install $EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64WINDOWS" }
+if (-not $?) { throw "Unable to install $WindowsArtifact" }
 
-. ./habitat/tests/test.ps1 -PackageIdentifier $EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64WINDOWS
+. ./habitat/tests/test.ps1 -PackageIdentifier $WindowsArtifact
 
 if (-not $?) { throw "Habitat tests failed" }
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d93ec541f..112dec9347 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,49 +2,60 @@
 
 This changelog lists individual merged pull requests to Chef Infra Client and geared towards developers. For a list of significant changes per release see the [Chef Infra Client Release Notes](https://docs.chef.io/release_notes_client/).
 
-<!-- latest_release 16.18.29 -->
-## [v16.18.29](https://github.com/chef/chef/tree/v16.18.29) (2023-02-06)
+<!-- latest_release 16.18.35 -->
+## [v16.18.35](https://github.com/chef/chef/tree/v16.18.35) (2023-02-23)
 
 #### Merged Pull Requests
-- [Chef-16] [Backport #13327 ]Fix indentation of condition for disabling repos [#13529](https://github.com/chef/chef/pull/13529) ([neha-p6](https://github.com/neha-p6))
+- Bump plist to 3.7.0 [#13596](https://github.com/chef/chef/pull/13596) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot]))
 <!-- latest_release -->
 
-<!-- release_rollup since=16.18.0 -->
+<!-- release_rollup since=16.18.30 -->
 ### Changes not yet released to stable
 
 #### Merged Pull Requests
-- [Chef-16] [Backport #13327 ]Fix indentation of condition for disabling repos [#13529](https://github.com/chef/chef/pull/13529) ([neha-p6](https://github.com/neha-p6)) <!-- 16.18.29 -->
-- [Chef-16]Update dependencies for chef and chef/omnibus [#13550](https://github.com/chef/chef/pull/13550) ([neha-p6](https://github.com/neha-p6)) <!-- 16.18.28 -->
-- Bugfix/backport chef16 checksum validation [#13322](https://github.com/chef/chef/pull/13322) ([decoyjoe](https://github.com/decoyjoe)) <!-- 16.18.27 -->
-- [chef-16] INFC-303 - Backport changes from v18 to v16 for documentation [#13270](https://github.com/chef/chef/pull/13270) ([Stromweld](https://github.com/Stromweld)) <!-- 16.18.26 -->
-- backport to 16: flush package cache after registering or unregistering with rhsm_register [#12908](https://github.com/chef/chef/pull/12908) ([jasonwbarnett](https://github.com/jasonwbarnett)) <!-- 16.18.25 -->
-- Rewriting the zypper code to run only on openSUSE 15 [#13486](https://github.com/chef/chef/pull/13486) ([johnmccrae](https://github.com/johnmccrae)) <!-- 16.18.24 -->
-- INFC-373 Disable 32-bit Windows for Chef 16 [#13458](https://github.com/chef/chef/pull/13458) ([tpowell-progress](https://github.com/tpowell-progress)) <!-- 16.18.23 -->
-- [Chef-16] Add nightly adhoc builds for chef-16 [#13406](https://github.com/chef/chef/pull/13406) ([neha-p6](https://github.com/neha-p6)) <!-- 16.18.22 -->
-- Bump omnibus-software from `e9632cb` to `f2e9a99` in /omnibus [#13410](https://github.com/chef/chef/pull/13410) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 16.18.21 -->
-- Chef-16: Functional tests under verify pipeline get timed out [#13403](https://github.com/chef/chef/pull/13403) ([tpowell-progress](https://github.com/tpowell-progress)) <!-- 16.18.20 -->
-- Bump omnibus from `d1fe3bb` to `52b6d2e` in /omnibus [#13370](https://github.com/chef/chef/pull/13370) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 16.18.19 -->
-- [Chef-16] Correct the rake task to pull in omnibus dependencies [#13304](https://github.com/chef/chef/pull/13304) ([neha-p6](https://github.com/neha-p6)) <!-- 16.18.18 -->
-- [Chef-16] Fix kitchen test failure on ubuntu2204 [#13384](https://github.com/chef/chef/pull/13384) ([neha-p6](https://github.com/neha-p6)) <!-- 16.18.17 -->
-- [Chef-16] Disable caching for s3 and git to successfully build aritifacts using ruby31 [#13279](https://github.com/chef/chef/pull/13279) ([neha-p6](https://github.com/neha-p6)) <!-- 16.18.16 -->
-- [Chef-16]Update expired SSL cert for self-signed.badssl.com used in kitchen tests [#13318](https://github.com/chef/chef/pull/13318) ([neha-p6](https://github.com/neha-p6)) <!-- 16.18.15 -->
-- [chef-16] Fix windows functional test ruby activation failure under verify pipeline  [#13262](https://github.com/chef/chef/pull/13262) ([neha-p6](https://github.com/neha-p6)) <!-- 16.18.14 -->
-- [chef-16] Fix hab package failures under windows plan in verify pipeline [#13251](https://github.com/chef/chef/pull/13251) ([neha-p6](https://github.com/neha-p6)) <!-- 16.18.13 -->
-- Revert &quot;Bump train-core to 3.10.7&quot; [#13294](https://github.com/chef/chef/pull/13294) ([neha-p6](https://github.com/neha-p6)) <!-- 16.18.12 -->
-- [chef-16] Update ncurses to 6.3 to fix build failures in adhoc pipeline on FreeBSD12 [#13267](https://github.com/chef/chef/pull/13267) ([neha-p6](https://github.com/neha-p6)) <!-- 16.18.11 -->
-- Bump omnibus from `5bc091a` to `d1fe3bb` in /omnibus [#13272](https://github.com/chef/chef/pull/13272) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 16.18.10 -->
-- Bump train-core to 3.10.7 [#13269](https://github.com/chef/chef/pull/13269) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) <!-- 16.18.9 -->
-- [Chef-16] Fix solaris build and test failures in adhoc pipeline [#13240](https://github.com/chef/chef/pull/13240) ([neha-p6](https://github.com/neha-p6)) <!-- 16.18.8 -->
-- [chef-16]Fix windows build failures in adhoc pipeline throwing error &#39;SignTool Error: No certificates were found that met all the given criteria&#39; by updating the msi&#39; [#13241](https://github.com/chef/chef/pull/13241) ([neha-p6](https://github.com/neha-p6)) <!-- 16.18.7 -->
-- [Chef-16] Fix OpenSUSE failures in verify pipeline [#13239](https://github.com/chef/chef/pull/13239) ([neha-p6](https://github.com/neha-p6)) <!-- 16.18.6 -->
-- [chef-16] Fix github actions multiple failures [#13238](https://github.com/chef/chef/pull/13238) ([neha-p6](https://github.com/neha-p6)) <!-- 16.18.5 -->
-- Backport to 16: Stop executing locale-gen on every chef run [#12904](https://github.com/chef/chef/pull/12904) ([hrak](https://github.com/hrak)) <!-- 16.18.4 -->
-- Bump berkshelf from 7.2.2 to 8.0.0 in /omnibus [#12835](https://github.com/chef/chef/pull/12835) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 16.18.3 -->
-- Bump omnibus-software from `88438e8` to `ff4c902` in /omnibus [#12853](https://github.com/chef/chef/pull/12853) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 16.18.2 -->
-- Bump omnibus-software from `50d05bc` to `88438e8` in /omnibus [#12845](https://github.com/chef/chef/pull/12845) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 16.18.1 -->
+- Bump plist to 3.7.0 [#13596](https://github.com/chef/chef/pull/13596) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) <!-- 16.18.35 -->
+- Bump chef-vault to 4.1.11 [#13582](https://github.com/chef/chef/pull/13582) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) <!-- 16.18.34 -->
+- Bump omnibus-software from `db8acc3` to `225e357` in /omnibus [#13609](https://github.com/chef/chef/pull/13609) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 16.18.33 -->
+- Bump omnibus from `c66e97c` to `cf97613` in /omnibus [#13592](https://github.com/chef/chef/pull/13592) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 16.18.32 -->
+- Bump kitchen-vagrant from 1.13.0 to 1.14.1 in /omnibus [#13598](https://github.com/chef/chef/pull/13598) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 16.18.31 -->
 <!-- release_rollup -->
 
 <!-- latest_stable_release -->
+## [v16.18.30](https://github.com/chef/chef/tree/v16.18.30) (2023-02-15)
+
+#### Merged Pull Requests
+- Bump omnibus-software from `50d05bc` to `88438e8` in /omnibus [#12845](https://github.com/chef/chef/pull/12845) ([dependabot[bot]](https://github.com/dependabot[bot]))
+- Bump omnibus-software from `88438e8` to `ff4c902` in /omnibus [#12853](https://github.com/chef/chef/pull/12853) ([dependabot[bot]](https://github.com/dependabot[bot]))
+- Bump berkshelf from 7.2.2 to 8.0.0 in /omnibus [#12835](https://github.com/chef/chef/pull/12835) ([dependabot[bot]](https://github.com/dependabot[bot]))
+- Backport to 16: Stop executing locale-gen on every chef run [#12904](https://github.com/chef/chef/pull/12904) ([hrak](https://github.com/hrak))
+- [chef-16] Fix github actions multiple failures [#13238](https://github.com/chef/chef/pull/13238) ([neha-p6](https://github.com/neha-p6))
+- [Chef-16] Fix OpenSUSE failures in verify pipeline [#13239](https://github.com/chef/chef/pull/13239) ([neha-p6](https://github.com/neha-p6))
+- [chef-16]Fix windows build failures in adhoc pipeline throwing error &#39;SignTool Error: No certificates were found that met all the given criteria&#39; by updating the msi&#39; [#13241](https://github.com/chef/chef/pull/13241) ([neha-p6](https://github.com/neha-p6))
+- [Chef-16] Fix solaris build and test failures in adhoc pipeline [#13240](https://github.com/chef/chef/pull/13240) ([neha-p6](https://github.com/neha-p6))
+- Bump train-core to 3.10.7 [#13269](https://github.com/chef/chef/pull/13269) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot]))
+- Bump omnibus from `5bc091a` to `d1fe3bb` in /omnibus [#13272](https://github.com/chef/chef/pull/13272) ([dependabot[bot]](https://github.com/dependabot[bot]))
+- [chef-16] Update ncurses to 6.3 to fix build failures in adhoc pipeline on FreeBSD12 [#13267](https://github.com/chef/chef/pull/13267) ([neha-p6](https://github.com/neha-p6))
+- Revert &quot;Bump train-core to 3.10.7&quot; [#13294](https://github.com/chef/chef/pull/13294) ([neha-p6](https://github.com/neha-p6))
+- [chef-16] Fix hab package failures under windows plan in verify pipeline [#13251](https://github.com/chef/chef/pull/13251) ([neha-p6](https://github.com/neha-p6))
+- [chef-16] Fix windows functional test ruby activation failure under verify pipeline  [#13262](https://github.com/chef/chef/pull/13262) ([neha-p6](https://github.com/neha-p6))
+- [Chef-16]Update expired SSL cert for self-signed.badssl.com used in kitchen tests [#13318](https://github.com/chef/chef/pull/13318) ([neha-p6](https://github.com/neha-p6))
+- [Chef-16] Disable caching for s3 and git to successfully build aritifacts using ruby31 [#13279](https://github.com/chef/chef/pull/13279) ([neha-p6](https://github.com/neha-p6))
+- [Chef-16] Fix kitchen test failure on ubuntu2204 [#13384](https://github.com/chef/chef/pull/13384) ([neha-p6](https://github.com/neha-p6))
+- [Chef-16] Correct the rake task to pull in omnibus dependencies [#13304](https://github.com/chef/chef/pull/13304) ([neha-p6](https://github.com/neha-p6))
+- Bump omnibus from `d1fe3bb` to `52b6d2e` in /omnibus [#13370](https://github.com/chef/chef/pull/13370) ([dependabot[bot]](https://github.com/dependabot[bot]))
+- Chef-16: Functional tests under verify pipeline get timed out [#13403](https://github.com/chef/chef/pull/13403) ([tpowell-progress](https://github.com/tpowell-progress))
+- Bump omnibus-software from `e9632cb` to `f2e9a99` in /omnibus [#13410](https://github.com/chef/chef/pull/13410) ([dependabot[bot]](https://github.com/dependabot[bot]))
+- [Chef-16] Add nightly adhoc builds for chef-16 [#13406](https://github.com/chef/chef/pull/13406) ([neha-p6](https://github.com/neha-p6))
+- INFC-373 Disable 32-bit Windows for Chef 16 [#13458](https://github.com/chef/chef/pull/13458) ([tpowell-progress](https://github.com/tpowell-progress))
+- Rewriting the zypper code to run only on openSUSE 15 [#13486](https://github.com/chef/chef/pull/13486) ([johnmccrae](https://github.com/johnmccrae))
+- backport to 16: flush package cache after registering or unregistering with rhsm_register [#12908](https://github.com/chef/chef/pull/12908) ([jasonwbarnett](https://github.com/jasonwbarnett))
+- [chef-16] INFC-303 - Backport changes from v18 to v16 for documentation [#13270](https://github.com/chef/chef/pull/13270) ([Stromweld](https://github.com/Stromweld))
+- Bugfix/backport chef16 checksum validation [#13322](https://github.com/chef/chef/pull/13322) ([decoyjoe](https://github.com/decoyjoe))
+- [Chef-16]Update dependencies for chef and chef/omnibus [#13550](https://github.com/chef/chef/pull/13550) ([neha-p6](https://github.com/neha-p6))
+- [Chef-16] [Backport #13327 ]Fix indentation of condition for disabling repos [#13529](https://github.com/chef/chef/pull/13529) ([neha-p6](https://github.com/neha-p6))
+- [Chef-16] Fix habitat test pipeline windows [#13566](https://github.com/chef/chef/pull/13566) ([neha-p6](https://github.com/neha-p6))
+<!-- latest_stable_release -->
+
 ## [v16.18.0](https://github.com/chef/chef/tree/v16.18.0) (2022-04-28)
 
 #### Merged Pull Requests
@@ -57,7 +68,6 @@ This changelog lists individual merged pull requests to Chef Infra Client and ge
 - Fix attribute performance issues in node.read (Chef-16) [#12744](https://github.com/chef/chef/pull/12744) ([lamont-granquist](https://github.com/lamont-granquist))
 - Fix chef_client_config template rendering [#12827](https://github.com/chef/chef/pull/12827) ([jasonwbarnett](https://github.com/jasonwbarnett))
 - Updated EOL for Chef 16 [#12821](https://github.com/chef/chef/pull/12821) ([johnmccrae](https://github.com/johnmccrae))
-<!-- latest_stable_release -->
 
 ## [v16.17.51](https://github.com/chef/chef/tree/v16.17.51) (2022-02-17)
 
diff --git a/Dockerfile b/Dockerfile
index d2bd8645fc..b1a701da11 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@ FROM busybox
 LABEL maintainer="Chef Software, Inc. <docker@chef.io>"
 
 ARG CHANNEL=stable
-ARG VERSION=16.18.0
+ARG VERSION=16.18.30
 
 RUN wget "http://packages.chef.io/files/${CHANNEL}/chef/${VERSION}/el/6/chef-${VERSION}-1.el6.x86_64.rpm" -O /tmp/chef-client.rpm && \
     rpm2cpio /tmp/chef-client.rpm | cpio -idmv && \
diff --git a/Gemfile.lock b/Gemfile.lock
index 6e99ac6570..b2e987e0a0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,22 +27,16 @@ GIT
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rest-client (2.1.0-x64-mingw32)
-      ffi (~> 1.15)
-      http-accept (>= 1.7.0, < 2.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 4.0)
-      netrc (~> 0.8)
 
 PATH
   remote: .
   specs:
-    chef (16.18.29)
+    chef (16.18.35)
       addressable
       bcrypt_pbkdf (~> 1.1)
       bundler (>= 1.10)
-      chef-config (= 16.18.29)
-      chef-utils (= 16.18.29)
+      chef-config (= 16.18.35)
+      chef-utils (= 16.18.35)
       chef-vault
       chef-zero (>= 14.0.11)
       diff-lcs (>= 1.2.4, < 1.4.0)
@@ -73,13 +67,13 @@ PATH
       tty-screen (~> 0.6)
       tty-table (~> 0.11)
       uuidtools (>= 2.1.5, < 3.0)
-    chef (16.18.29-universal-mingw32)
+    chef (16.18.35-universal-mingw32)
       addressable
       bcrypt_pbkdf (~> 1.1)
       bundler (>= 1.10)
-      chef-config (= 16.18.29)
+      chef-config (= 16.18.35)
       chef-powershell (~> 1.0.12)
-      chef-utils (= 16.18.29)
+      chef-utils (= 16.18.35)
       chef-vault
       chef-zero (>= 14.0.11)
       diff-lcs (>= 1.2.4, < 1.4.0)
@@ -125,15 +119,15 @@ PATH
 PATH
   remote: chef-bin
   specs:
-    chef-bin (16.18.29)
-      chef (= 16.18.29)
+    chef-bin (16.18.35)
+      chef (= 16.18.35)
 
 PATH
   remote: chef-config
   specs:
-    chef-config (16.18.29)
+    chef-config (16.18.35)
       addressable
-      chef-utils (= 16.18.29)
+      chef-utils (= 16.18.35)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
@@ -142,7 +136,7 @@ PATH
 PATH
   remote: chef-utils
   specs:
-    chef-utils (16.18.29)
+    chef-utils (16.18.35)
 
 GEM
   remote: https://rubygems.org/
@@ -166,7 +160,7 @@ GEM
     chef-telemetry (1.1.1)
       chef-config
       concurrent-ruby (~> 1.0)
-    chef-vault (4.1.10)
+    chef-vault (4.1.11)
     chef-zero (15.0.11)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 5.0)
@@ -271,7 +265,7 @@ GEM
     method_source (1.0.0)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2022.0105)
+    mime-types-data (3.2023.0218.1)
     mixlib-archive (1.1.7)
       mixlib-log
     mixlib-archive (1.1.7-universal-mingw32)
@@ -303,12 +297,12 @@ GEM
     netrc (0.11.0)
     nori (2.6.0)
     parallel (1.22.1)
-    parser (3.2.0.0)
+    parser (3.2.1.0)
       ast (~> 2.4.1)
     parslet (1.8.2)
     pastel (0.8.0)
       tty-color (~> 0.5)
-    plist (3.6.0)
+    plist (3.7.0)
     proxifier (1.0.3)
     pry (0.13.0)
       coderay (~> 1.1)
@@ -324,7 +318,7 @@ GEM
     rainbow (3.1.1)
     rake (13.0.6)
     rb-readline (0.5.5)
-    regexp_parser (2.6.2)
+    regexp_parser (2.7.0)
     rexml (3.2.5)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
@@ -351,8 +345,8 @@ GEM
       rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.24.1)
-      parser (>= 3.1.1.0)
+    rubocop-ast (1.26.0)
+      parser (>= 3.2.1.0)
     ruby-prof (1.2.0)
     ruby-progressbar (1.11.0)
     ruby-shadow (2.5.1)
@@ -487,4 +481,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.3.7
+   2.3.18
diff --git a/VERSION b/VERSION
index 3c184c9ebc..9fffd34e3a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.18.29
\ No newline at end of file
+16.18.35
\ No newline at end of file
diff --git a/chef-bin/lib/chef-bin/version.rb b/chef-bin/lib/chef-bin/version.rb
index 65415ff337..a7e79afeed 100644
--- a/chef-bin/lib/chef-bin/version.rb
+++ b/chef-bin/lib/chef-bin/version.rb
@@ -21,7 +21,7 @@
 
 module ChefBin
   CHEFBIN_ROOT = File.expand_path("..", __dir__)
-  VERSION = "16.18.29".freeze
+  VERSION = "16.18.35".freeze
 end
 
 #
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index df00765292..aeb1ac8cf7 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -15,5 +15,5 @@
 
 module ChefConfig
   CHEFCONFIG_ROOT = File.expand_path("..", __dir__)
-  VERSION = "16.18.29".freeze
+  VERSION = "16.18.35".freeze
 end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 51275109c7..0953bb50fb 100644
--- a/chef-utils/lib/chef-utils/version.rb
+++ b/chef-utils/lib/chef-utils/version.rb
@@ -16,5 +16,5 @@
 
 module ChefUtils
   CHEFUTILS_ROOT = File.expand_path("..", __dir__)
-  VERSION = "16.18.29"
+  VERSION = "16.18.35"
 end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index c79cb9b7fc..461ad81123 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require_relative "version_string"
 
 class Chef
   CHEF_ROOT = File.expand_path("..", __dir__)
-  VERSION = Chef::VersionString.new("16.18.29")
+  VERSION = Chef::VersionString.new("16.18.35")
 end
 
 #
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 84278c2ac6..c71032a30f 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,17 +1,17 @@
 GIT
   remote: https://github.com/chef/omnibus-software.git
-  revision: b83f579f6a108786d34ee07e792333451a80d300
+  revision: 225e3576c48fcd0155f6049cb032b2370eccf29a
   branch: main
   specs:
-    omnibus-software (23.2.281)
+    omnibus-software (23.2.286)
       omnibus (>= 9.0.0)
 
 GIT
   remote: https://github.com/chef/omnibus.git
-  revision: 72753d73f0984ba8fc32964072cfba9a7b6f495f
+  revision: cf9761311577e24819625aa1d932f828740e33b4
   branch: main
   specs:
-    omnibus (9.0.15)
+    omnibus (9.0.17)
       aws-sdk-s3 (~> 1.116.0)
       chef-cleanroom (~> 1.0)
       chef-utils (>= 15.4)
@@ -34,7 +34,7 @@ GEM
     artifactory (3.0.15)
     awesome_print (1.9.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.704.0)
+    aws-partitions (1.715.0)
     aws-sdk-core (3.170.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
@@ -235,12 +235,12 @@ GEM
       train-core (~> 3.0)
       tty-prompt (~> 0.17)
       tty-table (~> 0.10)
-    iostruct (0.0.4)
+    iostruct (0.0.5)
     ipaddress (0.8.3)
     iso8601 (0.13.0)
     jmespath (1.6.2)
     json (2.6.3)
-    kitchen-vagrant (1.13.0)
+    kitchen-vagrant (1.14.1)
       test-kitchen (>= 1.4, < 4)
     libyajl2 (2.1.0)
     license-acceptance (2.1.13)
@@ -321,7 +321,7 @@ GEM
       multipart-post (>= 2.0.0)
       rainbow
       zhexdump (>= 0.0.2)
-    plist (3.6.0)
+    plist (3.7.0)
     proxifier (1.0.3)
     pry (0.14.2)
       coderay (~> 1.1)