Merge branch 'main' into dependabot/bundler/omnibus/rack-2.2.9

chef · May 16, 2024 · 7df76de · 7df76de
2 parents e96d2b9 + 4824fc2
commit 7df76de
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,16 +1,22 @@
 # Chef Server Changelog
 <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.9.31 -->
-## [15.9.31](https://github.com/chef/chef-server/tree/15.9.31) (2024-04-04)
+<!-- latest_release 15.9.37 -->
+## [15.9.37](https://github.com/chef/chef-server/tree/15.9.37) (2024-05-15)
 
 #### Merged Pull Requests
-- Bump omnibus-software from `40ca2a9` to `4ea194c` in /omnibus [#3794](https://github.com/chef/chef-server/pull/3794) ([dependabot[bot]](https://github.com/dependabot[bot]))
+- Bump rake from 13.2.0 to 13.2.1 in /oc-chef-pedant [#3805](https://github.com/chef/chef-server/pull/3805) ([dependabot[bot]](https://github.com/dependabot[bot]))
 <!-- latest_release -->
 
 <!-- release_rollup since=15.9.27 -->
 ### Changes since 15.9.27 release
 
 #### Merged Pull Requests
+- Bump rake from 13.2.0 to 13.2.1 in /oc-chef-pedant [#3805](https://github.com/chef/chef-server/pull/3805) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 15.9.37 -->
+- unpin openresty and update plan.sh [#3781](https://github.com/chef/chef-server/pull/3781) ([poorndm](https://github.com/poorndm)) <!-- 15.9.36 -->
+- Bump omnibus-software from `4ea194c` to `e4e5868` in /omnibus [#3809](https://github.com/chef/chef-server/pull/3809) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 15.9.35 -->
+- Bump mixlib-install from 3.12.28 to 3.12.30 in /src/chef-server-ctl [#3798](https://github.com/chef/chef-server/pull/3798) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 15.9.34 -->
+- Bump rake from 13.1.0 to 13.2.0 in /oc-chef-pedant [#3797](https://github.com/chef/chef-server/pull/3797) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 15.9.33 -->
+- Bump rake from 13.1.0 to 13.2.0 in /src/chef-server-ctl [#3800](https://github.com/chef/chef-server/pull/3800) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 15.9.32 -->
 - Bump omnibus-software from `40ca2a9` to `4ea194c` in /omnibus [#3794](https://github.com/chef/chef-server/pull/3794) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 15.9.31 -->
 - Bump activesupport from 7.0.8 to 7.1.3.2 in /oc-chef-pedant [#3783](https://github.com/chef/chef-server/pull/3783) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 15.9.30 -->
 - Bump omnibus-software from `b48e542` to `40ca2a9` in /omnibus [#3779](https://github.com/chef/chef-server/pull/3779) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 15.9.29 -->

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-15.9.31
+15.9.37
diff --git a/oc-chef-pedant/Gemfile.lock b/oc-chef-pedant/Gemfile.lock
@@ -244,7 +244,7 @@ GEM
       pry (~> 0.13)
     public_suffix (5.0.0)
     rack (2.2.3.1)
-    rake (13.1.0)
+    rake (13.2.1)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)

diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/chef/omnibus-software.git
-  revision: 4ea194c46d42899f95db963f38abb9347a3d4731
+  revision: e4e5868d0c7cfcc2d66f5cc2e43c6eeb0f495f22
   branch: main
   specs:
-    omnibus-software (24.3.315)
+    omnibus-software (24.4.319)
       omnibus (>= 9.0.0)
 
 GIT
@@ -34,13 +34,13 @@ GEM
     artifactory (3.0.15)
     awesome_print (1.9.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.906.0)
-    aws-sdk-core (3.191.6)
+    aws-partitions (1.918.0)
+    aws-sdk-core (3.192.1)
       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.78.0)
+    aws-sdk-kms (1.79.0)
       aws-sdk-core (~> 3, >= 3.191.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-s3 (1.116.0)
@@ -185,7 +185,7 @@ GEM
     iostruct (0.0.5)
     ipaddress (0.8.3)
     jmespath (1.6.2)
-    json (2.7.1)
+    json (2.7.2)
     libyajl2 (2.1.0)
     license-acceptance (2.1.13)
       pastel (~> 0.7)
@@ -247,7 +247,7 @@ GEM
     parslet (1.8.2)
     pastel (0.8.0)
       tty-color (~> 0.5)
-    pedump (0.6.7)
+    pedump (0.6.9)
       awesome_print
       iostruct (>= 0.0.4)
       multipart-post (>= 2.0.0)
@@ -316,7 +316,7 @@ GEM
     toml-rb (2.2.0)
       citrus (~> 3.0, > 3.0)
     tomlrb (1.3.0)
-    train-core (3.12.0)
+    train-core (3.12.3)
       addressable (~> 2.5)
       ffi (!= 1.13.0)
       json (>= 1.8, < 3.0)
@@ -371,7 +371,7 @@ GEM
       winrm (~> 2.0)
     wisper (2.0.1)
     wmi-lite (1.0.7)
-    zhexdump (0.0.2)
+    zhexdump (0.1.0)
 
 PLATFORMS
   ruby

diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
@@ -15,4 +15,4 @@
 override :logrotate, version: "3.19.0"
 
 # update `src/openresty-noroot/habitat/plan.sh` when updating this version.
-override :openresty, version: "1.21.4.1rc1"
+override :openresty, version: "1.25.3.1"
diff --git a/src/chef-server-ctl/Gemfile.lock b/src/chef-server-ctl/Gemfile.lock
@@ -133,7 +133,7 @@ GEM
       rubocop (= 1.25.1)
     cleanroom (1.0.0)
     coderay (1.1.3)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     corefoundation (0.3.13)
       ffi (>= 1.15.0)
     diff-lcs (1.5.0)
@@ -240,7 +240,7 @@ GEM
     mixlib-cli (2.1.8)
     mixlib-config (3.0.27)
       tomlrb
-    mixlib-install (3.12.28)
+    mixlib-install (3.12.30)
       mixlib-shellout
       mixlib-versioning
       thor
@@ -299,7 +299,7 @@ GEM
     racc (1.7.3)
     rack (2.2.6.4)
     rainbow (3.1.1)
-    rake (13.1.0)
+    rake (13.2.0)
     redis (4.7.1)
     regexp_parser (2.8.2)
     rest-client (2.1.0)
@@ -355,7 +355,7 @@ GEM
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)
     syslog-logger (1.6.8)
-    thor (1.2.2)
+    thor (1.3.1)
     toml (0.3.0)
       parslet (>= 1.8.0, < 3.0.0)
     tomlrb (1.3.0)

diff --git a/src/openresty-noroot/habitat/plan.sh b/src/openresty-noroot/habitat/plan.sh
@@ -1,14 +1,14 @@
 pkg_name=openresty-noroot
 pkg_origin=chef
-pkg_version=1.21.4.1rc1
+pkg_version=1.25.3.1
 pkg_description="Scalable Web Platform by Extending NGINX with Lua"
 pkg_maintainer="The Chef Server Maintainers <[email protected]>"
 pkg_license=('BSD-2-Clause')
 pkg_source=https://openresty.org/download/openresty-${pkg_version}.tar.gz
 pkg_dirname=openresty-${pkg_version}
 pkg_filename=openresty-${pkg_version}.tar.gz
 pkg_upstream_url=http://openresty.org/
-pkg_shasum=1cb216bc57a253149cb5c4b815bfe00e1c0713e7355774bbc26cf306d2ff632f
+pkg_shasum=32ec1a253a5a13250355a075fe65b7d63ec45c560bbe213350f0992a57cd79df
 pkg_deps=(
   core/bzip2
   core/coreutils