summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2020-06-17 10:41:54 -0700
committerGitHub <noreply@github.com>2020-06-17 10:41:54 -0700
commit679484236306f6ae7a5935fd9bbb32d1c93304ef (patch)
treebd71d98014aed4a9c375dc8665ff797b454e85f0
parentb24615bf7ab2b3f3fdeb6255500b017437ff74f8 (diff)
parent5db0faa9b41bcbbf0d76dccae37fecedf462cc19 (diff)
downloadchef-679484236306f6ae7a5935fd9bbb32d1c93304ef.tar.gz
Merge pull request #10008 from chef/inspec_bump
Update InSpec to 4.20.6
-rw-r--r--Gemfile.lock22
-rw-r--r--omnibus/Gemfile.lock31
2 files changed, 26 insertions, 27 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 444ab84459..8d6307fccf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -139,7 +139,7 @@ GEM
appbundler (0.13.2)
mixlib-cli (>= 1.4, < 3.0)
mixlib-shellout (>= 2.0, < 4.0)
- ast (2.4.0)
+ ast (2.4.1)
bcrypt_pbkdf (1.1.0.rc1)
bcrypt_pbkdf (1.1.0.rc1-x64-mingw32)
bcrypt_pbkdf (1.1.0.rc1-x86-mingw32)
@@ -198,7 +198,7 @@ GEM
htmlentities (4.3.4)
httpclient (2.8.3)
iniparse (1.5.0)
- inspec-core (4.19.2)
+ inspec-core (4.20.6)
addressable (~> 2.4)
chef-telemetry (~> 1.0)
faraday (>= 0.9.0)
@@ -219,12 +219,12 @@ GEM
sslshake (~> 1.2)
term-ansicolor (~> 1.7)
thor (>= 0.20, < 2.0)
- tomlrb (~> 1.2)
+ tomlrb (~> 1.2.0)
train-core (~> 3.0)
tty-prompt (~> 0.17)
tty-table (~> 0.10)
- inspec-core-bin (4.19.2)
- inspec-core (= 4.19.2)
+ inspec-core-bin (4.20.6)
+ inspec-core (= 4.20.6)
ipaddress (0.8.3)
iso8601 (0.12.1)
json (2.3.0)
@@ -271,7 +271,7 @@ GEM
net-ssh (>= 2.6.5)
net-ssh-gateway (>= 1.2.0)
nori (2.6.0)
- parallel (1.19.1)
+ parallel (1.19.2)
parser (2.7.1.3)
ast (~> 2.4.0)
parslet (1.8.2)
@@ -293,7 +293,7 @@ GEM
binding_of_caller (~> 0.7)
pry (~> 0.13)
public_suffix (4.0.5)
- rack (2.2.2)
+ rack (2.2.3)
rainbow (3.0.0)
rake (13.0.1)
rb-readline (0.5.5)
@@ -337,7 +337,7 @@ GEM
safe_yaml (1.0.5)
semverse (3.0.0)
slop (3.6.0)
- sslshake (1.3.0)
+ sslshake (1.3.1)
strings (0.1.8)
strings-ansi (~> 0.1)
unicode-display_width (~> 1.5)
@@ -352,7 +352,7 @@ GEM
thor (1.0.1)
tins (1.25.0)
sync
- tomlrb (1.3.0)
+ tomlrb (1.2.9)
train-core (3.3.1)
addressable (~> 2.5)
ffi (!= 1.13.0)
@@ -452,8 +452,8 @@ DEPENDENCIES
chefstyle!
ed25519
fauxhai-ng
- inspec-core (~> 4.18)
- inspec-core-bin (~> 4.18)
+ inspec-core (>= 4.20.6)
+ inspec-core-bin (>= 4.20.6)
ohai!
pry
pry-byebug
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index e91e6a4946..87bf6688c3 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,13 +1,12 @@
GIT
remote: https://github.com/chef/omnibus
- revision: 656496eaefadc4e5676eae5ad722acd6f8c22b2a
+ revision: d75718522deb9faeb3c21b50c60e94daf70ce9b6
branch: master
specs:
- omnibus (7.0.12)
+ omnibus (7.0.13)
aws-sdk-s3 (~> 1)
chef-cleanroom (~> 1.0)
chef-sugar (>= 3.3)
- ffi (< 1.13)
ffi-yajl (~> 2.2)
license_scout (~> 1.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -33,17 +32,17 @@ GEM
artifactory (3.0.15)
awesome_print (1.8.0)
aws-eventstream (1.1.0)
- aws-partitions (1.327.0)
- aws-sdk-core (3.98.0)
+ aws-partitions (1.329.0)
+ aws-sdk-core (3.100.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
- aws-sdk-kms (1.33.0)
- aws-sdk-core (~> 3, >= 3.71.0)
+ aws-sdk-kms (1.34.1)
+ aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.67.1)
- aws-sdk-core (~> 3, >= 3.96.1)
+ aws-sdk-s3 (1.68.1)
+ aws-sdk-core (~> 3, >= 3.99.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.1.4)
@@ -172,9 +171,9 @@ GEM
erubis (2.7.0)
faraday (1.0.1)
multipart-post (>= 1.2, < 3)
- ffi (1.12.1)
- ffi (1.12.1-x64-mingw32)
- ffi (1.12.1-x86-mingw32)
+ ffi (1.13.1)
+ ffi (1.13.1-x64-mingw32)
+ ffi (1.13.1-x86-mingw32)
ffi-libarchive (1.0.0)
ffi (~> 1.0)
ffi-win32-extensions (1.0.3)
@@ -275,7 +274,7 @@ GEM
progressbar (1.10.1)
proxifier (1.0.3)
public_suffix (4.0.5)
- rack (2.2.2)
+ rack (2.2.3)
rainbow (3.0.0)
retryable (3.0.5)
ruby-progressbar (1.10.1)
@@ -296,7 +295,7 @@ GEM
structured_warnings (0.4.0)
syslog-logger (1.6.8)
systemu (2.6.5)
- test-kitchen (2.5.1)
+ test-kitchen (2.5.2)
bcrypt_pbkdf (~> 1.0)
ed25519 (~> 1.2)
license-acceptance (~> 1.0, >= 1.0.11)
@@ -305,11 +304,11 @@ GEM
net-scp (>= 1.1, < 4.0)
net-ssh (>= 2.9, < 7.0)
net-ssh-gateway (>= 1.2, < 3.0)
- thor (~> 0.19)
+ thor (>= 0.19, < 2.0)
winrm (~> 2.0)
winrm-elevated (~> 1.0)
winrm-fs (~> 1.1)
- thor (0.20.3)
+ thor (1.0.1)
toml-rb (2.0.1)
citrus (~> 3.0, > 3.0)
tomlrb (1.3.0)