diff options
| author | John McCrae <john.mccrae@progress.com> | 2022-03-23 17:09:57 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-23 17:09:57 -0700 |
| commit | 013175bb754d7825a373ce877b5abfcb67dc08c2 (patch) | |
| tree | d709d6fcbfaec89786ec4b4c57880bd0fe4ac1e1 | |
| parent | e52a7952fd96d9e79eb5695c018d65e8c9491cc2 (diff) | |
| parent | fcf1d4663a9761a6e6aba98a1a2b593cc8d43849 (diff) | |
| download | chef-013175bb754d7825a373ce877b5abfcb67dc08c2.tar.gz | |
Merge pull request #12648 from chef/libarchive
Ran and AdHoc build against all versions of Windows we used except Windows 11. All passed
| -rw-r--r-- | omnibus/Gemfile.lock | 12 | ||||
| -rw-r--r-- | omnibus_overrides.rb | 1 |
2 files changed, 5 insertions, 8 deletions
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 27136e3792..b2c045d513 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -46,14 +46,12 @@ GEM aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) - aws-sdk-secretsmanager (1.57.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-secretsmanager (1.58.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sigv4 (1.4.0) 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 (7.2.2) chef (>= 15.7.32) chef-config @@ -303,7 +301,7 @@ GEM parslet (1.8.2) pastel (0.8.0) tty-color (~> 0.5) - pedump (0.6.4) + pedump (0.6.5) awesome_print iostruct (>= 0.0.4) multipart-post (>= 2.0.0) @@ -378,7 +376,7 @@ GEM mixlib-shellout (>= 2.0, < 4.0) net-scp (>= 1.2, < 4.0) net-ssh (>= 2.9, < 7.0) - train-winrm (0.2.12) + train-winrm (0.2.13) winrm (>= 2.3.6, < 3.0) winrm-elevated (~> 1.2.2) winrm-fs (~> 1.0) @@ -466,4 +464,4 @@ DEPENDENCIES winrm-fs (~> 1.0) BUNDLED WITH - 2.2.32 + 2.3.7 diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 72acde87b6..64c435204d 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -3,7 +3,6 @@ # # NOTE: You MUST update omnibus-software when adding new versions of # software here: bundle exec rake dependencies:update_omnibus_gemfile_lock -override "libarchive", version: "3.5.2" override "libffi", version: "3.4.2" override "libiconv", version: "1.16" override "liblzma", version: "5.2.5" |