diff --git a/config/templates/omnibus-gitlab-gems/Gemfile b/config/templates/omnibus-gitlab-gems/Gemfile index 693b758d4eb91b0fc29172a06b86469de68b4477_Y29uZmlnL3RlbXBsYXRlcy9vbW5pYnVzLWdpdGxhYi1nZW1zL0dlbWZpbGU=..27879ddd58c4a167400196d148c34fe6515329b8_Y29uZmlnL3RlbXBsYXRlcy9vbW5pYnVzLWdpdGxhYi1nZW1zL0dlbWZpbGU= 100644 --- a/config/templates/omnibus-gitlab-gems/Gemfile +++ b/config/templates/omnibus-gitlab-gems/Gemfile @@ -20,10 +20,10 @@ # testing stays consistent with the package contents. source 'https://packagecloud.io/cinc-project/stable' do gem 'chef', '18.3.0' - gem 'chef-cli', '5.6.1' + gem 'chef-cli', '5.6.14' gem 'chef-bin', '18.3.0' gem 'chef-config', '18.3.0' gem 'chef-zero', '15.0.11' gem 'inspec-core', '6.6.0' end @@ -24,10 +24,10 @@ gem 'chef-bin', '18.3.0' gem 'chef-config', '18.3.0' gem 'chef-zero', '15.0.11' gem 'inspec-core', '6.6.0' end -gem 'ohai', '18.1.3' +gem 'ohai', '18.1.18' # TODO: Include omnibus-ctl in the Gemfile # Currently omnibus-ctl is installed via config/software since we build # a custom version from the Git source for licensing reasons and for Ruby 3.2 fixes. diff --git a/config/templates/omnibus-gitlab-gems/Gemfile.lock b/config/templates/omnibus-gitlab-gems/Gemfile.lock index 693b758d4eb91b0fc29172a06b86469de68b4477_Y29uZmlnL3RlbXBsYXRlcy9vbW5pYnVzLWdpdGxhYi1nZW1zL0dlbWZpbGUubG9jaw==..27879ddd58c4a167400196d148c34fe6515329b8_Y29uZmlnL3RlbXBsYXRlcy9vbW5pYnVzLWdpdGxhYi1nZW1zL0dlbWZpbGUubG9jaw== 100644 --- a/config/templates/omnibus-gitlab-gems/Gemfile.lock +++ b/config/templates/omnibus-gitlab-gems/Gemfile.lock @@ -37,7 +37,7 @@ vault (~> 0.16) chef-bin (18.3.0) chef (= 18.3.0) - chef-cli (5.6.1) + chef-cli (5.6.14) addressable (>= 2.3.5, < 2.9) chef (>= 16.0) cookbook-omnifetch (~> 0.5) @@ -96,8 +96,8 @@ acme-client (2.0.18) faraday (>= 1.0, < 3.0.0) faraday-retry (>= 1.0, < 3.0.0) - activesupport (7.0.8) + activesupport (7.0.8.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) @@ -100,9 +100,9 @@ concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) ast (2.4.2) aws-eventstream (1.3.0) aws-partitions (1.883.0) @@ -179,6 +179,6 @@ rexml (~> 3.0) hashie (4.1.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.7) domain_name (~> 0.5) httpclient (2.8.3) @@ -183,7 +183,7 @@ domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.14.1) + i18n (1.14.5) concurrent-ruby (~> 1.0) iniparse (1.5.0) ipaddress (0.8.3) jmespath (1.6.2) @@ -186,8 +186,8 @@ concurrent-ruby (~> 1.0) iniparse (1.5.0) 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) @@ -208,7 +208,7 @@ method_source (1.0.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0507) + mime-types-data (3.2024.0806) minitar (0.9) minitest (5.21.2) mixlib-archive (1.1.7) @@ -218,8 +218,8 @@ mixlib-config (3.0.27) tomlrb mixlib-log (3.0.9) - mixlib-shellout (3.2.7) + mixlib-shellout (3.2.8) chef-utils molinillo (0.8.0) multi_json (1.15.0) multipart-post (2.4.1) @@ -222,8 +222,8 @@ chef-utils molinillo (0.8.0) multi_json (1.15.0) multipart-post (2.4.1) - net-ftp (0.3.4) + net-ftp (0.3.7) net-protocol time net-protocol (0.2.2) @@ -234,5 +234,5 @@ net-ssh (>= 5.0.0, < 8.0.0) net-ssh (7.2.3) netrc (0.11.0) - nori (2.7.0) + nori (2.7.1) bigdecimal @@ -238,5 +238,5 @@ bigdecimal - ohai (18.1.3) + ohai (18.1.18) chef-config (>= 14.12, < 19) chef-utils (>= 16.0, < 19) ffi (~> 1.9) @@ -263,7 +263,7 @@ method_source (~> 1.0) public_suffix (5.0.5) racc (1.7.3) - rack (2.2.8) + rack (2.2.9) rainbow (3.1.1) remote_syslog (1.6.15) em-resolv-replace @@ -277,8 +277,9 @@ http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.6) + rexml (3.2.9) + strscan rspec (3.12.0) rspec-core (~> 3.12.0) rspec-expectations (~> 3.12.0) rspec-mocks (~> 3.12.0) @@ -281,6 +282,6 @@ rspec (3.12.0) rspec-core (~> 3.12.0) rspec-expectations (~> 3.12.0) rspec-mocks (~> 3.12.0) - rspec-core (3.12.2) + rspec-core (3.12.3) rspec-support (~> 3.12.0) @@ -286,7 +287,7 @@ rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) + rspec-expectations (3.12.4) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) rspec-its (1.3.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) @@ -288,12 +289,12 @@ diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) rspec-its (1.3.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.12.6) + rspec-mocks (3.12.7) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) rspec-support (3.12.2) rubocop-ast (1.21.0) parser (>= 3.1.1.0) ruby2_keywords (0.0.5) @@ -294,10 +295,11 @@ diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) rspec-support (3.12.2) rubocop-ast (1.21.0) parser (>= 3.1.1.0) ruby2_keywords (0.0.5) - rubyntlm (0.6.3) + rubyntlm (0.6.5) + base64 rubyzip (2.3.2) semverse (3.0.2) servolux (0.10.0) @@ -310,6 +312,7 @@ unicode-display_width (>= 1.5, < 3.0) unicode_utils (~> 1.4) strings-ansi (0.2.0) + strscan (3.1.0) sync (0.5.0) syslog-logger (1.6.8) syslog_protocol (0.9.2) @@ -321,7 +324,7 @@ sync tomlib (0.6.0) tomlrb (1.3.0) - train-core (3.12.3) + train-core (3.12.6) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) @@ -365,10 +368,10 @@ vault (0.18.2) aws-sigv4 webrick (1.8.1) - winrm (2.3.6) + winrm (2.3.9) builder (>= 2.1.2) erubi (~> 1.8) gssapi (~> 1.2) gyoku (~> 1.0) httpclient (~> 2.2, >= 2.2.0.2) logging (>= 1.6.1, < 3.0) @@ -369,10 +372,11 @@ builder (>= 2.1.2) erubi (~> 1.8) gssapi (~> 1.2) gyoku (~> 1.0) httpclient (~> 2.2, >= 2.2.0.2) logging (>= 1.6.1, < 3.0) - nori (~> 2.0) + nori (~> 2.0, >= 2.7.1) + rexml (~> 3.0) rubyntlm (~> 0.6.0, >= 0.6.3) winrm-elevated (1.2.3) erubi (~> 1.8) @@ -396,7 +400,7 @@ acme-client (= 2.0.18) chef (= 18.3.0)! chef-bin (= 18.3.0)! - chef-cli (= 5.6.1)! + chef-cli (= 5.6.14)! chef-config (= 18.3.0)! chef-zero (= 15.0.11)! faraday (= 2.8.1) @@ -406,7 +410,7 @@ inspec-core (= 6.6.0)! license_finder (= 7.1.0) mixlib-log (= 3.0.9) - ohai (= 18.1.3) + ohai (= 18.1.18) rainbow (= 3.1.1) remote_syslog (= 1.6.15) rubocop-ast (= 1.21.0) @@ -414,4 +418,4 @@ unf_ext (= 0.0.9.1) BUNDLED WITH - 2.5.5 + 2.5.11