diff options
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 62 | ||||
| -rw-r--r-- | omnibus_overrides.rb | 2 |
3 files changed, 36 insertions, 32 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 64f2f86c34..e83070becc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -293,7 +293,7 @@ GEM net-ssh (>= 5.0.0, < 7.0.0) net-ssh (6.1.0) nori (2.6.0) - parallel (1.22.0) + parallel (1.22.1) parser (3.1.1.0) ast (~> 2.4.1) parslet (1.8.2) @@ -470,4 +470,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.3.5 + 2.3.7 diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 029a7d9dbe..dda5b24a65 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/chef/omnibus-software.git - revision: 769445f0a0b2a06356d70524ab922f7ce88761a3 + revision: 91fa13cf3b248254b5b4549b1bdff000f243d618 branch: main specs: omnibus-software (4.0.0) @@ -33,7 +33,7 @@ GEM artifactory (3.0.15) awesome_print (1.9.2) aws-eventstream (1.2.0) - aws-partitions (1.570.0) + aws-partitions (1.571.0) aws-sdk-core (3.130.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) @@ -46,7 +46,7 @@ GEM aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) - aws-sdk-secretsmanager (1.58.0) + aws-sdk-secretsmanager (1.59.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sigv4 (1.4.0) @@ -68,16 +68,16 @@ GEM solve (~> 4.0) thor (>= 0.20) builder (3.2.4) - chef (17.9.52) + chef (17.10.0) addressable aws-sdk-s3 (~> 1.91) aws-sdk-secretsmanager (~> 1.46) - chef-config (= 17.9.52) - chef-utils (= 17.9.52) + chef-config (= 17.10.0) + chef-utils (= 17.10.0) chef-vault chef-zero (>= 14.0.11) corefoundation (~> 0.3.4) - diff-lcs (>= 1.2.4, < 1.4.0) + diff-lcs (>= 1.2.4, < 1.6.0, != 1.4.0) erubis (~> 2.7) ffi (>= 1.5.0) ffi-libarchive (~> 1.0, >= 1.0.3) @@ -99,16 +99,17 @@ GEM train-winrm (>= 0.2.5) uuidtools (>= 2.1.5, < 3.0) vault (~> 0.16) - chef (17.9.52-universal-mingw32) + chef (17.10.0-universal-mingw32) addressable aws-sdk-s3 (~> 1.91) aws-sdk-secretsmanager (~> 1.46) - chef-config (= 17.9.52) - chef-utils (= 17.9.52) + chef-config (= 17.10.0) + chef-powershell (~> 1.0.12) + chef-utils (= 17.10.0) chef-vault chef-zero (>= 14.0.11) corefoundation (~> 0.3.4) - diff-lcs (>= 1.2.4, < 1.4.0) + diff-lcs (>= 1.2.4, < 1.6.0, != 1.4.0) erubis (~> 2.7) ffi (>= 1.5.0) ffi-libarchive (~> 1.0, >= 1.0.3) @@ -142,17 +143,20 @@ GEM win32-taskscheduler (~> 2.0) wmi-lite (~> 1.0) chef-cleanroom (1.0.4) - chef-config (17.9.52) + chef-config (17.10.0) addressable - chef-utils (= 17.9.52) + chef-utils (= 17.10.0) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) tomlrb (~> 1.2) + chef-powershell (1.0.13) + ffi (~> 1.15) + ffi-yajl (~> 2.4) chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) - chef-utils (17.9.52) + chef-utils (17.10.0) concurrent-ruby chef-vault (4.1.5) chef-zero (15.0.11) @@ -169,7 +173,7 @@ GEM contracts (0.16.1) corefoundation (0.3.13) ffi (>= 1.15.0) - diff-lcs (1.3) + diff-lcs (1.5.0) ed25519 (1.3.0) erubi (1.10.0) erubis (2.7.0) @@ -205,7 +209,7 @@ GEM hashie (4.1.0) httpclient (2.8.3) iniparse (1.5.0) - inspec-core (4.52.9) + inspec-core (4.56.19) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -218,7 +222,7 @@ GEM parallel (~> 1.9) parslet (>= 1.5, < 2.0) pry (~> 0.13) - rspec (>= 3.9, < 3.11) + rspec (>= 3.9, <= 3.11) rspec-its (~> 1.2) rubyzip (>= 1.2.2, < 3.0) semverse (~> 3.0) @@ -299,7 +303,7 @@ GEM plist (~> 3.1) train-core wmi-lite (~> 1.0) - parallel (1.21.0) + parallel (1.22.1) parslet (1.8.2) pastel (0.8.0) tty-color (~> 0.5) @@ -318,22 +322,22 @@ GEM rack (2.2.3) rainbow (3.1.1) retryable (3.0.5) - rspec (3.10.0) - rspec-core (~> 3.10.0) - rspec-expectations (~> 3.10.0) - rspec-mocks (~> 3.10.0) - rspec-core (3.10.2) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.2) + 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.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) + rspec-support (~> 3.11.0) rspec-its (1.3.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.10.3) + rspec-mocks (3.11.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-support (3.10.3) + rspec-support (~> 3.11.0) + rspec-support (3.11.0) ruby-progressbar (1.11.0) ruby2_keywords (0.0.5) rubyntlm (0.6.3) diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index c41d2fa724..f9cda5ea9f 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -7,7 +7,7 @@ override "libffi", version: "3.4.2" override "libiconv", version: "1.16" override "liblzma", version: "5.2.5" override "libtool", version: "2.4.2" -override "libxml2", version: "2.9.12" +override "libxml2", version: "2.9.13" override "libxslt", version: "1.1.34" override "libyaml", version: "0.1.7" override "makedepend", version: "1.0.5" |