From 84ee77e51f7583a0d75e664f58c3c8705bcd59ad Mon Sep 17 00:00:00 2001 From: Neha Pansare Date: Thu, 2 Feb 2023 18:00:03 +0530 Subject: Update bundle using 'rake dependencies:update' as we need to pull in latest version of license_scout to fix omnibus builds Signed-off-by: Neha Pansare --- Gemfile.lock | 79 +++++++++++++----------- omnibus/Gemfile.lock | 165 +++++++++++++++++++++++++++++++-------------------- 2 files changed, 144 insertions(+), 100 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 13ba0da57e..e25580ee26 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/chef/ohai.git - revision: 4df568953f07d5b9936be8931a946334df7d37be + revision: 2aa632521141c81fabecb32b82842e6089e317bd branch: 16-stable specs: - ohai (16.17.0) + ohai (16.17.2) chef-config (>= 14.12, < 17) chef-utils (>= 16.0, < 17) ffi (~> 1.9) @@ -154,8 +154,6 @@ GEM mixlib-shellout (>= 2.0, < 4.0) ast (2.4.2) bcrypt_pbkdf (1.1.0) - bcrypt_pbkdf (1.1.0-x64-mingw32) - bcrypt_pbkdf (1.1.0-x86-mingw32) builder (3.2.4) chef-powershell (1.0.13) ffi (~> 1.15) @@ -177,7 +175,7 @@ GEM chefstyle (1.5.9) rubocop (= 1.7.0) coderay (1.1.3) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.0) crack (0.4.5) rexml diff-lcs (1.3) @@ -186,11 +184,21 @@ GEM ed25519 (1.3.0) erubi (1.12.0) erubis (2.7.0) - faraday (1.3.1) + 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) 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) fauxhai-ng (9.3.0) net-ssh ffi (1.15.5) @@ -210,25 +218,26 @@ GEM rexml (~> 3.0) hashdiff (1.0.1) hashie (4.1.0) - highline (2.0.3) + highline (2.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.24.32) + inspec-core (4.56.20) addressable (~> 2.4) - chef-telemetry (~> 1.0) - faraday (>= 0.9.0, < 1.4) + chef-telemetry (~> 1.0, >= 1.0.8) + faraday (>= 0.9.0, < 1.5) + faraday_middleware (~> 1.0) hashie (>= 3.4, < 5.0) license-acceptance (>= 0.2.13, < 3.0) method_source (>= 0.8, < 2.0) mixlib-log (~> 3.0) multipart-post (~> 2.0) parallel (~> 1.9) - parslet (>= 1.5, < 3.0) + parslet (>= 1.5, < 2.0) pry (~> 0.13) - rspec (~> 3.10) + rspec (>= 3.9, <= 3.11) rspec-its (~> 1.2) rubyzip (>= 1.2.2, < 3.0) semverse (~> 3.0) @@ -238,8 +247,8 @@ GEM train-core (~> 3.0) tty-prompt (~> 0.17) tty-table (~> 0.10) - inspec-core-bin (4.24.32) - inspec-core (= 4.24.32) + inspec-core-bin (4.56.20) + inspec-core (= 4.56.20) ipaddress (0.8.3) iso8601 (0.13.0) json (2.6.3) @@ -274,7 +283,7 @@ GEM win32-process (~> 0.9) wmi-lite (~> 1.0) multi_json (1.15.0) - multipart-post (2.2.3) + multipart-post (2.3.0) net-scp (2.0.0) net-ssh (>= 2.6.5, < 6.0.0) net-sftp (3.0.0) @@ -288,39 +297,39 @@ GEM netrc (0.11.0) nori (2.6.0) parallel (1.22.1) - parser (3.1.3.0) + parser (3.2.0.0) ast (~> 2.4.1) - parslet (2.0.0) + parslet (1.8.2) pastel (0.8.0) tty-color (~> 0.5) plist (3.6.0) proxifier (1.0.3) - pry (0.14.1) + pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) public_suffix (5.0.1) - rack (2.2.5) + rack (2.2.6.2) rainbow (3.1.1) rake (13.0.6) rb-readline (0.5.5) - regexp_parser (2.6.1) + regexp_parser (2.6.2) rexml (3.2.5) - rspec (3.12.0) - rspec-core (~> 3.12.0) - rspec-expectations (~> 3.12.0) - rspec-mocks (~> 3.12.0) - rspec-core (3.12.0) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.1) + rspec (3.11.0) + rspec-core (~> 3.11.0) + rspec-expectations (~> 3.11.0) + rspec-mocks (~> 3.11.0) + rspec-core (3.11.0) + rspec-support (~> 3.11.0) + rspec-expectations (3.11.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) + rspec-support (~> 3.11.0) rspec-its (1.3.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.12.1) + rspec-mocks (3.11.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-support (3.12.0) + rspec-support (~> 3.11.0) + rspec-support (3.11.1) rubocop (1.7.0) parallel (~> 1.10) parser (>= 2.7.1.5) @@ -330,7 +339,7 @@ GEM rubocop-ast (>= 1.2.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (1.24.0) + rubocop-ast (1.24.1) parser (>= 3.1.1.0) ruby-prof (1.2.0) ruby-progressbar (1.11.0) @@ -379,8 +388,6 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.8.2) - unf_ext (0.0.8.2-x64-mingw32) - unf_ext (0.0.8.2-x86-mingw32) unicode-display_width (1.8.0) unicode_utils (1.4.0) uuidtools (2.2.0) @@ -388,7 +395,7 @@ GEM addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - webrick (1.7.0) + webrick (1.8.1) win32-api (1.5.3-universal-mingw32) win32-certstore (0.5.3) ffi @@ -463,4 +470,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.1.4 + 2.3.18 diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index d31eef4343..e58c40e394 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,17 +1,17 @@ GIT remote: https://github.com/chef/omnibus-software.git - revision: ab0afc4a658b63708f166f96576f3015376a0810 + revision: db8acc3fa5baaee33eeefc0ae47c11d9cf0be2b5 branch: main specs: - omnibus-software (23.1.274) + omnibus-software (23.1.280) omnibus (>= 9.0.0) GIT remote: https://github.com/chef/omnibus.git - revision: 52b6d2e08bc2c90592b99da41a1728fb1629f673 + revision: c66e97c211a60296e58da100d79d048974e13904 branch: main specs: - omnibus (9.0.12) + omnibus (9.0.14) aws-sdk-s3 (~> 1.116.0) chef-cleanroom (~> 1.0) chef-utils (>= 15.4) @@ -34,8 +34,8 @@ GEM artifactory (3.0.15) awesome_print (1.9.2) aws-eventstream (1.2.0) - aws-partitions (1.695.0) - aws-sdk-core (3.169.0) + aws-partitions (1.703.0) + aws-sdk-core (3.170.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) @@ -47,14 +47,12 @@ GEM aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) - aws-sdk-secretsmanager (1.67.0) + aws-sdk-secretsmanager (1.72.0) aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) aws-sigv4 (1.5.2) aws-eventstream (~> 1, >= 1.0.2) bcrypt_pbkdf (1.1.0) - bcrypt_pbkdf (1.1.0-x64-mingw32) - bcrypt_pbkdf (1.1.0-x86-mingw32) berkshelf (8.0.5) chef (>= 15.7.32) chef-config @@ -69,54 +67,57 @@ GEM solve (~> 4.0) thor (>= 0.20) builder (3.2.4) - chef (17.10.0) + chef (18.1.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.1.0) + chef-utils (= 18.1.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) 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 (17.10.0-universal-mingw32) + chef (18.1.0-x64-mingw-ucrt) addressable aws-sdk-s3 (~> 1.91) aws-sdk-secretsmanager (~> 1.46) - chef-config (= 17.10.0) + chef-config (= 18.1.0) chef-powershell (~> 1.0.12) - chef-utils (= 17.10.0) + chef-utils (= 18.1.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) iso8601 (>= 0.12.1, < 0.14) license-acceptance (>= 1.0.5, < 3) mixlib-archive (>= 0.4, < 2.0) @@ -124,17 +125,20 @@ GEM 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) 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) - win32-api (~> 1.5.3) - win32-certstore (~> 0.6.2) + win32-api (~> 1.10.0) + win32-certstore (~> 0.6.15) win32-event (~> 0.6.1) win32-eventlog (= 0.6.3) win32-mmap (~> 0.4.1) @@ -144,9 +148,9 @@ GEM win32-taskscheduler (~> 2.0) wmi-lite (~> 1.0) chef-cleanroom (1.0.5) - chef-config (17.10.0) + chef-config (18.1.0) addressable - chef-utils (= 17.10.0) + chef-utils (= 18.1.0) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -157,7 +161,7 @@ GEM chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) - chef-utils (17.10.0) + chef-utils (18.1.0) concurrent-ruby chef-vault (4.1.10) chef-zero (15.0.11) @@ -170,29 +174,23 @@ GEM citrus (3.0.2) cleanroom (1.0.0) coderay (1.1.3) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.0) 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.11.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.4) + 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 (1.15.5-x64-mingw-ucrt) ffi (1.15.5-x64-mingw32) @@ -210,13 +208,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.21.29) 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) @@ -232,7 +233,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.4) @@ -240,7 +241,7 @@ GEM iso8601 (0.13.0) jmespath (1.6.2) json (2.6.3) - kitchen-vagrant (1.12.1) + kitchen-vagrant (1.13.0) test-kitchen (>= 1.4, < 4) libyajl2 (2.1.0) license-acceptance (2.1.13) @@ -248,7 +249,7 @@ GEM tomlrb (>= 1.2, < 3.0) tty-box (~> 0.6) tty-prompt (~> 0.20) - license_scout (1.3.3) + license_scout (1.3.4) ffi-yajl (~> 2.2) mixlib-shellout (>= 2.2, < 4.0) toml-rb (>= 1, < 3) @@ -257,6 +258,9 @@ GEM little-plugger (~> 1.1) multi_json (~> 1.14) method_source (1.0.0) + mime-types (3.4.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2022.0105) minitar (0.9) mixlib-archive (1.1.7) mixlib-log @@ -266,7 +270,7 @@ GEM mixlib-cli (2.1.8) mixlib-config (3.0.27) tomlrb - mixlib-install (3.12.20) + mixlib-install (3.12.27) mixlib-shellout mixlib-versioning thor @@ -286,21 +290,27 @@ GEM mixlib-versioning (1.2.12) molinillo (0.8.0) multi_json (1.15.0) - multipart-post (2.2.3) + 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 (4.0.0.rc1) + net-sftp (4.0.0) net-ssh (>= 5.0.0, < 8.0.0) net-ssh (7.0.1) 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.0) - chef-config (>= 14.12, < 18) - chef-utils (>= 16.0, < 18) + ohai (18.0.26) + chef-config (>= 14.12, < 19) + chef-utils (>= 16.0, < 19) ffi (~> 1.9) ffi-yajl (~> 2.2) ipaddress @@ -323,12 +333,29 @@ GEM zhexdump (>= 0.0.2) plist (3.6.0) proxifier (1.0.3) - pry (0.14.1) + pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) public_suffix (5.0.1) - rack (2.2.4) + rack (2.2.6.2) rainbow (3.1.1) + 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) + rest-client (2.1.0-x64-mingw32) + ffi (~> 1.9) + http-accept (>= 1.7.0, < 2.0) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 4.0) + netrc (~> 0.8) + rest-client (2.1.0-x86-mingw32) + ffi (~> 1.9) + 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) rspec (3.11.0) @@ -366,7 +393,7 @@ GEM strings-ansi (0.2.0) structured_warnings (0.4.0) syslog-logger (1.6.8) - test-kitchen (3.4.0) + test-kitchen (3.5.0) bcrypt_pbkdf (~> 1.0) chef-utils (>= 16.4.35) ed25519 (~> 1.2) @@ -381,6 +408,9 @@ GEM winrm-elevated (~> 1.0) winrm-fs (~> 1.1) thor (1.2.1) + time (0.2.1) + date + timeout (0.3.1) toml-rb (2.2.0) citrus (~> 3.0, > 3.0) tomlrb (1.3.0) @@ -391,6 +421,10 @@ GEM 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) @@ -413,13 +447,16 @@ GEM pastel (~> 0.8) strings (~> 0.2.0) tty-screen (~> 0.8) - unicode-display_width (2.3.0) + 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) aws-sigv4 - webrick (1.7.0) - win32-api (1.5.3-universal-mingw32) + webrick (1.8.1) + win32-api (1.10.1) win32-certstore (0.6.15) chef-powershell (>= 1.0.12) ffi -- cgit v1.2.1