From 72e3819853041fdb0874ae4c38c28f1c1e95dc29 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Wed, 23 Oct 2024 17:43:00 +0530 Subject: [PATCH] added git-windows 2.47.0 Signed-off-by: nikhil2611 --- components/gems/Gemfile.lock | 418 +++++++++++++++++++++++------------ omnibus/Gemfile.lock | 203 +++++++++++++---- omnibus_overrides.rb | 2 +- 3 files changed, 433 insertions(+), 190 deletions(-) diff --git a/components/gems/Gemfile.lock b/components/gems/Gemfile.lock index 0501bbcc5..7ba2ca7d5 100644 --- a/components/gems/Gemfile.lock +++ b/components/gems/Gemfile.lock @@ -8,7 +8,7 @@ GIT GEM remote: https://rubygems.org/ specs: - activesupport (7.1.4.1) + activesupport (7.1.3.4) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -26,9 +26,9 @@ GEM artifactory (3.0.17) ast (2.4.2) aws-eventstream (1.3.0) - aws-partitions (1.992.0) - aws-sdk-account (1.35.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-partitions (1.962.0) + aws-sdk-account (1.28.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.1) aws-sdk-alexaforbusiness (1.71.0) aws-sdk-core (~> 3, >= 3.193.0) @@ -36,17 +36,17 @@ GEM aws-sdk-amplify (1.32.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-apigateway (1.108.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-apigateway (1.101.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-apigatewayv2 (1.67.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-apigatewayv2 (1.60.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.1) aws-sdk-applicationautoscaling (1.51.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-athena (1.96.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-athena (1.89.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) aws-sdk-autoscaling (1.92.0) aws-sdk-core (~> 3, >= 3.176.0) @@ -54,41 +54,41 @@ GEM aws-sdk-batch (1.73.0) aws-sdk-core (~> 3, >= 3.176.0) aws-sigv4 (~> 1.1) - aws-sdk-budgets (1.78.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-budgets (1.71.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-cloudformation (1.122.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-cloudformation (1.114.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-cloudfront (1.103.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-cloudfront (1.96.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-cloudhsm (1.65.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-cloudhsm (1.58.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-cloudhsmv2 (1.69.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-cloudhsmv2 (1.62.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-cloudtrail (1.93.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-cloudtrail (1.85.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-cloudwatch (1.104.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-cloudwatch (1.97.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) aws-sdk-cloudwatchevents (1.62.0) aws-sdk-core (~> 3, >= 3.176.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatchlogs (1.97.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-cloudwatchlogs (1.88.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-codecommit (1.79.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-codecommit (1.72.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-codedeploy (1.79.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-codedeploy (1.72.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-codepipeline (1.89.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-codepipeline (1.78.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) aws-sdk-cognitoidentity (1.45.0) aws-sdk-core (~> 3, >= 3.176.0) @@ -96,55 +96,55 @@ GEM aws-sdk-cognitoidentityprovider (1.76.0) aws-sdk-core (~> 3, >= 3.176.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.121.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-configservice (1.113.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-core (3.211.0) + aws-sdk-core (3.201.3) aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.992.0) - aws-sigv4 (~> 1.9) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-costandusagereportservice (1.68.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-costandusagereportservice (1.61.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) aws-sdk-databasemigrationservice (1.80.0) aws-sdk-core (~> 3, >= 3.176.0) aws-sigv4 (~> 1.1) - aws-sdk-dynamodb (1.126.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-dynamodb (1.118.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-ec2 (1.483.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-ec2 (1.467.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-ecr (1.88.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-ecr (1.80.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-ecrpublic (1.40.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-ecrpublic (1.33.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-ecs (1.164.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-ecs (1.152.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-efs (1.86.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-efs (1.79.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-eks (1.120.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-eks (1.111.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-elasticache (1.117.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-elasticache (1.109.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-elasticbeanstalk (1.80.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-elasticbeanstalk (1.73.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-elasticloadbalancing (1.68.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-elasticloadbalancing (1.61.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-elasticloadbalancingv2 (1.119.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-elasticloadbalancingv2 (1.109.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-elasticsearchservice (1.96.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-elasticsearchservice (1.89.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) aws-sdk-emr (1.53.0) aws-sdk-core (~> 3, >= 3.121.2) @@ -152,38 +152,38 @@ GEM aws-sdk-eventbridge (1.46.0) aws-sdk-core (~> 3, >= 3.176.0) aws-sigv4 (~> 1.1) - aws-sdk-firehose (1.83.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-firehose (1.76.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) aws-sdk-glue (1.145.0) aws-sdk-core (~> 3, >= 3.176.0) aws-sigv4 (~> 1.1) - aws-sdk-guardduty (1.105.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-guardduty (1.96.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-iam (1.112.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-iam (1.104.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-kafka (1.85.0) - aws-sdk-core (~> 3, >= 3.210.0) - aws-sigv4 (~> 1.5) - aws-sdk-kinesis (1.70.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-kafka (1.77.0) + aws-sdk-core (~> 3, >= 3.201.0) + aws-sigv4 (~> 1.1) + aws-sdk-kinesis (1.63.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-kms (1.95.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-kms (1.88.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-lambda (1.137.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-lambda (1.125.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) aws-sdk-mq (1.40.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-networkfirewall (1.55.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-networkfirewall (1.48.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-networkmanager (1.55.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-networkmanager (1.48.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) aws-sdk-organizations (1.77.0) aws-sdk-core (~> 3, >= 3.176.0) @@ -191,23 +191,23 @@ GEM aws-sdk-ram (1.26.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.254.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-rds (1.241.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-redshift (1.128.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-redshift (1.119.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-route53 (1.103.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-route53 (1.95.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-route53domains (1.70.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-route53domains (1.63.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-route53resolver (1.72.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-route53resolver (1.64.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.169.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-s3 (1.157.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) aws-sdk-s3control (1.43.0) @@ -216,8 +216,8 @@ GEM aws-sdk-secretsmanager (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.122.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-securityhub (1.113.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) aws-sdk-servicecatalog (1.60.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -225,8 +225,8 @@ GEM aws-sdk-ses (1.41.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-shield (1.75.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-shield (1.68.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) aws-sdk-signer (1.32.0) aws-sdk-core (~> 3, >= 3.120.0) @@ -234,17 +234,17 @@ GEM aws-sdk-simpledb (1.29.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv2 (~> 1.0) - aws-sdk-sms (1.66.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-sms (1.59.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.89.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-sns (1.82.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-sqs (1.87.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-sqs (1.80.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-ssm (1.183.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-ssm (1.174.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) aws-sdk-states (1.39.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -259,7 +259,7 @@ GEM aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) aws-sigv2 (1.2.0) - aws-sigv4 (1.10.1) + aws-sigv4 (1.9.1) aws-eventstream (~> 1, >= 1.0.2) axiom-types (0.1.1) descendants_tracker (~> 0.0.4) @@ -338,6 +338,52 @@ GEM unf_ext (~> 0.0.8.2) uuidtools (>= 2.1.5, < 3.0) vault (~> 0.18.2) + chef (18.5.0-x64-mingw-ucrt) + addressable + aws-sdk-s3 (~> 1.91) + aws-sdk-secretsmanager (~> 1.46) + chef-config (= 18.5.0) + chef-powershell (~> 18.1.0) + chef-utils (= 18.5.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.15.5) + ffi-libarchive (~> 1.0, >= 1.0.3) + ffi-yajl (~> 2.2) + iniparse (~> 1.4) + inspec-core (>= 5, < 6) + iso8601 (>= 0.12.1, < 0.14) + 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-ftp + net-sftp (>= 2.1.2, < 5.0) + ohai (~> 18.0) + plist (~> 3.2) + proxifier2 (~> 1.1) + syslog-logger (~> 1.6) + 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.18.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) + win32-mutex (~> 0.4.2) + win32-process (~> 0.9) + win32-service (>= 2.1.5, < 3.0) + win32-taskscheduler (~> 2.0) + wmi-lite (~> 1.0) chef-apply (0.9.6) chef (>= 16.0) chef-cli (>= 2.0.10) @@ -374,6 +420,9 @@ GEM mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) tomlrb (~> 1.2) + chef-powershell (18.1.0) + ffi (~> 1.15) + ffi-yajl (~> 2.4) chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) @@ -407,7 +456,7 @@ GEM coderay (1.1.3) coercible (1.0.0) descendants_tracker (~> 0.0.1) - concurrent-ruby (1.3.4) + concurrent-ruby (1.3.3) connection_pool (2.4.1) cookbook-omnifetch (0.12.2) mixlib-archive (>= 0.4, < 2.0) @@ -461,8 +510,8 @@ GEM ed25519 (1.3.0) erubi (1.13.0) erubis (2.7.0) - excon (0.112.0) - faraday (1.10.4) + excon (0.111.0) + faraday (1.10.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -490,13 +539,18 @@ GEM faraday-patron (1.0.0) faraday-rack (1.0.0) faraday-retry (1.0.3) - faraday_middleware (1.2.1) + faraday_middleware (1.2.0) faraday (~> 1.0) fauxhai-chef (9.3.16) net-ssh 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.14) ffi (~> 1.0) + ffi-win32-extensions (1.0.4) + ffi ffi-yajl (2.6.0) libyajl2 (>= 1.2) filesize (0.2.0) @@ -571,17 +625,17 @@ GEM hashie (4.1.0) highline (2.1.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.6) domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.14.6) + i18n (1.14.5) concurrent-ruby (~> 1.0) ice_nine (0.11.2) inifile (3.0.0) iniparse (1.5.0) - inspec (5.22.58) + inspec (5.22.55) faraday_middleware (>= 0.12.2, < 1.3) - inspec-core (= 5.22.58) + inspec-core (= 5.22.55) mongo (= 2.13.2) progress_bar (~> 1.3.3) rake @@ -590,9 +644,9 @@ GEM train-habitat (~> 0.1) train-kubernetes (~> 0.1) train-winrm (~> 0.2) - inspec-bin (5.22.58) - inspec (= 5.22.58) - inspec-core (5.22.58) + inspec-bin (5.22.55) + inspec (= 5.22.55) + inspec-core (5.22.55) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) cookstyle @@ -617,11 +671,12 @@ GEM tty-prompt (~> 0.17) tty-table (~> 0.10) ipaddress (0.8.3) + iso8601 (0.13.0) jmespath (1.6.2) json (2.7.2) jsonpath (1.1.5) multi_json - jwt (2.9.3) + jwt (2.8.2) base64 k8s-ruby (0.16.0) dry-configurable @@ -777,16 +832,17 @@ GEM mixlib-shellout memoist (0.16.2) method_source (1.1.0) - mime-types (3.6.0) - logger + mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.1001) + mime-types-data (3.2024.0702) mini_mime (1.1.5) mini_portile2 (2.8.7) - minitar (0.12.1) - minitest (5.25.1) + minitar (0.9) + minitest (5.24.1) mixlib-archive (1.1.7) mixlib-log + mixlib-archive (1.1.7-universal-mingw32) + mixlib-log mixlib-authentication (3.0.10) mixlib-cli (2.1.8) mixlib-config (3.0.27) @@ -797,8 +853,18 @@ GEM thor mixlib-log (3.1.1) ffi (< 1.17.0) - mixlib-shellout (3.3.3) + mixlib-shellout (3.2.8) + chef-utils + mixlib-shellout (3.2.8-universal-mingw32) chef-utils + ffi-win32-extensions (~> 1.0.3) + win32-process (~> 0.9) + wmi-lite (~> 1.0) + mixlib-shellout (3.2.8-x64-mingw-ucrt) + chef-utils + ffi-win32-extensions (~> 1.0.3) + win32-process (~> 0.9) + wmi-lite (~> 1.0) mixlib-versioning (1.2.12) molinillo (0.8.0) mongo (2.13.2) @@ -825,7 +891,7 @@ GEM multipart-post (2.4.1) mutex_m (0.2.0) nenv (0.3.0) - net-ftp (0.3.8) + net-ftp (0.3.7) net-protocol time net-ping (2.0.8) @@ -835,7 +901,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.3.0) + net-ssh (7.2.3) net-ssh-gateway (2.0.0) net-ssh (>= 4.0.0) net-ssh-multi (1.2.1) @@ -845,6 +911,12 @@ GEM nokogiri (1.16.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) + nokogiri (1.16.7-x64-mingw-ucrt) + racc (~> 1.4) + nokogiri (1.16.7-x64-mingw32) + racc (~> 1.4) + nokogiri (1.16.7-x86-mingw32) + racc (~> 1.4) nori (2.7.1) bigdecimal notiffany (0.1.3) @@ -870,8 +942,8 @@ GEM optimist (3.1.0) options (2.3.2) os (1.1.4) - parallel (1.26.3) - parser (3.3.5.0) + parallel (1.25.1) + parser (3.3.4.0) ast (~> 2.4.1) racc parslet (2.0.0) @@ -900,7 +972,7 @@ GEM r18n-desktop (5.0.1) r18n-core (~> 5.0) racc (1.8.1) - rack (2.2.10) + rack (2.2.9) rainbow (3.1.1) rake (13.0.1) rb-fsevent (0.11.2) @@ -917,6 +989,7 @@ GEM json (~> 2.3) nokogiri (~> 1.12, >= 1.12.5) optimist (~> 3.0) + rdp-ruby-wmi (0.3.1) recursive-open-struct (1.1.3) regexp_parser (2.9.2) representable (3.2.0) @@ -930,9 +1003,22 @@ GEM 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) retriable (3.1.2) retryable (3.0.5) - rexml (3.3.8) + rexml (3.3.4) + strscan rspec (3.12.0) rspec-core (~> 3.12.0) rspec-expectations (~> 3.12.0) @@ -958,7 +1044,7 @@ GEM rubocop-ast (>= 1.15.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.32.3) + rubocop-ast (1.32.0) parser (>= 3.3.1.0) ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) @@ -986,8 +1072,9 @@ GEM unicode-display_width (>= 1.5, < 3.0) unicode_utils (~> 1.4) strings-ansi (0.2.0) + strscan (3.1.0) syslog-logger (1.6.8) - test-kitchen (3.7.0) + test-kitchen (3.6.0) bcrypt_pbkdf (~> 1.0) chef-utils (>= 16.4.35) ed25519 (~> 1.2) @@ -1003,7 +1090,7 @@ GEM winrm-fs (~> 1.1) thor (1.2.2) thread_safe (0.3.6) - time (0.4.0) + time (0.3.0) date timeliness (0.3.10) timeout (0.4.1) @@ -1012,8 +1099,8 @@ GEM racc (~> 1.7) tomlrb (1.3.0) trailblazer-option (0.1.2) - train (3.12.7) - activesupport (>= 6.0.3.1, < 7.2.0) + train (3.12.6) + activesupport (>= 6.0.3.1) azure_graph_rbac (~> 0.16) azure_mgmt_key_vault (~> 0.17) azure_mgmt_resources (~> 0.15) @@ -1029,7 +1116,7 @@ GEM google-apis-storage_v1 (~> 0.30.0) googleauth (>= 0.16.2, < 1.9.0) inifile (~> 3.0) - train-core (= 3.12.7) + train-core (= 3.12.6) train-winrm (~> 0.2) train-aws (0.2.36) aws-sdk-account (~> 1.14) @@ -1108,7 +1195,7 @@ GEM aws-sdk-synthetics (~> 1.19.0) aws-sdk-transfer (>= 1.26, < 1.74) aws-sdk-waf (~> 1.43.0) - train-core (3.12.7) + train-core (3.12.6) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) @@ -1150,8 +1237,11 @@ GEM tzinfo (2.0.6) concurrent-ruby (~> 1.0) uber (0.1.0) + unf (0.1.4) + unf_ext unf_ext (0.0.8.2) - unicode-display_width (2.6.0) + unf_ext (0.0.8.2-x64-mingw-ucrt) + unicode-display_width (2.5.0) unicode_utils (1.4.0) uuidtools (2.2.0) vault (0.18.2) @@ -1188,7 +1278,40 @@ GEM vsphere-automation-vcenter (0.4.7) vsphere-automation-cis (~> 0.4.6) vsphere-automation-runtime (~> 0.4.6) - webrick (1.8.2) + webrick (1.8.1) + win32-api (1.10.1) + win32-api (1.10.1-universal-mingw32) + win32-certstore (0.6.15) + chef-powershell (>= 1.0.12) + ffi + win32-dir (0.7.2) + ffi (>= 1.0.0) + win32-event (0.6.3) + win32-ipc (>= 0.6.0) + win32-eventlog (0.6.3) + ffi + win32-ipc (0.7.0) + ffi + win32-mmap (0.4.2) + ffi + win32-mutex (0.4.3) + win32-ipc (>= 0.6.0) + win32-process (0.10.0) + ffi (>= 1.0.0) + win32-security (0.5.0) + ffi + ffi-win32-extensions + win32-service (2.3.2) + ffi + ffi-win32-extensions + win32-taskscheduler (2.0.4) + ffi + structured_warnings + windows-api (0.4.5) + win32-api (>= 1.4.5) + windows-pr (1.2.6) + win32-api (>= 1.4.5) + windows-api (>= 0.4.0) winrm (2.3.9) builder (>= 2.1.2) erubi (~> 1.8) @@ -1212,10 +1335,14 @@ GEM wmi-lite (1.0.7) yajl-ruby (1.4.3) yaml-safe_load_stream3 (0.1.2) - zeitwerk (2.6.18) + zeitwerk (2.6.17) PLATFORMS ruby + x64-mingw + x64-mingw-ucrt + x64-mingw32 + x86-mingw32 DEPENDENCIES appbundler @@ -1276,9 +1403,18 @@ DEPENDENCIES pry-stack_explorer (>= 0.5.1) rake (= 13.0.1) rb-readline + rdp-ruby-wmi ruby-shadow! test-kitchen (>= 3.0) unf_ext (~> 0.0.8.2) + win32-api + win32-dir + win32-event + win32-mutex + win32-process (>= 0.9.0) + win32-security + win32-service (>= 2.1.5) + windows-pr winrm-elevated winrm-fs diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 5811e7c5b..612636d4a 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/chef/omnibus-software.git - revision: bfa5386338ed36e1f69c6176065ef30e2aff3988 + revision: 16598229698d9626c42974bb290502dab8b25ad6 branch: main specs: omnibus-software (24.6.323) @@ -8,7 +8,7 @@ GIT GIT remote: https://github.com/chef/omnibus.git - revision: 0633d009f24dfced4eb6ab76346b84fbb8c970f0 + revision: 3efa84c1a26daf55c4d477bf3653e5905ab4f737 branch: main specs: omnibus (9.0.25) @@ -35,40 +35,39 @@ GEM ast (2.4.2) awesome_print (1.9.2) aws-eventstream (1.3.0) - aws-partitions (1.992.0) - aws-sdk-core (3.211.0) + aws-partitions (1.962.0) + aws-sdk-core (3.201.3) aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.992.0) - aws-sigv4 (~> 1.9) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.95.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-kms (1.88.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) 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.109.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-secretsmanager (1.102.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sigv4 (1.10.1) + aws-sigv4 (1.9.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) bcrypt_pbkdf (1.1.1) - berkshelf (8.0.15) - chef (>= 18.0.0) - chef-cleanroom (~> 1.0) + berkshelf (8.0.9) + chef (>= 15.7.32) chef-config + cleanroom (~> 1.0) concurrent-ruby (~> 1.0) - ffi (~> 1.9, < 1.16.0) - minitar (~> 1.0) + minitar (>= 0.6) mixlib-archive (>= 1.1.4, < 2.0) mixlib-config (>= 2.2.5) mixlib-shellout (>= 2.0, < 4.0) - octokit (>= 4.0, < 6.0) + octokit (~> 4.0) retryable (>= 2.0, < 4.0) solve (~> 4.0) - thor (>= 0.20, < 1.3.0) + thor (>= 0.20) bigdecimal (3.1.8) builder (3.3.0) chef (18.5.0) @@ -105,6 +104,52 @@ GEM unf_ext (~> 0.0.8.2) uuidtools (>= 2.1.5, < 3.0) vault (~> 0.18.2) + chef (18.5.0-x64-mingw-ucrt) + addressable + aws-sdk-s3 (~> 1.91) + aws-sdk-secretsmanager (~> 1.46) + chef-config (= 18.5.0) + chef-powershell (~> 18.1.0) + chef-utils (= 18.5.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.15.5) + ffi-libarchive (~> 1.0, >= 1.0.3) + ffi-yajl (~> 2.2) + iniparse (~> 1.4) + inspec-core (>= 5, < 6) + iso8601 (>= 0.12.1, < 0.14) + 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-ftp + net-sftp (>= 2.1.2, < 5.0) + ohai (~> 18.0) + plist (~> 3.2) + proxifier2 (~> 1.1) + syslog-logger (~> 1.6) + 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.18.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) + win32-mutex (~> 0.4.2) + win32-process (~> 0.9) + win32-service (>= 2.1.5, < 3.0) + win32-taskscheduler (~> 2.0) + wmi-lite (~> 1.0) chef-cleanroom (1.0.5) chef-config (18.5.0) addressable @@ -113,6 +158,9 @@ GEM mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) tomlrb (~> 1.2) + chef-powershell (18.1.0) + ffi (~> 1.15) + ffi-yajl (~> 2.4) chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) @@ -127,8 +175,9 @@ GEM uuidtools (~> 2.1) webrick citrus (3.0.2) + cleanroom (1.0.0) coderay (1.1.3) - concurrent-ruby (1.3.4) + concurrent-ruby (1.3.3) contracts (0.16.1) cookstyle (7.32.8) rubocop (= 1.25.1) @@ -140,17 +189,21 @@ GEM ed25519 (1.3.0) erubi (1.13.0) erubis (2.7.0) - faraday (2.12.0) - faraday-net_http (>= 2.0, < 3.4) - json + faraday (2.10.1) + faraday-net_http (>= 2.0, < 3.2) logger faraday-follow_redirects (0.3.0) faraday (>= 1, < 3) - faraday-net_http (3.3.0) + faraday-net_http (3.1.1) net-http - ffi (1.15.5) + 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.14) ffi (~> 1.0) + ffi-win32-extensions (1.0.4) + ffi ffi-yajl (2.6.0) libyajl2 (>= 1.2) fuzzyurl (0.9.0) @@ -161,11 +214,11 @@ GEM rexml (~> 3.0) hashie (4.1.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.6) domain_name (~> 0.5) httpclient (2.8.3) iniparse (1.5.0) - inspec-core (5.22.58) + inspec-core (5.22.55) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) cookstyle @@ -189,8 +242,9 @@ GEM train-core (~> 3.10) tty-prompt (~> 0.17) tty-table (~> 0.10) - iostruct (0.2.0) + iostruct (0.1.3) ipaddress (0.8.3) + iso8601 (0.13.0) jmespath (1.6.2) json (2.7.2) kitchen-vagrant (2.0.1) @@ -201,23 +255,24 @@ GEM tomlrb (>= 1.2, < 3.0) tty-box (~> 0.6) tty-prompt (~> 0.20) - license_scout (1.3.14) + license_scout (1.3.10) ffi-yajl (~> 2.2) mixlib-shellout (>= 2.2, < 4.0) toml-rb (>= 1, < 3) little-plugger (1.1.4) - logger (1.6.1) + logger (1.6.0) logging (2.4.0) little-plugger (~> 1.1) multi_json (~> 1.14) method_source (1.1.0) - mime-types (3.6.0) - logger + mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.1001) - minitar (1.0.2) + mime-types-data (3.2024.0702) + minitar (0.9) mixlib-archive (1.1.7) mixlib-log + mixlib-archive (1.1.7-universal-mingw32) + mixlib-log mixlib-authentication (3.0.10) mixlib-cli (2.1.8) mixlib-config (3.0.27) @@ -228,13 +283,23 @@ GEM thor mixlib-log (3.1.1) ffi (< 1.17.0) - mixlib-shellout (3.3.3) + mixlib-shellout (3.2.8) + chef-utils + mixlib-shellout (3.2.8-universal-mingw32) chef-utils + ffi-win32-extensions (~> 1.0.3) + win32-process (~> 0.9) + wmi-lite (~> 1.0) + mixlib-shellout (3.2.8-x64-mingw-ucrt) + chef-utils + ffi-win32-extensions (~> 1.0.3) + win32-process (~> 0.9) + wmi-lite (~> 1.0) mixlib-versioning (1.2.12) molinillo (0.8.0) multi_json (1.15.0) multipart-post (2.4.1) - net-ftp (0.3.8) + net-ftp (0.3.7) net-protocol time net-http (0.4.1) @@ -245,13 +310,13 @@ 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.3.0) + net-ssh (7.2.3) net-ssh-gateway (2.0.0) net-ssh (>= 4.0.0) netrc (0.11.0) nori (2.7.1) bigdecimal - octokit (5.6.1) + octokit (4.25.1) faraday (>= 1, < 3) sawyer (~> 0.9) ohai (18.1.18) @@ -267,8 +332,8 @@ GEM plist (~> 3.1) train-core wmi-lite (~> 1.0) - parallel (1.26.3) - parser (3.3.5.0) + parallel (1.25.1) + parser (3.3.4.0) ast (~> 2.4.1) racc parslet (2.0.0) @@ -287,7 +352,7 @@ GEM method_source (~> 1.0) public_suffix (6.0.1) racc (1.8.1) - rack (2.2.10) + rack (2.2.9) rainbow (3.1.1) regexp_parser (2.9.2) rest-client (2.1.0) @@ -295,8 +360,21 @@ GEM 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.3.8) + rexml (3.3.4) + strscan rspec (3.12.0) rspec-core (~> 3.12.0) rspec-expectations (~> 3.12.0) @@ -322,7 +400,7 @@ GEM rubocop-ast (>= 1.15.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.32.3) + rubocop-ast (1.32.0) parser (>= 3.3.1.0) ruby-progressbar (1.13.0) rubyntlm (0.6.5) @@ -341,8 +419,10 @@ GEM unicode-display_width (>= 1.5, < 3.0) unicode_utils (~> 1.4) strings-ansi (0.2.0) + structured_warnings (0.4.0) + strscan (3.1.0) syslog-logger (1.6.8) - test-kitchen (3.7.0) + test-kitchen (3.6.0) bcrypt_pbkdf (~> 1.0) chef-utils (>= 16.4.35) ed25519 (~> 1.2) @@ -357,13 +437,13 @@ GEM winrm-elevated (~> 1.0) winrm-fs (~> 1.1) thor (1.2.2) - time (0.4.0) + time (0.3.0) date timeout (0.4.1) toml-rb (2.2.0) citrus (~> 3.0, > 3.0) tomlrb (1.3.0) - train-core (3.12.7) + train-core (3.12.6) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) @@ -397,13 +477,36 @@ GEM strings (~> 0.2.0) tty-screen (~> 0.8) unf_ext (0.0.8.2) - unicode-display_width (2.6.0) + unf_ext (0.0.8.2-x64-mingw-ucrt) + unicode-display_width (2.5.0) unicode_utils (1.4.0) - uri (0.13.1) + uri (0.13.0) uuidtools (2.2.0) vault (0.18.2) aws-sigv4 - webrick (1.8.2) + webrick (1.8.1) + win32-api (1.10.1-universal-mingw32) + win32-certstore (0.6.15) + chef-powershell (>= 1.0.12) + ffi + win32-event (0.6.3) + win32-ipc (>= 0.6.0) + win32-eventlog (0.6.3) + ffi + win32-ipc (0.7.0) + ffi + win32-mmap (0.4.2) + ffi + win32-mutex (0.4.3) + win32-ipc (>= 0.6.0) + win32-process (0.10.0) + ffi (>= 1.0.0) + win32-service (2.3.2) + ffi + ffi-win32-extensions + win32-taskscheduler (2.0.4) + ffi + structured_warnings winrm (2.3.9) builder (>= 2.1.2) erubi (~> 1.8) @@ -429,6 +532,10 @@ GEM PLATFORMS ruby + x64-mingw + x64-mingw-ucrt + x64-mingw32 + x86-mingw32 DEPENDENCIES artifactory diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 4c967d37b..064e60e1e 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -12,7 +12,7 @@ override "liblzma", version: "5.2.5" override "curl", version: "8.4.0" override "go", version: "1.22.5" -override "git-windows", version: "2.41.0" +override "git-windows", version: "2.47.0" override "libyaml", version: "0.1.7" override "libxml2", version: "2.12.7" override "makedepend", version: "1.0.5"