diff options
| author | John McCrae <john.mccrae@progress.com> | 2022-06-07 14:06:25 -0700 |
|---|---|---|
| committer | John McCrae <john.mccrae@progress.com> | 2022-06-07 14:06:25 -0700 |
| commit | 841a2127a8ae3900919f195c40c145927301d0ba (patch) | |
| tree | ad18005844434aa63b11d7ab009ff88e5439efef | |
| parent | 3ab8ad79ca6ca6783f8f9ad124fcc5837b461350 (diff) | |
| download | chef-jfm/pull_ohai_in.tar.gz | |
updating gemfile.locks to pull in ohai 18.0.14jfm/pull_ohai_in
Signed-off-by: John McCrae <john.mccrae@progress.com>
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 18 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 6 |
3 files changed, 13 insertions, 15 deletions
@@ -17,7 +17,9 @@ end gem "cheffish", ">= 17" -gem "unf_ext", git: "https://github.com/knu/ruby-unf_ext", tag: "v0.0.8.2.beta" +# gem "unf_ext", git: "https://github.com/knu/ruby-unf_ext", tag: "v0.0.8.2.beta" +gem "unf_ext", "0.0.8.2.beta" + group(:omnibus_package) do gem "appbundler" diff --git a/Gemfile.lock b/Gemfile.lock index e0b5389e4d..efc79c16c0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -73,7 +73,6 @@ PATH train-core (~> 3.2, >= 3.2.28) train-rest (>= 0.4.1) train-winrm (>= 0.2.5) - unf_ext (< 0.0.8.1) uuidtools (>= 2.1.5, < 3.0) vault (~> 0.16) chef (18.0.107-universal-mingw32) @@ -109,7 +108,6 @@ PATH train-core (~> 3.2, >= 3.2.28) train-rest (>= 0.4.1) train-winrm (>= 0.2.5) - unf_ext (< 0.0.8.1) uuidtools (>= 2.1.5, < 3.0) vault (~> 0.16) win32-api (~> 1.5.3) @@ -156,7 +154,7 @@ GEM mixlib-shellout (>= 2.0, < 4.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.596.0) + aws-partitions (1.597.0) aws-sdk-core (3.131.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) @@ -228,7 +226,6 @@ GEM fauxhai-ng (9.3.0) net-ssh ffi (1.15.5) - ffi (1.15.5-x64-mingw-ucrt) ffi (1.15.5-x64-mingw32) ffi (1.15.5-x86-mingw32) ffi-libarchive (1.1.3) @@ -309,11 +306,6 @@ GEM ffi-win32-extensions (~> 1.0.3) win32-process (~> 0.9) wmi-lite (~> 1.0) - mixlib-shellout (3.2.7-x64-mingw-ucrt) - chef-utils - ffi-win32-extensions (~> 1.0.3) - win32-process (~> 0.9) - wmi-lite (~> 1.0) multi_json (1.15.0) multipart-post (2.2.0) net-ftp (0.1.3) @@ -447,7 +439,9 @@ GEM tty-screen (~> 0.8) unf (0.1.4) unf_ext - unf_ext (0.0.8) + unf_ext (0.0.8.2.beta) + unf_ext (0.0.8.2.beta-x64-mingw32) + unf_ext (0.0.8.2.beta-x86-mingw32) unicode-display_width (2.1.0) unicode_utils (1.4.0) uuidtools (2.2.0) @@ -503,7 +497,6 @@ GEM PLATFORMS ruby - x64-mingw-ucrt x64-mingw32 x86-mingw32 @@ -528,7 +521,8 @@ DEPENDENCIES rb-readline rspec ruby-shadow! + unf_ext (= 0.0.8.2.beta) webmock BUNDLED WITH - 2.3.14 + 2.2.32 diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index fd27d3f3e8..a64d8f9f92 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -34,7 +34,7 @@ GEM artifactory (3.0.15) awesome_print (1.9.2) aws-eventstream (1.2.0) - aws-partitions (1.596.0) + aws-partitions (1.597.0) aws-sdk-core (3.131.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) @@ -53,6 +53,8 @@ GEM aws-sigv4 (1.5.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 (8.0.2) chef (>= 15.7.32) chef-config @@ -478,4 +480,4 @@ DEPENDENCIES winrm-fs (~> 1.0) BUNDLED WITH - 2.3.12 + 2.3.14 |