Merge branch 'main' into tp/ruby-revert-to-ruby31

10 files changed, 60 insertions, 20 deletions

diff --git a/.expeditor/config.yml b/.expeditor/config.yml
index d249264afa..18f4d859df 100644
--- a/.expeditor/config.yml
+++ b/.expeditor/config.yml
@@ -54,6 +54,9 @@ pipelines:
       definition: .expeditor/adhoc-canary.omnibus.yml
       env:
         - ADHOC: true
+  - macos_universal_package:
+      description: Builds universal macos package using arch specific packages
+      definition: .expeditor/macos_universal_package.pipeline.yml
 
 github:
   # This deletes the GitHub PR branch after successfully merged into the release branch
@@ -86,6 +89,7 @@ subscriptions:
   - workload: artifact_published:unstable:chef:{{version_constraint}}
     actions:
       - trigger_pipeline:docker/build
+      - trigger_pipeline:macos_universal_package
   - workload: artifact_published:current:chef:{{version_constraint}}
     actions:
       - bash:.expeditor/promote-docker-images.sh
diff --git a/.expeditor/macos_universal_package.pipeline.yml b/.expeditor/macos_universal_package.pipeline.yml
new file mode 100644
index 0000000000..6fddb90a89
--- /dev/null
+++ b/.expeditor/macos_universal_package.pipeline.yml
@@ -0,0 +1 @@
+# This pipeline is currently under development.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 167498bb0a..01be44c259 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,17 +1,18 @@
 <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
 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 18.0.141 -->
-## [v18.0.141](https://github.com/chef/chef/tree/v18.0.141) (2022-08-16)
+<!-- latest_release 18.0.142 -->
+## [v18.0.142](https://github.com/chef/chef/tree/v18.0.142) (2022-08-30)
 
 #### Merged Pull Requests
-- Add newline to end of sysctl files [#13118](https://github.com/chef/chef/pull/13118) ([tmccombs](https://github.com/tmccombs))
+- Add empty pipeline for macos universal package [#13152](https://github.com/chef/chef/pull/13152) ([vkarve-chef](https://github.com/vkarve-chef))
 <!-- latest_release -->
 
 <!-- release_rollup since=17.9.26 -->
 ### Changes not yet released to stable
 
 #### Merged Pull Requests
+- Add empty pipeline for macos universal package [#13152](https://github.com/chef/chef/pull/13152) ([vkarve-chef](https://github.com/vkarve-chef)) <!-- 18.0.142 -->
 - Add newline to end of sysctl files [#13118](https://github.com/chef/chef/pull/13118) ([tmccombs](https://github.com/tmccombs)) <!-- 18.0.141 -->
 - fix chef_client_scheduled_task splay to accept 0 [#13095](https://github.com/chef/chef/pull/13095) ([Stromweld](https://github.com/Stromweld)) <!-- 18.0.140 -->
 - add url for principal names [#13104](https://github.com/chef/chef/pull/13104) ([Stromweld](https://github.com/Stromweld)) <!-- 18.0.139 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 90146aae67..67344cca33 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -38,13 +38,47 @@ GIT
 PATH
   remote: .
   specs:
-    chef (18.0.141)
+    chef (18.0.142)
       addressable
       aws-sdk-s3 (~> 1.91)
       aws-sdk-secretsmanager (~> 1.46)
-      chef-config (= 18.0.141)
+      chef-config (= 18.0.142)
+      chef-utils (= 18.0.142)
+      chef-vault
+      chef-zero (>= 14.0.11)
+      corefoundation (~> 0.3.4)
+      diff-lcs (>= 1.2.4, < 1.6.0, != 1.4.0)
+      erubis (~> 2.7)
+      ffi (>= 1.5.0)
+      ffi-libarchive (~> 1.0, >= 1.0.3)
+      ffi-yajl (~> 2.2)
+      iniparse (~> 1.4)
+      inspec-core (~> 4.23)
+      license-acceptance (>= 1.0.5, < 3)
+      mixlib-archive (>= 0.4, < 2.0)
+      mixlib-authentication (>= 2.1, < 4)
+      mixlib-cli (>= 2.1.1, < 3.0)
+      mixlib-log (>= 2.0.3, < 4.0)
+      mixlib-shellout (>= 3.1.1, < 4.0)
+      net-ftp
+      net-sftp (>= 2.1.2, < 4.0)
+      ohai (~> 18.0)
+      plist (~> 3.2)
+      proxifier (~> 1.0)
+      syslog-logger (~> 1.6)
+      train-core (~> 3.2, >= 3.2.28)
+      train-rest (>= 0.4.1)
+      train-winrm (>= 0.2.5)
+      unf_ext (< 0.0.8.1)
+      uuidtools (>= 2.1.5, < 3.0)
+      vault (~> 0.16)
+    chef (18.0.142-universal-mingw32)
+      addressable
+      aws-sdk-s3 (~> 1.91)
+      aws-sdk-secretsmanager (~> 1.46)
+      chef-config (= 18.0.142)
       chef-powershell (~> 1.0.12)
-      chef-utils (= 18.0.141)
+      chef-utils (= 18.0.142)
       chef-vault
       chef-zero (>= 14.0.11)
       corefoundation (~> 0.3.4)
@@ -88,15 +122,15 @@ PATH
 PATH
   remote: chef-bin
   specs:
-    chef-bin (18.0.141)
-      chef (= 18.0.141)
+    chef-bin (18.0.142)
+      chef (= 18.0.142)
 
 PATH
   remote: chef-config
   specs:
-    chef-config (18.0.141)
+    chef-config (18.0.142)
       addressable
-      chef-utils (= 18.0.141)
+      chef-utils (= 18.0.142)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
@@ -105,7 +139,7 @@ PATH
 PATH
   remote: chef-utils
   specs:
-    chef-utils (18.0.141)
+    chef-utils (18.0.142)
       concurrent-ruby
 
 GEM
@@ -118,8 +152,8 @@ GEM
       mixlib-shellout (>= 2.0, < 4.0)
     ast (2.4.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.619.0)
-    aws-sdk-core (3.132.0)
+    aws-partitions (1.623.0)
+    aws-sdk-core (3.136.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
@@ -131,7 +165,7 @@ GEM
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sdk-secretsmanager (1.64.0)
+    aws-sdk-secretsmanager (1.65.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.5.1)
diff --git a/VERSION b/VERSION
index 5865806b91..e756675b00 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.0.141
\ No newline at end of file
+18.0.142
\ 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 4832995802..5f1a2e3211 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 = "18.0.141".freeze
+  VERSION = "18.0.142".freeze
 end
 
 #
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 3eb6379bd5..7799607e56 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 = "18.0.141".freeze
+  VERSION = "18.0.142".freeze
 end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 92f9234bbf..8c867bd068 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 = "18.0.141"
+  VERSION = "18.0.142"
 end
diff --git a/knife/lib/chef/knife/version.rb b/knife/lib/chef/knife/version.rb
index 41828ba094..3b53b1177e 100644
--- a/knife/lib/chef/knife/version.rb
+++ b/knife/lib/chef/knife/version.rb
@@ -17,7 +17,7 @@
 class Chef
   class Knife
     KNIFE_ROOT = File.expand_path("../..", __dir__)
-    VERSION = "18.0.141".freeze
+    VERSION = "18.0.142".freeze
   end
 end
 
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 8bae4c3fa8..a95964f938 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("18.0.141")
+  VERSION = Chef::VersionString.new("18.0.142")
 end
 
 #