diff --git a/omnibus/Gemfile b/omnibus/Gemfile index 0658ecb0003..108a9c84667 100644 --- a/omnibus/Gemfile +++ b/omnibus/Gemfile @@ -10,6 +10,6 @@ end group :test do gem 'test-kitchen' # for Test Kitchen testing of the omnibus builds gem 'berkshelf' # depsolving the Test Kitchen suite - gem 'chef', '< 18' # Do not pull in chef 18 until the build image is updated with > ruby 3.0 + gem 'chef', '< 19' # Do not pull in chef 18 until the build image is updated with > ruby 3.0 gem 'rake' end diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index af197f72636..26d94d73a07 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -29,29 +29,30 @@ GIT GEM remote: https://rubygems.org/ specs: - addressable (2.8.4) + addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) artifactory (3.0.15) awesome_print (1.9.2) aws-eventstream (1.2.0) - aws-partitions (1.765.0) - aws-sdk-core (3.172.0) + aws-partitions (1.824.0) + aws-sdk-core (3.181.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.64.0) - aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-kms (1.71.0) + aws-sdk-core (~> 3, >= 3.177.0) aws-sigv4 (~> 1.1) aws-sdk-s3 (1.116.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) - aws-sdk-secretsmanager (1.72.0) - aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-secretsmanager (1.82.0) + aws-sdk-core (~> 3, >= 3.177.0) aws-sigv4 (~> 1.1) - aws-sigv4 (1.5.2) + aws-sigv4 (1.6.0) aws-eventstream (~> 1, >= 1.0.2) + base64 (0.1.1) bcrypt_pbkdf (1.1.0) berkshelf (8.0.5) chef (>= 15.7.32) @@ -67,41 +68,44 @@ GEM solve (~> 4.0) thor (>= 0.20) builder (3.2.4) - chef (17.10.0) + chef (18.3.0) addressable aws-sdk-s3 (~> 1.91) aws-sdk-secretsmanager (~> 1.46) - chef-config (= 17.10.0) - chef-utils (= 17.10.0) + chef-config (= 18.3.0) + chef-utils (= 18.3.0) 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 (>= 1.15.5) ffi-libarchive (~> 1.0, >= 1.0.3) ffi-yajl (~> 2.2) iniparse (~> 1.4) - inspec-core (~> 4.23) + inspec-core (>= 5) 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-sftp (>= 2.1.2, < 4.0) - ohai (~> 17.0) + net-ftp + net-sftp (>= 2.1.2, < 5.0) + ohai (~> 18.0) plist (~> 3.2) - proxifier (~> 1.0) + proxifier2 (~> 1.1) syslog-logger (~> 1.6) - train-core (~> 3.2, >= 3.2.28) + train-core (~> 3.10) + train-rest (>= 0.4.1) train-winrm (>= 0.2.5) + unf_ext (>= 0.0.8.2) uuidtools (>= 2.1.5, < 3.0) vault (~> 0.16) chef-cleanroom (1.0.5) - chef-config (17.10.0) + chef-config (18.3.0) addressable - chef-utils (= 17.10.0) + chef-utils (= 18.3.0) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -109,9 +113,9 @@ GEM chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) - chef-utils (17.10.0) + chef-utils (18.3.0) concurrent-ruby - chef-vault (4.1.10) + chef-vault (4.1.11) chef-zero (15.0.11) ffi-yajl (~> 2.2) hashie (>= 2.0, < 5.0) @@ -126,29 +130,24 @@ GEM contracts (0.16.1) corefoundation (0.3.13) ffi (>= 1.15.0) + date (3.3.3) diff-lcs (1.5.0) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) ed25519 (1.3.0) erubi (1.12.0) erubis (2.7.0) - faraday (1.4.3) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.1) - multipart-post (>= 1.2, < 3) + faraday (2.7.11) + base64 + faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday_middleware (1.2.0) - faraday (~> 1.0) + faraday-follow_redirects (0.3.0) + faraday (>= 1, < 3) + faraday-net_http (3.0.2) ffi (1.15.5) ffi-libarchive (1.1.3) ffi (~> 1.0) - ffi-yajl (2.4.0) + ffi-yajl (2.6.0) libyajl2 (>= 1.2) fuzzyurl (0.9.0) gssapi (1.3.1) @@ -157,13 +156,16 @@ GEM builder (>= 2.1.2) rexml (~> 3.0) hashie (4.1.0) + http-accept (1.7.0) + http-cookie (1.0.5) + domain_name (~> 0.5) httpclient (2.8.3) iniparse (1.5.0) - inspec-core (4.56.20) + inspec-core (5.22.3) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) - faraday (>= 0.9.0, < 1.5) - faraday_middleware (~> 1.0) + faraday (>= 1, < 3) + faraday-follow_redirects (~> 0.3) hashie (>= 3.4, < 5.0) license-acceptance (>= 0.2.13, < 3.0) method_source (>= 0.8, < 2.0) @@ -179,7 +181,7 @@ GEM sslshake (~> 1.2) thor (>= 0.20, < 2.0) tomlrb (>= 1.2, < 2.1) - train-core (~> 3.0) + train-core (~> 3.10) tty-prompt (~> 0.17) tty-table (~> 0.10) iostruct (0.0.5) @@ -201,6 +203,9 @@ GEM little-plugger (~> 1.1) multi_json (~> 1.14) method_source (1.0.0) + mime-types (3.5.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2023.0808) minitar (0.9) mixlib-archive (1.1.7) mixlib-log @@ -219,20 +224,26 @@ GEM molinillo (0.8.0) multi_json (1.15.0) multipart-post (2.3.0) + net-ftp (0.2.0) + net-protocol + time + net-protocol (0.2.1) + timeout net-scp (4.0.0) net-ssh (>= 2.6.5, < 8.0.0) - net-sftp (2.1.2) - net-ssh (>= 2.6.5) - net-ssh (7.1.0) + net-sftp (4.0.0) + net-ssh (>= 5.0.0, < 8.0.0) + net-ssh (7.2.0) net-ssh-gateway (2.0.0) net-ssh (>= 4.0.0) + netrc (0.11.0) nori (2.6.0) octokit (4.25.1) faraday (>= 1, < 3) sawyer (~> 0.9) - ohai (17.9.1) - chef-config (>= 14.12, < 18) - chef-utils (>= 16.0, < 18) + ohai (18.1.3) + chef-config (>= 14.12, < 19) + chef-utils (>= 16.0, < 19) ffi (~> 1.9) ffi-yajl (~> 2.2) ipaddress @@ -243,7 +254,7 @@ GEM plist (~> 3.1) train-core wmi-lite (~> 1.0) - parallel (1.22.1) + parallel (1.23.0) parslet (1.8.2) pastel (0.8.0) tty-color (~> 0.5) @@ -254,16 +265,21 @@ GEM rainbow zhexdump (>= 0.0.2) plist (3.7.0) - proxifier (1.0.3) + proxifier2 (1.1.0) pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) - public_suffix (5.0.1) - rack (2.2.6.2) + public_suffix (5.0.3) + rack (2.2.8) rainbow (3.1.1) rake (13.0.6) + rest-client (2.1.0) + http-accept (>= 1.7.0, < 2.0) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 4.0) + netrc (~> 0.8) retryable (3.0.5) - rexml (3.2.5) + rexml (3.2.6) rspec (3.11.0) rspec-core (~> 3.11.0) rspec-expectations (~> 3.11.0) @@ -313,16 +329,23 @@ GEM winrm-elevated (~> 1.0) winrm-fs (~> 1.1) thor (1.2.2) + time (0.2.2) + date + timeout (0.4.0) toml-rb (2.2.0) citrus (~> 3.0, > 3.0) tomlrb (1.3.0) - train-core (3.10.7) + train-core (3.10.8) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) mixlib-shellout (>= 2.0, < 4.0) net-scp (>= 1.2, < 5.0) net-ssh (>= 2.9, < 8.0) + train-rest (0.5.0) + aws-sigv4 (~> 1.5) + rest-client (~> 2.1) + train-core (~> 3.0) train-winrm (0.2.13) winrm (>= 2.3.6, < 3.0) winrm-elevated (~> 1.2.2) @@ -345,10 +368,13 @@ GEM pastel (~> 0.8) strings (~> 0.2.0) tty-screen (~> 0.8) + unf (0.1.4) + unf_ext + unf_ext (0.0.8.2) unicode-display_width (2.4.2) unicode_utils (1.4.0) uuidtools (2.2.0) - vault (0.17.0) + vault (0.18.1) aws-sigv4 webrick (1.8.1) winrm (2.3.6) @@ -379,7 +405,7 @@ PLATFORMS DEPENDENCIES artifactory berkshelf - chef (< 18) + chef (< 19) omnibus! omnibus-software! rake