From 91f81d4dd558e43c563f2d5d0528e2a43f076084 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Jan 2024 14:29:06 +0000 Subject: [PATCH 1/3] Bump omnibus-software from `d357d5c` to `86649fa` in /omnibus Bumps [omnibus-software](https://github.com/chef/omnibus-software) from `d357d5c` to `86649fa`. - [Commits](https://github.com/chef/omnibus-software/compare/d357d5cf84dce2b99b28093c4a5c32f2f96b4787...86649fa63c1c1ef83371404d5dd08b095ef9cbd8) --- updated-dependencies: - dependency-name: omnibus-software dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- omnibus/Gemfile.lock | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 668234f24..4280f1659 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/chef/omnibus-software.git - revision: d357d5cf84dce2b99b28093c4a5c32f2f96b4787 + revision: 86649fa63c1c1ef83371404d5dd08b095ef9cbd8 branch: main specs: - omnibus-software (23.11.307) + omnibus-software (24.1.309) omnibus (>= 9.0.0) GIT @@ -29,18 +29,18 @@ GIT GEM remote: https://rubygems.org/ specs: - addressable (2.8.5) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) artifactory (3.0.15) awesome_print (1.9.2) aws-eventstream (1.3.0) - aws-partitions (1.860.0) - aws-sdk-core (3.189.0) + aws-partitions (1.882.0) + aws-sdk-core (3.190.3) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.74.0) + aws-sdk-kms (1.76.0) aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) aws-sdk-s3 (1.116.0) @@ -175,7 +175,7 @@ GEM citrus (3.0.2) cleanroom (1.0.0) coderay (1.1.3) - concurrent-ruby (1.2.2) + concurrent-ruby (1.2.3) contracts (0.16.1) corefoundation (0.3.13) ffi (>= 1.15.0) @@ -193,14 +193,11 @@ GEM faraday (>= 1, < 3) faraday-net_http (3.0.2) ffi (1.16.3) - ffi (1.16.3-x64-mingw-ucrt) - ffi (1.16.3-x64-mingw32) - ffi (1.16.3-x86-mingw32) ffi-libarchive (1.1.13) ffi (~> 1.0) ffi-win32-extensions (1.0.4) ffi - ffi-yajl (2.4.0) + ffi-yajl (2.6.0) libyajl2 (>= 1.2) fuzzyurl (0.9.0) gssapi (1.3.1) @@ -241,7 +238,7 @@ GEM ipaddress (0.8.3) iso8601 (0.13.0) jmespath (1.6.2) - json (2.6.3) + json (2.7.1) kitchen-vagrant (1.14.2) test-kitchen (>= 1.4, < 4) libyajl2 (2.1.0) @@ -301,7 +298,7 @@ GEM net-ssh (>= 2.6.5, < 8.0.0) net-sftp (4.0.0) net-ssh (>= 5.0.0, < 8.0.0) - net-ssh (7.2.0) + net-ssh (7.2.1) net-ssh-gateway (2.0.0) net-ssh (>= 4.0.0) netrc (0.11.0) @@ -332,7 +329,7 @@ GEM multipart-post (>= 2.0.0) rainbow zhexdump (>= 0.0.2) - plist (3.7.0) + plist (3.7.1) proxifier2 (1.1.0) pry (0.14.2) coderay (~> 1.1) From 856bc6eb6fd116972470c73074e2f9ec8e98a71a Mon Sep 17 00:00:00 2001 From: Ashique Saidalavi Date: Mon, 22 Jan 2024 15:57:03 +0530 Subject: [PATCH 2/3] Reverted the ffi-yajl version to 2.4.0 Signed-off-by: Ashique Saidalavi --- omnibus/Gemfile.lock | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 4280f1659..b0da54af5 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -193,11 +193,14 @@ GEM faraday (>= 1, < 3) faraday-net_http (3.0.2) ffi (1.16.3) + ffi (1.16.3-x64-mingw-ucrt) + ffi (1.16.3-x64-mingw32) + ffi (1.16.3-x86-mingw32) ffi-libarchive (1.1.13) ffi (~> 1.0) ffi-win32-extensions (1.0.4) ffi - ffi-yajl (2.6.0) + ffi-yajl (2.4.0) libyajl2 (>= 1.2) fuzzyurl (0.9.0) gssapi (1.3.1) From 409190f19685570832b5154438688053828fc81a Mon Sep 17 00:00:00 2001 From: Chef Expeditor Date: Mon, 22 Jan 2024 10:47:18 +0000 Subject: [PATCH 3/3] Executed '.expeditor/determine_version.sh' Obvious fix; these changes are the result of automation not creative thinking. --- CHANGELOG.md | 12 ++++++++++-- VERSION | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61a5e9eb1..962532d05 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,16 @@ - + +## [24.1.1056](https://github.com/chef/chef-workstation/tree/24.1.1056) (2024-01-22) + +#### Merged Pull Requests +- Bump omnibus-software from `d357d5c` to `86649fa` in /omnibus [#3196](https://github.com/chef/chef-workstation/pull/3196) ([dependabot[bot]](https://github.com/dependabot[bot])) - + +### Changes not yet released to stable + +#### Merged Pull Requests +- Bump omnibus-software from `d357d5c` to `86649fa` in /omnibus [#3196](https://github.com/chef/chef-workstation/pull/3196) ([dependabot[bot]](https://github.com/dependabot[bot])) diff --git a/VERSION b/VERSION index 55654b845..facca0db1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -23.12.1055 +24.1.1056