Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Batching multiple PRs into 1 for ease of bumping dependencies #1110

Merged
merged 1 commit into from
Apr 21, 2020
Merged

Batching multiple PRs into 1 for ease of bumping dependencies #1110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 21 additions & 22 deletions components/gems/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ GEM
artifactory (3.0.12)
ast (2.4.0)
aws-eventstream (1.1.0)
aws-partitions (1.296.0)
aws-partitions (1.299.0)
aws-sdk-apigateway (1.38.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sdk-apigatewayv2 (1.18.0)
aws-sdk-apigatewayv2 (1.19.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sdk-athena (1.24.0)
Expand All @@ -38,7 +38,7 @@ GEM
aws-sdk-budgets (1.28.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sdk-cloudformation (1.32.0)
aws-sdk-cloudformation (1.33.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sdk-cloudhsm (1.20.0)
Expand All @@ -50,7 +50,7 @@ GEM
aws-sdk-cloudtrail (1.21.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sdk-cloudwatch (1.35.0)
aws-sdk-cloudwatch (1.36.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sdk-cloudwatchlogs (1.29.0)
Expand Down Expand Up @@ -79,7 +79,7 @@ GEM
aws-sdk-dynamodb (1.45.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sdk-ec2 (1.152.0)
aws-sdk-ec2 (1.154.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sdk-ecr (1.26.0)
Expand Down Expand Up @@ -109,7 +109,7 @@ GEM
aws-sdk-firehose (1.25.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sdk-iam (1.35.0)
aws-sdk-iam (1.36.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sdk-kafka (1.19.0)
Expand All @@ -121,13 +121,13 @@ GEM
aws-sdk-kms (1.30.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sdk-lambda (1.38.0)
aws-sdk-lambda (1.39.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sdk-organizations (1.17.0)
aws-sdk-core (~> 3, >= 3.39.0)
aws-sigv4 (~> 1.0)
aws-sdk-rds (1.81.0)
aws-sdk-rds (1.82.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sdk-redshift (1.40.0)
Expand All @@ -142,11 +142,11 @@ GEM
aws-sdk-route53resolver (1.12.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.61.2)
aws-sdk-s3 (1.62.0)
aws-sdk-core (~> 3, >= 3.83.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
aws-sdk-securityhub (1.22.0)
aws-sdk-securityhub (1.23.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sdk-ses (1.28.0)
Expand All @@ -164,7 +164,7 @@ GEM
aws-sdk-ssm (1.73.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.1.1)
aws-sigv4 (1.1.2)
aws-eventstream (~> 1.0, >= 1.0.2)
axiom-types (0.1.1)
descendants_tracker (~> 0.0.4)
Expand Down Expand Up @@ -204,7 +204,7 @@ GEM
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
builder (3.2.4)
byebug (11.1.1)
byebug (11.1.2)
chef (15.8.23)
addressable
bcrypt_pbkdf (~> 1.0)
Expand Down Expand Up @@ -352,7 +352,7 @@ GEM
concurrent-ruby (1.1.6)
cookbook-omnifetch (0.9.1)
mixlib-archive (>= 0.4, < 2.0)
cookstyle (5.22.6)
cookstyle (5.23.0)
rubocop (= 0.75.1)
cucumber-core (3.2.1)
backports (>= 3.8.0)
Expand Down Expand Up @@ -549,7 +549,7 @@ GEM
test-kitchen
kitchen-hyperv (0.5.3)
test-kitchen (>= 1.4, < 3)
kitchen-inspec (1.3.1)
kitchen-inspec (1.3.2)
hashie (~> 3.4)
inspec (>= 1.47, < 5.0)
test-kitchen (>= 1.6, < 3)
Expand All @@ -559,7 +559,7 @@ GEM
test-kitchen (>= 1.4.1, < 3)
kitchen-vagrant (1.6.1)
test-kitchen (>= 1.4, < 3)
kitchen-vcenter (2.6.5)
kitchen-vcenter (2.7.0)
rbvmomi (>= 1.11, < 3.0)
test-kitchen (>= 1.16, < 3.0)
vsphere-automation-sdk (~> 0.4)
Expand All @@ -578,7 +578,7 @@ GEM
chef (>= 15.0)
excon (>= 0.50)
mixlib-shellout
knife-ec2 (1.0.33)
knife-ec2 (1.0.36)
aws-sdk-ec2 (~> 1.95)
aws-sdk-s3 (~> 1.43)
chef (>= 15.1)
Expand All @@ -589,7 +589,7 @@ GEM
knife-opc (0.4.4)
knife-push (1.1.5)
chef (>= 13.0)
knife-tidy (2.0.9)
knife-tidy (2.0.12)
knife-vcenter (4.0.0)
knife-cloud (>= 1.2, < 4.0)
rb-readline (~> 0.5)
Expand All @@ -609,7 +609,7 @@ GEM
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
libyajl2 (1.2.0)
license-acceptance (1.0.18)
license-acceptance (1.0.19)
pastel (~> 0.7)
tomlrb (~> 1.2)
tty-box (~> 0.3)
Expand Down Expand Up @@ -711,11 +711,11 @@ GEM
ffi-rzmq
ohai (>= 14.0, < 16.0)
uuidtools
optimist (3.0.0)
optimist (3.0.1)
os (1.1.0)
paint (1.0.1)
parallel (1.19.1)
parser (2.7.1.0)
parser (2.7.1.1)
ast (~> 2.4.0)
parslet (1.8.2)
pastel (0.7.3)
Expand Down Expand Up @@ -785,8 +785,7 @@ GEM
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.7)
ruby-prof (1.3.1)
ruby-prof (1.3.1-x64-mingw32)
ruby-prof (1.3.2)
ruby-progressbar (1.10.1)
ruby-shadow (2.5.0)
rubyntlm (0.6.2)
Expand Down
70 changes: 34 additions & 36 deletions omnibus/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
GIT
remote: https://github.com/chef/omnibus-software.git
revision: 305188638a1fa028a5674dd24b63fbccc09962c5
revision: eb8812bd870f3f268a7bef0448f84151eb0ccde9
branch: master
specs:
omnibus-software (4.0.0)
omnibus (>= 5.6.1)

GIT
remote: https://github.com/chef/omnibus.git
revision: f389917504c20839ff9607df63fb2e59e2c31b52
revision: fb089c39c178da353d1d89a1f4bd79b6cbb78b77
branch: master
specs:
omnibus (7.0.7)
omnibus (7.0.9)
aws-sdk-s3 (~> 1)
chef-cleanroom (~> 1.0)
chef-sugar (>= 3.3)
Expand All @@ -31,21 +31,21 @@ GEM
public_suffix (>= 2.0.2, < 5.0)
artifactory (3.0.12)
awesome_print (1.8.0)
aws-eventstream (1.0.3)
aws-partitions (1.287.0)
aws-sdk-core (3.92.0)
aws-eventstream (~> 1.0, >= 1.0.2)
aws-eventstream (1.1.0)
aws-partitions (1.299.0)
aws-sdk-core (3.94.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-kms (1.30.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.61.1)
aws-sdk-s3 (1.62.0)
aws-sdk-core (~> 3, >= 3.83.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.1.1)
aws-sigv4 (1.1.2)
aws-eventstream (~> 1.0, >= 1.0.2)
bcrypt_pbkdf (1.0.1)
bcrypt_pbkdf (1.0.1-x64-mingw32)
Expand All @@ -64,12 +64,12 @@ GEM
solve (~> 4.0)
thor (>= 0.20)
builder (3.2.4)
chef (15.8.23)
chef (15.9.17)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
chef-config (= 15.8.23)
chef-utils (= 15.8.23)
chef-config (= 15.9.17)
chef-utils (= 15.9.17)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
Expand All @@ -96,12 +96,12 @@ GEM
train-winrm (>= 0.2.5)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
chef (15.8.23-universal-mingw32)
chef (15.9.17-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
chef-config (= 15.8.23)
chef-utils (= 15.8.23)
chef-config (= 15.9.17)
chef-utils (= 15.9.17)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
Expand Down Expand Up @@ -141,18 +141,18 @@ GEM
win32-taskscheduler (~> 2.0)
wmi-lite (~> 1.0)
chef-cleanroom (1.0.2)
chef-config (15.8.23)
chef-config (15.9.17)
addressable
chef-utils (= 15.8.23)
chef-utils (= 15.9.17)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
tomlrb (~> 1.2)
chef-sugar (5.1.9)
chef-utils (15.8.23)
chef-zero (14.0.17)
chef-utils (15.9.17)
chef-zero (15.0.0)
ffi-yajl (~> 2.2)
hashie (>= 2.0, < 4.0)
hashie (>= 2.0, < 5.0)
mixlib-log (>= 2.0, < 4.0)
rack (~> 2.0, >= 2.0.6)
uuidtools (~> 2.1)
Expand All @@ -164,7 +164,7 @@ GEM
equatable (0.6.1)
erubi (1.9.0)
erubis (2.7.0)
faraday (1.0.0)
faraday (1.0.1)
multipart-post (>= 1.2, < 3)
ffi (1.12.2)
ffi (1.12.2-x64-mingw32)
Expand All @@ -180,11 +180,10 @@ GEM
ffi (>= 1.0.1)
gyoku (1.3.1)
builder (>= 2.1.2)
hashie (3.6.0)
hashie (4.1.0)
highline (1.7.10)
httpclient (2.8.3)
inifile (3.0.0)
iniparse (1.4.4)
iniparse (1.5.0)
iostruct (0.0.4)
ipaddress (0.8.3)
iso8601 (0.12.1)
Expand All @@ -193,12 +192,12 @@ GEM
kitchen-vagrant (1.6.1)
test-kitchen (>= 1.4, < 3)
libyajl2 (1.2.0)
license-acceptance (1.0.13)
license-acceptance (1.0.19)
pastel (~> 0.7)
tomlrb (~> 1.2)
tty-box (~> 0.3)
tty-prompt (~> 0.18)
license_scout (1.1.7)
license_scout (1.1.8)
ffi-yajl (~> 2.2)
mixlib-shellout (>= 2.2, < 4.0)
toml-rb (>= 1, < 3)
Expand All @@ -212,10 +211,10 @@ GEM
mixlib-archive (1.0.5-universal-mingw32)
mixlib-log
mixlib-authentication (3.0.6)
mixlib-cli (2.1.5)
mixlib-cli (2.1.6)
mixlib-config (3.0.6)
tomlrb
mixlib-install (3.11.28)
mixlib-install (3.12.1)
mixlib-shellout
mixlib-versioning
thor
Expand All @@ -240,10 +239,10 @@ GEM
net-ssh (>= 2.6.5)
net-ssh-gateway (>= 1.2.0)
nori (2.6.0)
octokit (4.16.0)
octokit (4.18.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
ohai (15.7.4)
ohai (15.8.0)
chef-config (>= 12.8, < 16)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
Expand All @@ -268,13 +267,13 @@ GEM
plist (3.5.0)
progressbar (1.10.1)
proxifier (1.0.3)
public_suffix (4.0.3)
public_suffix (4.0.4)
rack (2.2.2)
rainbow (3.0.0)
retryable (3.0.5)
ruby-progressbar (1.10.1)
rubyntlm (0.6.2)
rubyzip (2.2.0)
rubyzip (2.3.0)
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
Expand Down Expand Up @@ -307,9 +306,8 @@ GEM
toml-rb (2.0.1)
citrus (~> 3.0, > 3.0)
tomlrb (1.3.0)
train-core (3.2.20)
train-core (3.2.28)
addressable (~> 2.5)
inifile (~> 3.0)
json (>= 1.8, < 3.0)
mixlib-shellout (>= 2.0, < 4.0)
net-scp (>= 1.2, < 3.0)
Expand All @@ -323,7 +321,7 @@ GEM
tty-cursor (~> 0.7)
tty-color (0.5.1)
tty-cursor (0.7.1)
tty-prompt (0.20.0)
tty-prompt (0.21.0)
necromancer (~> 0.5.0)
pastel (~> 0.7.0)
tty-reader (~> 0.7.0)
Expand All @@ -332,7 +330,7 @@ GEM
tty-screen (~> 0.7)
wisper (~> 2.0.0)
tty-screen (0.7.1)
unicode-display_width (1.6.1)
unicode-display_width (1.7.0)
unicode_utils (1.4.0)
uuidtools (2.1.5)
win32-api (1.5.3-universal-mingw32)
Expand Down
2 changes: 1 addition & 1 deletion omnibus_overrides.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Expeditor takes that version, runs a script to replace it here and pushes a new
# commit / build through.

override "chef-analyze", version: "0.1.79"
override "chef-analyze", version: "0.1.84"
override "delivery-cli", version: "0.0.54"
override "chef-workstation-app", version: "v0.1.77"
# /DO NOT MODIFY
Expand Down