summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjayashrig <jgarud@msystechnologies.com>2020-12-29 06:14:43 +0000
committerjayashrig158 <jgarud@msystechnologies.com>2020-12-29 06:30:52 +0000
commit15b7e5302d3f4328321108e8ca3641ba6f011ea7 (patch)
tree3d5a6408652ec3e8fc94939e6a41fcecc6ec5f2f
parent06a271a046f1e29ff9fbb29f5cf4a202e72b2a17 (diff)
downloadchef-jgarud/build_failure_chef_16.tar.gz
updated ohai version to 17jgarud/build_failure_chef_16
Signed-off-by: jayashrig158 <jgarud@msystechnologies.com
-rw-r--r--Gemfile.lock121
-rw-r--r--chef.gemspec2
-rw-r--r--omnibus/Gemfile.lock114
3 files changed, 32 insertions, 205 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 3c8a5520b4..d35bd9d46b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,19 +1,19 @@
GIT
remote: https://github.com/chef/chefstyle.git
- revision: 4beb76511e5e3e414bb88942c75f107eb56a9aa1
+ revision: d50b12c4b789910ce39bcfbee8b59cf793ca6b0b
branch: master
specs:
- chefstyle (1.5.7)
- rubocop (= 1.5.2)
+ chefstyle (1.5.8)
+ rubocop (= 1.6.1)
GIT
remote: https://github.com/chef/ohai.git
- revision: 1ad8c5946606a7f08ffb841e3682ae2d4991077f
+ revision: b90f861bb77d0364f208947e57a6579c7eb78fae
branch: master
specs:
- ohai (16.8.1)
- chef-config (>= 12.8, < 17)
- chef-utils (>= 16.0, < 17)
+ ohai (17.0.3)
+ chef-config (>= 12.8, < 18)
+ chef-utils (>= 16.0, < 18)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
ipaddress
@@ -54,7 +54,7 @@ PATH
net-sftp (>= 2.1.2, < 4.0)
net-ssh (>= 5.1, < 7)
net-ssh-multi (~> 1.2, >= 1.2.1)
- ohai (~> 16.0)
+ ohai (~> 17.0)
pastel
plist (~> 3.2)
proxifier (~> 1.0)
@@ -65,54 +65,6 @@ PATH
tty-screen (~> 0.6)
tty-table (~> 0.11)
uuidtools (~> 2.1.5)
- chef (16.9.3-universal-mingw32)
- addressable
- bcrypt_pbkdf (= 1.1.0.rc1)
- bundler (>= 1.10)
- chef-config (= 16.9.3)
- chef-utils (= 16.9.3)
- chef-vault
- chef-zero (>= 14.0.11)
- diff-lcs (>= 1.2.4, < 1.4.0)
- ed25519 (~> 1.2)
- erubis (~> 2.7)
- ffi (>= 1.9.25)
- ffi-libarchive (~> 1.0, >= 1.0.3)
- ffi-yajl (~> 2.2)
- highline (>= 1.6.9, < 3)
- iniparse (~> 1.4)
- inspec-core (~> 4.23)
- iso8601 (>= 0.12.1, < 0.14)
- license-acceptance (>= 1.0.5, < 3)
- mixlib-archive (>= 0.4, < 2.0)
- mixlib-authentication (>= 2.1, < 4)
- mixlib-cli (>= 2.1.1, < 3.0)
- mixlib-log (>= 2.0.3, < 4.0)
- mixlib-shellout (>= 3.1.1, < 4.0)
- net-sftp (>= 2.1.2, < 4.0)
- net-ssh (>= 5.1, < 7)
- net-ssh-multi (~> 1.2, >= 1.2.1)
- ohai (~> 16.0)
- pastel
- plist (~> 3.2)
- proxifier (~> 1.0)
- syslog-logger (~> 1.6)
- train-core (~> 3.2, >= 3.2.28)
- train-winrm (>= 0.2.5)
- tty-prompt (~> 0.21)
- tty-screen (~> 0.6)
- tty-table (~> 0.11)
- uuidtools (~> 2.1.5)
- win32-api (~> 1.5.3)
- win32-certstore (~> 0.3)
- win32-event (~> 0.6.1)
- win32-eventlog (= 0.6.3)
- win32-mmap (~> 0.4.1)
- win32-mutex (~> 0.4.2)
- win32-process (~> 0.9)
- win32-service (>= 2.1.5, < 3.0)
- win32-taskscheduler (~> 2.0)
- wmi-lite (~> 1.0)
PATH
remote: chef-bin
@@ -146,8 +98,6 @@ GEM
mixlib-shellout (>= 2.0, < 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)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
builder (3.2.4)
@@ -178,13 +128,9 @@ GEM
multipart-post (>= 1.2, < 3)
fauxhai-ng (8.6.0)
net-ssh
- ffi (1.13.1)
- ffi (1.13.1-x64-mingw32)
- ffi (1.13.1-x86-mingw32)
+ ffi (1.14.2)
ffi-libarchive (1.0.4)
ffi (~> 1.0)
- ffi-win32-extensions (1.0.4)
- ffi
ffi-yajl (2.3.4)
libyajl2 (~> 1.2)
fuzzyurl (0.9.0)
@@ -222,8 +168,7 @@ GEM
inspec-core-bin (4.24.8)
inspec-core (= 4.24.8)
ipaddress (0.8.3)
- iso8601 (0.13.0)
- json (2.4.0)
+ json (2.5.1)
libyajl2 (1.2.0)
license-acceptance (2.1.13)
pastel (~> 0.7)
@@ -237,8 +182,6 @@ GEM
method_source (1.0.0)
mixlib-archive (1.0.7)
mixlib-log
- mixlib-archive (1.0.7-universal-mingw32)
- mixlib-log
mixlib-authentication (3.0.7)
mixlib-cli (2.1.8)
mixlib-config (3.0.9)
@@ -246,11 +189,6 @@ GEM
mixlib-log (3.0.9)
mixlib-shellout (3.2.2)
chef-utils
- mixlib-shellout (3.2.2-universal-mingw32)
- chef-utils
- ffi-win32-extensions (~> 1.0.3)
- win32-process (~> 0.9)
- wmi-lite (~> 1.0)
multi_json (1.15.0)
multipart-post (2.1.1)
net-scp (3.0.0)
@@ -284,9 +222,9 @@ GEM
public_suffix (4.0.6)
rack (2.2.3)
rainbow (3.0.0)
- rake (13.0.1)
+ rake (13.0.3)
rb-readline (0.5.5)
- regexp_parser (2.0.0)
+ regexp_parser (2.0.1)
rexml (3.2.4)
rspec (3.9.0)
rspec-core (~> 3.9.0)
@@ -304,7 +242,7 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-support (3.9.4)
- rubocop (1.5.2)
+ rubocop (1.6.1)
parallel (~> 1.10)
parser (>= 2.7.1.5)
rainbow (>= 2.2.2, < 4.0)
@@ -327,7 +265,6 @@ GEM
unicode-display_width (~> 1.5)
unicode_utils (~> 1.4)
strings-ansi (0.2.0)
- structured_warnings (0.4.0)
syslog-logger (1.6.8)
thor (1.0.1)
tomlrb (1.2.9)
@@ -342,7 +279,7 @@ GEM
winrm (~> 2.0)
winrm-elevated (~> 1.2.2)
winrm-fs (~> 1.0)
- tty-box (0.6.0)
+ tty-box (0.7.0)
pastel (~> 0.8)
strings (~> 0.2.0)
tty-cursor (~> 0.7)
@@ -363,32 +300,10 @@ GEM
unicode-display_width (1.7.0)
unicode_utils (1.4.0)
uuidtools (2.1.5)
- webmock (3.10.0)
+ webmock (3.11.0)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
- win32-api (1.5.3-universal-mingw32)
- win32-certstore (0.4.1)
- ffi
- mixlib-shellout
- win32-event (0.6.3)
- win32-ipc (>= 0.6.0)
- win32-eventlog (0.6.3)
- ffi
- win32-ipc (0.7.0)
- ffi
- win32-mmap (0.4.2)
- ffi
- win32-mutex (0.4.3)
- win32-ipc (>= 0.6.0)
- win32-process (0.9.0)
- ffi (>= 1.0.0)
- win32-service (2.2.0)
- ffi
- ffi-win32-extensions
- win32-taskscheduler (2.0.4)
- ffi
- structured_warnings
winrm (2.3.5)
builder (>= 2.1.2)
erubi (~> 1.8)
@@ -411,9 +326,7 @@ GEM
wmi-lite (1.0.5)
PLATFORMS
- ruby
- x64-mingw32
- x86-mingw32
+ x86_64-linux
DEPENDENCIES
appbundler
@@ -439,4 +352,4 @@ DEPENDENCIES
webmock
BUNDLED WITH
- 2.1.4
+ 2.2.2
diff --git a/chef.gemspec b/chef.gemspec
index 876ee3f513..a41dffa741 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
s.add_dependency "mixlib-authentication", ">= 2.1", "< 4"
s.add_dependency "mixlib-shellout", ">= 3.1.1", "< 4.0"
s.add_dependency "mixlib-archive", ">= 0.4", "< 2.0"
- s.add_dependency "ohai", "~> 16.0"
+ s.add_dependency "ohai", "~> 17.0"
s.add_dependency "inspec-core", "~> 4.23"
s.add_dependency "ffi", ">= 1.9.25"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 228db504f0..6bce4c5f52 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/chef/omnibus
- revision: d13ae1686e8b54e065ce2a3f27585a2890f1abec
+ revision: 7e26b8909b1daf7485a34afc4cc2428dc163c176
branch: master
specs:
- omnibus (8.0.9)
+ omnibus (8.0.10)
aws-sdk-s3 (~> 1)
chef-cleanroom (~> 1.0)
chef-utils (>= 15.4)
@@ -18,7 +18,7 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: aa93b0f3c21f75508b28c1c1e016b1aa11ecf3a9
+ revision: e7c643ea102ad48aaeeffa0687cb63d6be7bf6d4
branch: master
specs:
omnibus-software (4.0.0)
@@ -32,24 +32,22 @@ GEM
artifactory (3.0.15)
awesome_print (1.8.0)
aws-eventstream (1.1.0)
- aws-partitions (1.407.0)
+ aws-partitions (1.413.0)
aws-sdk-core (3.110.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
- aws-sdk-kms (1.39.0)
+ aws-sdk-kms (1.40.0)
aws-sdk-core (~> 3, >= 3.109.0)
aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.86.2)
+ aws-sdk-s3 (1.87.0)
aws-sdk-core (~> 3, >= 3.109.0)
- aws-sdk-kms (~> 1.26)
+ aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.2.2)
aws-eventstream (~> 1, >= 1.0.2)
bcrypt_pbkdf (1.1.0.rc1)
- bcrypt_pbkdf (1.1.0.rc1-x64-mingw32)
- bcrypt_pbkdf (1.1.0.rc1-x86-mingw32)
berkshelf (7.1.0)
chef (>= 15.7.32)
chef-config
@@ -100,53 +98,6 @@ GEM
tty-screen (~> 0.6)
tty-table (~> 0.11)
uuidtools (~> 2.1.5)
- chef (16.7.61-universal-mingw32)
- addressable
- bcrypt_pbkdf (= 1.1.0.rc1)
- bundler (>= 1.10)
- chef-config (= 16.7.61)
- chef-utils (= 16.7.61)
- chef-vault
- chef-zero (>= 14.0.11)
- diff-lcs (>= 1.2.4, < 1.4.0)
- ed25519 (~> 1.2)
- erubis (~> 2.7)
- ffi (>= 1.9.25)
- ffi-libarchive (~> 1.0, >= 1.0.3)
- ffi-yajl (~> 2.2)
- highline (>= 1.6.9, < 3)
- iniparse (~> 1.4)
- iso8601 (>= 0.12.1, < 0.14)
- license-acceptance (>= 1.0.5, < 3)
- mixlib-archive (>= 0.4, < 2.0)
- mixlib-authentication (>= 2.1, < 4)
- mixlib-cli (>= 2.1.1, < 3.0)
- mixlib-log (>= 2.0.3, < 4.0)
- mixlib-shellout (>= 3.1.1, < 4.0)
- net-sftp (>= 2.1.2, < 4.0)
- net-ssh (>= 4.2, < 7)
- net-ssh-multi (~> 1.2, >= 1.2.1)
- ohai (~> 16.0)
- pastel
- plist (~> 3.2)
- proxifier (~> 1.0)
- syslog-logger (~> 1.6)
- train-core (~> 3.2, >= 3.2.28)
- train-winrm (>= 0.2.5)
- tty-prompt (~> 0.21)
- tty-screen (~> 0.6)
- tty-table (~> 0.11)
- uuidtools (~> 2.1.5)
- win32-api (~> 1.5.3)
- win32-certstore (~> 0.3)
- win32-event (~> 0.6.1)
- win32-eventlog (= 0.6.3)
- win32-mmap (~> 0.4.1)
- win32-mutex (~> 0.4.2)
- win32-process (~> 0.9)
- win32-service (>= 2.1.5, < 3.0)
- win32-taskscheduler (~> 2.0)
- wmi-lite (~> 1.0)
chef-cleanroom (1.0.2)
chef-config (16.7.61)
addressable
@@ -170,16 +121,12 @@ GEM
ed25519 (1.2.4)
erubi (1.10.0)
erubis (2.7.0)
- faraday (1.1.0)
+ faraday (1.2.0)
multipart-post (>= 1.2, < 3)
ruby2_keywords
- ffi (1.13.1)
- ffi (1.13.1-x64-mingw32)
- ffi (1.13.1-x86-mingw32)
+ ffi (1.14.2)
ffi-libarchive (1.0.4)
ffi (~> 1.0)
- ffi-win32-extensions (1.0.4)
- ffi
ffi-yajl (2.3.4)
libyajl2 (~> 1.2)
fuzzyurl (0.9.0)
@@ -193,9 +140,8 @@ GEM
iniparse (1.5.0)
iostruct (0.0.4)
ipaddress (0.8.3)
- iso8601 (0.13.0)
jmespath (1.4.0)
- json (2.4.0)
+ json (2.5.1)
kitchen-vagrant (1.7.2)
test-kitchen (>= 1.4, < 3)
libyajl2 (1.2.0)
@@ -215,8 +161,6 @@ GEM
minitar (0.9)
mixlib-archive (1.0.7)
mixlib-log
- mixlib-archive (1.0.7-universal-mingw32)
- mixlib-log
mixlib-authentication (3.0.7)
mixlib-cli (2.1.8)
mixlib-config (3.0.9)
@@ -228,11 +172,6 @@ GEM
mixlib-log (3.0.9)
mixlib-shellout (3.2.2)
chef-utils
- mixlib-shellout (3.2.2-universal-mingw32)
- chef-utils
- ffi-win32-extensions (~> 1.0.3)
- win32-process (~> 0.9)
- wmi-lite (~> 1.0)
mixlib-versioning (1.2.12)
molinillo (0.7.0)
multi_json (1.15.0)
@@ -294,9 +233,8 @@ GEM
unicode-display_width (~> 1.5)
unicode_utils (~> 1.4)
strings-ansi (0.2.0)
- structured_warnings (0.4.0)
syslog-logger (1.6.8)
- test-kitchen (2.8.0)
+ test-kitchen (2.9.0)
bcrypt_pbkdf (~> 1.0)
ed25519 (~> 1.2)
license-acceptance (>= 1.0.11, < 3.0)
@@ -324,7 +262,7 @@ GEM
winrm (~> 2.0)
winrm-elevated (~> 1.2.2)
winrm-fs (~> 1.0)
- tty-box (0.6.0)
+ tty-box (0.7.0)
pastel (~> 0.8)
strings (~> 0.2.0)
tty-cursor (~> 0.7)
@@ -345,28 +283,6 @@ GEM
unicode-display_width (1.7.0)
unicode_utils (1.4.0)
uuidtools (2.1.5)
- win32-api (1.5.3-universal-mingw32)
- win32-certstore (0.4.1)
- ffi
- mixlib-shellout
- win32-event (0.6.3)
- win32-ipc (>= 0.6.0)
- win32-eventlog (0.6.3)
- ffi
- win32-ipc (0.7.0)
- ffi
- win32-mmap (0.4.2)
- ffi
- win32-mutex (0.4.3)
- win32-ipc (>= 0.6.0)
- win32-process (0.9.0)
- ffi (>= 1.0.0)
- win32-service (2.2.0)
- ffi
- ffi-win32-extensions
- win32-taskscheduler (2.0.4)
- ffi
- structured_warnings
winrm (2.3.5)
builder (>= 2.1.2)
erubi (~> 1.8)
@@ -390,9 +306,7 @@ GEM
zhexdump (0.0.2)
PLATFORMS
- ruby
- x64-mingw32
- x86-mingw32
+ x86_64-linux
DEPENDENCIES
artifactory
@@ -406,4 +320,4 @@ DEPENDENCIES
winrm-fs (~> 1.0)
BUNDLED WITH
- 2.1.4
+ 2.2.2