summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn McCrae <john.mccrae@progress.com>2023-02-02 11:09:07 +0600
committerGitHub <noreply@github.com>2023-02-02 11:09:07 +0600
commit1cd803d0c664287862d0a739c940489f2a31ac10 (patch)
tree137ae8d69e484e1b1b3dd81931ec87506a32adcc
parent188364ff4da41dde97b0d9639bf55f0ac35158d9 (diff)
parent1d774bfd5d03fcb0511e6f63a687276f3b6449b7 (diff)
downloadchef-1cd803d0c664287862d0a739c940489f2a31ac10.tar.gz
Merge pull request #13547 from chef/jfm/chef18_updating_gems
Bumping gems to pull in a valid license_scout version
-rw-r--r--Gemfile.lock59
-rw-r--r--omnibus/Gemfile.lock75
2 files changed, 58 insertions, 76 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index f65c763b62..023c1def27 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/chef/ohai.git
- revision: b59776be1a66db77473f729132b94085fd8fa49d
+ revision: af1405ed41ca25bcc2967bcf97a0448d5cba208d
branch: main
specs:
ohai (18.0.26)
@@ -164,20 +164,20 @@ GEM
mixlib-shellout (>= 2.0, < 4.0)
ast (2.4.2)
aws-eventstream (1.2.0)
- aws-partitions (1.681.0)
- aws-sdk-core (3.168.4)
+ 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)
jmespath (~> 1, >= 1.6.1)
- aws-sdk-kms (1.61.0)
+ aws-sdk-kms (1.62.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.117.2)
+ aws-sdk-s3 (1.119.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
- aws-sdk-secretsmanager (1.68.0)
+ aws-sdk-secretsmanager (1.72.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.5.2)
@@ -207,7 +207,7 @@ GEM
chefstyle (2.2.2)
rubocop (= 1.25.1)
coderay (1.1.3)
- concurrent-ruby (1.1.10)
+ concurrent-ruby (1.2.0)
corefoundation (0.3.13)
ffi (>= 1.15.0)
crack (0.4.5)
@@ -218,23 +218,14 @@ GEM
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)
fauxhai-ng (9.3.0)
net-ssh
ffi (1.15.5)
@@ -258,11 +249,11 @@ GEM
domain_name (~> 0.5)
httpclient (2.8.3)
iniparse (1.5.0)
- inspec-core (5.18.14)
+ 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)
@@ -281,8 +272,8 @@ GEM
train-core (~> 3.10)
tty-prompt (~> 0.17)
tty-table (~> 0.10)
- inspec-core-bin (5.18.14)
- inspec-core (= 5.18.14)
+ inspec-core-bin (5.21.29)
+ inspec-core (= 5.21.29)
ipaddress (0.8.3)
iso8601 (0.13.0)
jmespath (1.6.2)
@@ -316,7 +307,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-ftp (0.2.0)
net-protocol
time
@@ -330,7 +321,7 @@ 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 (1.8.2)
pastel (0.8.0)
@@ -346,11 +337,11 @@ GEM
binding_of_caller (~> 1.0)
pry (~> 0.13)
public_suffix (5.0.1)
- rack (2.2.4)
+ 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.11.0)
rspec-core (~> 3.11.0)
@@ -377,7 +368,7 @@ GEM
rubocop-ast (>= 1.15.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0)
- rubocop-ast (1.24.0)
+ rubocop-ast (1.24.1)
parser (>= 3.1.1.0)
ruby-progressbar (1.11.0)
ruby2_keywords (0.0.5)
@@ -434,7 +425,7 @@ GEM
unf_ext
unf_ext (0.0.8.2)
unf_ext (0.0.8.2-x64-mingw-ucrt)
- unicode-display_width (2.3.0)
+ unicode-display_width (2.4.2)
unicode_utils (1.4.0)
uuidtools (2.2.0)
vault (0.17.0)
@@ -443,7 +434,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.10.1)
win32-certstore (0.6.15)
chef-powershell (>= 1.0.12)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index bdc5d87af3..7b16fc7299 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,14 +1,14 @@
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: f7386ad375212a406dc11cd4050b10cbd77f7a42
+ revision: c66e97c211a60296e58da100d79d048974e13904
branch: main
specs:
omnibus (9.0.14)
@@ -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,7 +47,7 @@ GEM
aws-sdk-core (~> 3, >= 3.127.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
- aws-sdk-secretsmanager (1.68.0)
+ aws-sdk-secretsmanager (1.72.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.5.2)
@@ -67,12 +67,12 @@ GEM
solve (~> 4.0)
thor (>= 0.20)
builder (3.2.4)
- chef (18.0.185)
+ chef (18.1.0)
addressable
aws-sdk-s3 (~> 1.91)
aws-sdk-secretsmanager (~> 1.46)
- chef-config (= 18.0.185)
- chef-utils (= 18.0.185)
+ chef-config (= 18.1.0)
+ chef-utils (= 18.1.0)
chef-vault
chef-zero (>= 14.0.11)
corefoundation (~> 0.3.4)
@@ -101,13 +101,13 @@ GEM
unf_ext (>= 0.0.8.2)
uuidtools (>= 2.1.5, < 3.0)
vault (~> 0.16)
- chef (18.0.185-x64-mingw-ucrt)
+ chef (18.1.0-x64-mingw-ucrt)
addressable
aws-sdk-s3 (~> 1.91)
aws-sdk-secretsmanager (~> 1.46)
- chef-config (= 18.0.185)
+ chef-config (= 18.1.0)
chef-powershell (~> 1.0.12)
- chef-utils (= 18.0.185)
+ chef-utils (= 18.1.0)
chef-vault
chef-zero (>= 14.0.11)
corefoundation (~> 0.3.4)
@@ -148,9 +148,9 @@ GEM
win32-taskscheduler (~> 2.0)
wmi-lite (~> 1.0)
chef-cleanroom (1.0.5)
- chef-config (18.0.185)
+ chef-config (18.1.0)
addressable
- chef-utils (= 18.0.185)
+ chef-utils (= 18.1.0)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -161,7 +161,7 @@ GEM
chef-telemetry (1.1.1)
chef-config
concurrent-ruby (~> 1.0)
- chef-utils (18.0.185)
+ chef-utils (18.1.0)
concurrent-ruby
chef-vault (4.1.10)
chef-zero (15.0.11)
@@ -174,7 +174,7 @@ 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)
@@ -183,23 +183,14 @@ GEM
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)
@@ -222,11 +213,11 @@ GEM
domain_name (~> 0.5)
httpclient (2.8.3)
iniparse (1.5.0)
- inspec-core (5.18.14)
+ 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)
@@ -258,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)
@@ -279,7 +270,7 @@ GEM
mixlib-cli (2.1.8)
mixlib-config (3.0.27)
tomlrb
- mixlib-install (3.12.24)
+ mixlib-install (3.12.27)
mixlib-shellout
mixlib-versioning
thor
@@ -299,7 +290,7 @@ 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
@@ -342,11 +333,11 @@ 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)
@@ -459,13 +450,13 @@ GEM
unf (0.1.4)
unf_ext
unf_ext (0.0.8.2)
- unicode-display_width (2.3.0)
+ 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.10.1-universal-mingw32)
+ webrick (1.8.1)
+ win32-api (1.10.1)
win32-certstore (0.6.15)
chef-powershell (>= 1.0.12)
ffi