summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-12-06 15:14:18 -0800
committerGitHub <noreply@github.com>2019-12-06 15:14:18 -0800
commit8869b12992e3b266e81f9d9ca30fb442593a23c2 (patch)
tree9f90a8ff477646c248d5284b52026d6aa088ba20
parent52d2639707944dff045882b388a1a4179cb30d2a (diff)
parent0a19bc31be48e3a528135d0ca25eb0f0867ede9f (diff)
downloadchef-8869b12992e3b266e81f9d9ca30fb442593a23c2.tar.gz
Merge pull request #9143 from chef/bump_14_deps
Update Chef 14 deps to the latest + trim the install size
-rw-r--r--Gemfile.lock26
-rw-r--r--omnibus/Gemfile.lock75
2 files changed, 50 insertions, 51 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index d8a8ce9f73..4c28ad1742 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -117,13 +117,13 @@ GEM
docile (1.3.2)
equatable (0.6.1)
erubis (2.7.0)
- faraday (0.17.0)
+ faraday (0.17.1)
multipart-post (>= 1.2, < 3)
faraday_middleware (0.12.2)
faraday (>= 0.7.4, < 1.0)
- ffi (1.11.1)
- ffi (1.11.1-x64-mingw32)
- ffi (1.11.1-x86-mingw32)
+ ffi (1.11.3)
+ ffi (1.11.3-x64-mingw32)
+ ffi (1.11.3-x86-mingw32)
ffi-win32-extensions (1.0.3)
ffi
ffi-yajl (2.3.1)
@@ -178,7 +178,7 @@ GEM
wmi-lite (~> 1.0)
multi_json (1.14.1)
multipart-post (2.1.1)
- necromancer (0.5.0)
+ necromancer (0.5.1)
net-scp (2.0.0)
net-ssh (>= 2.6.5, < 6.0.0)
net-sftp (2.1.2)
@@ -202,7 +202,7 @@ GEM
plist (~> 3.1)
systemu (~> 2.6.4)
wmi-lite (~> 1.0)
- parallel (1.18.0)
+ parallel (1.19.1)
parser (2.6.5.0)
ast (~> 2.4.0)
parslet (1.8.2)
@@ -279,29 +279,29 @@ GEM
net-telnet (= 0.1.1)
sfl
sslshake (1.3.0)
- strings (0.1.6)
+ strings (0.1.8)
strings-ansi (~> 0.1)
unicode-display_width (~> 1.5)
unicode_utils (~> 1.4)
- strings-ansi (0.1.0)
+ strings-ansi (0.2.0)
structured_warnings (0.4.0)
syslog-logger (1.6.8)
systemu (2.6.5)
term-ansicolor (1.7.1)
tins (~> 1.0)
thor (0.20.3)
- tins (1.22.0)
- tomlrb (1.2.8)
+ tins (1.22.2)
+ tomlrb (1.2.9)
train-core (1.7.6)
json (>= 1.8, < 3.0)
mixlib-shellout (~> 2.0)
tty-color (0.5.0)
tty-cursor (0.7.0)
- tty-prompt (0.19.0)
+ tty-prompt (0.20.0)
necromancer (~> 0.5.0)
pastel (~> 0.7.0)
- tty-reader (~> 0.6.0)
- tty-reader (0.6.0)
+ tty-reader (~> 0.7.0)
+ tty-reader (0.7.0)
tty-cursor (~> 0.7)
tty-screen (~> 0.7)
wisper (~> 2.0.0)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 8676f7fa8c..ea8f2f32d9 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,12 +1,12 @@
GIT
remote: https://github.com/chef/omnibus
- revision: acdcf27e03545fac6014a995379b79f81840fd65
+ revision: 9fbb95fd6636a034874e9a7e3a1a02e4c8b74c2f
branch: master
specs:
- omnibus (6.1.11)
+ omnibus (6.1.18)
aws-sdk-s3 (~> 1)
chef-cleanroom (~> 1.0)
- chef-sugar-ng (>= 3.3)
+ chef-sugar (>= 3.3)
ffi-yajl (~> 2.2)
license_scout (~> 1.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -18,11 +18,10 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: 3f47c11c9ea3186faed62ff52e88d0f580a759ff
+ revision: bed563eb2e1872ab02b5cdaee07b3ef42491fd85
branch: master
specs:
omnibus-software (4.0.0)
- chef-sugar-ng (>= 5.0.0)
omnibus (>= 5.6.1)
GEM
@@ -33,17 +32,17 @@ GEM
artifactory (3.0.5)
awesome_print (1.8.0)
aws-eventstream (1.0.3)
- aws-partitions (1.232.0)
- aws-sdk-core (3.73.0)
+ aws-partitions (1.251.0)
+ aws-sdk-core (3.84.0)
aws-eventstream (~> 1.0, >= 1.0.2)
- aws-partitions (~> 1, >= 1.228.0)
+ aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
- aws-sdk-kms (1.25.0)
+ aws-sdk-kms (1.26.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.53.0)
- aws-sdk-core (~> 3, >= 3.71.0)
+ aws-sdk-s3 (1.59.0)
+ aws-sdk-core (~> 3, >= 3.83.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.1.0)
@@ -68,10 +67,10 @@ GEM
debug_inspector (>= 0.0.1)
builder (3.2.3)
byebug (11.0.1)
- chef (14.14.25)
+ chef (14.14.29)
addressable
bundler (>= 1.10)
- chef-config (= 14.14.25)
+ chef-config (= 14.14.29)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -98,10 +97,10 @@ GEM
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.14.25-universal-mingw32)
+ chef (14.14.29-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.14.25)
+ chef-config (= 14.14.29)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -141,13 +140,13 @@ GEM
win32-taskscheduler (~> 2.0)
wmi-lite (~> 1.0)
chef-cleanroom (1.0.2)
- chef-config (14.14.25)
+ chef-config (14.14.29)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
tomlrb (~> 1.2)
- chef-sugar-ng (5.0.4)
+ chef-sugar (5.1.9)
chef-zero (14.0.13)
ffi-yajl (~> 2.2)
hashie (>= 2.0, < 4.0)
@@ -164,11 +163,11 @@ GEM
equatable (0.6.1)
erubi (1.9.0)
erubis (2.7.0)
- faraday (0.17.0)
+ faraday (0.17.1)
multipart-post (>= 1.2, < 3)
- ffi (1.11.1)
- ffi (1.11.1-x64-mingw32)
- ffi (1.11.1-x86-mingw32)
+ ffi (1.11.3)
+ ffi (1.11.3-x64-mingw32)
+ ffi (1.11.3-x86-mingw32)
ffi-win32-extensions (1.0.3)
ffi
ffi-yajl (2.3.1)
@@ -194,9 +193,9 @@ GEM
tomlrb (~> 1.2)
tty-box (~> 0.3)
tty-prompt (~> 0.18)
- license_scout (1.0.28)
+ license_scout (1.0.29)
ffi-yajl (~> 2.2)
- mixlib-shellout (~> 2.2)
+ mixlib-shellout (>= 2.2, < 4.0)
toml-rb (~> 1.0)
little-plugger (1.1.4)
logging (2.2.2)
@@ -210,22 +209,22 @@ GEM
mixlib-log
mixlib-authentication (2.1.1)
mixlib-cli (2.1.1)
- mixlib-config (3.0.1)
+ mixlib-config (3.0.5)
tomlrb
mixlib-install (3.11.21)
mixlib-shellout
mixlib-versioning
thor
mixlib-log (3.0.1)
- mixlib-shellout (2.4.4)
- mixlib-shellout (2.4.4-universal-mingw32)
+ mixlib-shellout (3.0.7)
+ mixlib-shellout (3.0.7-universal-mingw32)
win32-process (~> 0.8.2)
wmi-lite (~> 1.0)
mixlib-versioning (1.2.7)
molinillo (0.6.6)
multi_json (1.14.1)
multipart-post (2.0.0)
- necromancer (0.5.0)
+ necromancer (0.5.1)
net-scp (2.0.0)
net-ssh (>= 2.6.5, < 6.0.0)
net-sftp (2.1.2)
@@ -275,7 +274,7 @@ GEM
pry (>= 0.9.11)
public_suffix (4.0.1)
rack (2.0.7)
- retryable (3.0.4)
+ retryable (3.0.5)
rspec (3.9.0)
rspec-core (~> 3.9.0)
rspec-expectations (~> 3.9.0)
@@ -297,7 +296,7 @@ GEM
rspec-core (>= 2, < 4, != 2.12.0)
ruby-progressbar (1.10.1)
rubyntlm (0.6.2)
- rubyzip (1.3.0)
+ rubyzip (2.0.0)
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
@@ -311,16 +310,16 @@ GEM
solve (4.0.2)
molinillo (~> 0.6)
semverse (>= 1.1, < 4.0)
- specinfra (2.82.3)
+ specinfra (2.82.4)
net-scp
net-ssh (>= 2.7)
net-telnet (= 0.1.1)
sfl
- strings (0.1.6)
+ strings (0.1.8)
strings-ansi (~> 0.1)
unicode-display_width (~> 1.5)
unicode_utils (~> 1.4)
- strings-ansi (0.1.0)
+ strings-ansi (0.2.0)
structured_warnings (0.4.0)
syslog-logger (1.6.8)
systemu (2.6.5)
@@ -340,18 +339,18 @@ GEM
thor (0.20.3)
toml-rb (1.1.2)
citrus (~> 3.0, > 3.0)
- tomlrb (1.2.8)
+ tomlrb (1.2.9)
tty-box (0.5.0)
pastel (~> 0.7.2)
strings (~> 0.1.6)
tty-cursor (~> 0.7)
tty-color (0.5.0)
tty-cursor (0.7.0)
- tty-prompt (0.19.0)
+ tty-prompt (0.20.0)
necromancer (~> 0.5.0)
pastel (~> 0.7.0)
- tty-reader (~> 0.6.0)
- tty-reader (0.6.0)
+ tty-reader (~> 0.7.0)
+ tty-reader (0.7.0)
tty-cursor (~> 0.7)
tty-screen (~> 0.7)
wisper (~> 2.0.0)
@@ -396,10 +395,10 @@ GEM
erubi (~> 1.8)
winrm (~> 2.0)
winrm-fs (~> 1.0)
- winrm-fs (1.3.3)
+ winrm-fs (1.3.4)
erubi (~> 1.8)
logging (>= 1.6.1, < 3.0)
- rubyzip (~> 1.1)
+ rubyzip (~> 2.0)
winrm (~> 2.0)
wisper (2.0.1)
wmi-lite (1.0.2)