summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Gemfile4
-rw-r--r--Gemfile.lock127
-rw-r--r--acceptance/Gemfile.lock20
-rw-r--r--chef-config/chef-config.gemspec2
-rw-r--r--kitchen-tests/Berksfile.lock19
-rw-r--r--kitchen-tests/Gemfile.lock37
-rw-r--r--omnibus/Gemfile.lock42
-rw-r--r--omnibus_overrides.rb2
-rw-r--r--version_policy.rb14
9 files changed, 163 insertions, 104 deletions
diff --git a/Gemfile b/Gemfile
index 9327fb539a..33ac507fa4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -75,11 +75,15 @@ end
group(:changelog) do
gem "github_changelog_generator"
+ # Until https://github.com/piotrmurach/github/pull/274 is merged
+ gem "github_api", git: "https://github.com/jkeiser/github.git", branch: "pin-less"
end
group(:travis) do
# See `bundler-audit` in .travis.yml
gem "bundler-audit", git: "https://github.com/rubysec/bundler-audit.git"
+ # Until https://github.com/travis-ci/travis.rb/pull/426 is merged
+ gem "travis", git: "https://github.com/jkeiser/travis.rb", branch: "update-typheous"
end
instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"]
diff --git a/Gemfile.lock b/Gemfile.lock
index 3f9bacc645..5d3f00789a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,14 +1,41 @@
GIT
remote: https://github.com/chef/chefstyle.git
- revision: 52a0d55a9e8fb30d067c0a66371db4ae781a0269
+ revision: b4c1c5ae0b0ec824a1561523a79c0ff30f167a5e
branch: master
specs:
chefstyle (0.3.1)
rubocop (= 0.39.0)
GIT
+ remote: https://github.com/jkeiser/github.git
+ revision: 77ddc2f14fb19ca677987752afedf4044fbd929c
+ branch: pin-less
+ specs:
+ github_api (0.14.4)
+ addressable (~> 2.4.0)
+ descendants_tracker (~> 0.0.4)
+ faraday (~> 0.8, < 0.10)
+ hashie (>= 3.4)
+ oauth2 (~> 1.0)
+
+GIT
+ remote: https://github.com/jkeiser/travis.rb
+ revision: 279c289a0fbeff984949bd7d266723c547c59c96
+ branch: update-typheous
+ specs:
+ travis (1.8.2)
+ backports
+ faraday (~> 0.9)
+ faraday_middleware (~> 0.9, >= 0.9.1)
+ gh (~> 0.13)
+ highline (~> 1.6)
+ launchy (~> 2.1)
+ pusher-client (~> 0.4)
+ typhoeus (~> 1.0)
+
+GIT
remote: https://github.com/rubysec/bundler-audit.git
- revision: b16b26e0a4eed474f5f1ee38c22030a2f617ffc8
+ revision: b7123d7b294f244165d9469f22b37a559e235fc2
specs:
bundler-audit (0.5.0)
bundler (~> 1.2)
@@ -89,7 +116,7 @@ PATH
remote: chef-config
specs:
chef-config (12.13.24)
- fuzzyurl (~> 0.8.0)
+ fuzzyurl
mixlib-config (~> 2.0)
mixlib-shellout (~> 2.0)
@@ -101,23 +128,24 @@ GEM
mixlib-cli (~> 1.4)
artifactory (2.3.3)
ast (2.3.0)
- aws-sdk (2.3.19)
- aws-sdk-resources (= 2.3.19)
- aws-sdk-core (2.3.19)
+ aws-sdk (2.5.0)
+ aws-sdk-resources (= 2.5.0)
+ aws-sdk-core (2.5.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.3.19)
- aws-sdk-core (= 2.3.19)
+ aws-sdk-resources (2.5.0)
+ aws-sdk-core (= 2.5.0)
aws-sdk-v1 (1.66.0)
json (~> 1.4)
nokogiri (>= 1.4.4)
+ backports (3.6.8)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
builder (3.2.2)
byebug (9.0.5)
- chef-api (0.6.0)
+ chef-api (0.7.0)
logify (~> 0.1)
mime-types
- chef-provisioning (1.8.0)
+ chef-provisioning (1.8.1)
cheffish (>= 1.3.1, < 3.0)
inifile (>= 2.0.2)
mixlib-install (~> 1.0)
@@ -132,14 +160,14 @@ GEM
retryable (~> 2.0, >= 2.0.1)
ubuntu_ami (~> 0.4, >= 0.4.1)
chef-rewind (0.0.9)
- chef-sugar (3.3.0)
+ chef-sugar (3.4.0)
chef-zero (4.8.0)
ffi-yajl (~> 2.2)
hashie (>= 2.0, < 4.0)
mixlib-log (~> 1.3)
rack (< 2)
uuidtools (~> 2.1)
- cheffish (2.0.4)
+ cheffish (2.0.5)
chef-zero (~> 4.3)
compat_resource
chefspec (4.7.0)
@@ -148,7 +176,7 @@ GEM
rspec (~> 3.0)
coderay (1.1.1)
colorize (0.8.1)
- compat_resource (12.10.6)
+ compat_resource (12.10.7)
cucumber-core (1.5.0)
gherkin (~> 4.0)
debug_inspector (0.0.2)
@@ -157,17 +185,21 @@ GEM
diff-lcs (1.2.5)
docile (1.1.5)
erubis (2.7.0)
+ ethon (0.9.0)
+ ffi (>= 1.3.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
- fauxhai (3.6.0)
+ faraday_middleware (0.10.0)
+ faraday (>= 0.7.4, < 0.10)
+ fauxhai (3.7.0)
net-ssh
- ffi (1.9.10)
- ffi (1.9.10-x86-mingw32)
+ ffi (1.9.14)
+ ffi (1.9.14-x86-mingw32)
ffi-win32-extensions (1.0.2)
ffi
- ffi-yajl (2.2.3)
+ ffi-yajl (2.3.0)
libyajl2 (~> 1.2)
- foodcritic (6.3.0)
+ foodcritic (7.0.1)
cucumber-core (>= 1.3)
erubis
nokogiri (>= 1.5, < 2.0)
@@ -175,15 +207,16 @@ GEM
rufus-lru (~> 1.0)
treetop (~> 1.4)
yajl-ruby (~> 1.1)
- fuzzyurl (0.8.0)
+ fuzzyurl (0.9.0)
+ gh (0.14.0)
+ addressable
+ backports
+ faraday (~> 0.8)
+ multi_json (~> 1.0)
+ net-http-persistent (>= 2.7)
+ net-http-pipeline
gherkin (4.0.0)
- github_api (0.14.2)
- addressable (~> 2.4.0)
- descendants_tracker (~> 0.0.4)
- faraday (~> 0.8, < 0.10)
- hashie (>= 3.4)
- oauth2
- github_changelog_generator (1.12.1)
+ github_changelog_generator (1.13.1)
colorize (~> 0.7)
github_api (~> 0.12)
rake (>= 10.0)
@@ -202,13 +235,13 @@ GEM
inifile (3.0.0)
iniparse (1.4.2)
ipaddress (0.8.3)
- jmespath (1.2.4)
- json_pure (>= 1.8.1)
+ jmespath (1.3.1)
json (1.8.3)
- json_pure (1.8.3)
- jwt (1.5.1)
- knife-windows (1.4.1)
+ jwt (1.5.4)
+ knife-windows (1.5.0)
winrm (~> 1.7)
+ launchy (2.4.3)
+ addressable (~> 2.3)
libyajl2 (1.2.0)
little-plugger (1.1.4)
logging (2.1.0)
@@ -239,6 +272,8 @@ GEM
multi_json (1.12.1)
multi_xml (0.5.5)
multipart-post (2.0.0)
+ net-http-persistent (2.9.4)
+ net-http-pipeline (1.0.1)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
@@ -258,9 +293,9 @@ GEM
mini_portile2 (~> 2.1.0)
pkg-config (~> 1.1.7)
nori (2.6.0)
- oauth2 (1.1.0)
+ oauth2 (1.2.0)
faraday (>= 0.8, < 0.10)
- jwt (~> 1.0, < 1.5.2)
+ jwt (~> 1.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
@@ -287,7 +322,7 @@ GEM
polyglot (0.3.5)
powerpack (0.1.1)
proxifier (1.0.3)
- pry (0.10.3)
+ pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
@@ -300,16 +335,19 @@ GEM
pry-stack_explorer (0.4.9.2)
binding_of_caller (>= 0.7)
pry (>= 0.9.11)
+ pusher-client (0.6.2)
+ json
+ websocket (~> 1.0)
rack (1.6.4)
rainbow (2.1.0)
rake (11.2.2)
rb-readline (0.5.3)
- retryable (2.0.3)
+ retryable (2.0.4)
rspec (3.5.0)
rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0)
rspec-mocks (~> 3.5.0)
- rspec-core (3.5.1)
+ rspec-core (3.5.2)
rspec-support (~> 3.5.0)
rspec-expectations (3.5.0)
diff-lcs (>= 1.2.0, < 2.0)
@@ -344,13 +382,13 @@ GEM
rspec-its
specinfra (~> 2.53)
sfl (2.2)
- simplecov (0.11.2)
+ simplecov (0.12.0)
docile (~> 1.1.0)
- json (~> 1.8)
+ json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
slop (3.6.0)
- specinfra (2.59.4)
+ specinfra (2.60.2)
net-scp
net-ssh (>= 2.7, < 4.0)
net-telnet
@@ -362,12 +400,15 @@ GEM
systemu (2.6.5)
thor (0.19.1)
thread_safe (0.3.5)
- tomlrb (1.2.2)
- treetop (1.6.5)
+ tomlrb (1.2.3)
+ treetop (1.6.8)
polyglot (~> 0.3)
+ typhoeus (1.1.0)
+ ethon (>= 0.9.0)
ubuntu_ami (0.4.1)
unicode-display_width (1.1.0)
uuidtools (2.1.5)
+ websocket (1.2.3)
win32-api (1.5.3-universal-mingw32)
win32-dir (0.5.1)
ffi (>= 1.0.0)
@@ -398,7 +439,7 @@ GEM
rubyntlm (~> 0.6.0)
wmi-lite (1.0.0)
yajl-ruby (1.2.1)
- yard (0.8.7.6)
+ yard (0.9.5)
PLATFORMS
ruby
@@ -418,6 +459,7 @@ DEPENDENCIES
chefspec
chefstyle!
foodcritic
+ github_api!
github_changelog_generator
halite
knife-windows
@@ -436,6 +478,7 @@ DEPENDENCIES
ruby-shadow
simplecov
tomlrb
+ travis!
yard
BUNDLED WITH
diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock
index ff9d439b5b..3a3c30820d 100644
--- a/acceptance/Gemfile.lock
+++ b/acceptance/Gemfile.lock
@@ -22,7 +22,7 @@ GIT
GIT
remote: git://github.com/mwrock/kitchen-inspec.git
- revision: d63240a44667974070298ad4fca20394257c92bd
+ revision: 5c00e1d66fa3b459e0a504ed08d0550c31f35b06
branch: winrm-v2
specs:
kitchen-inspec (0.14.0)
@@ -64,7 +64,7 @@ GIT
GIT
remote: git://github.com/winrb/winrm.git
- revision: 0f35bbd963024b32cc8e262f25e6110c6abf5794
+ revision: 3e50c963b935d046099a5afb295cf01f8030e43e
branch: winrm-v2
specs:
winrm (2.0.0)
@@ -82,12 +82,12 @@ GEM
specs:
addressable (2.4.0)
artifactory (2.3.3)
- aws-sdk (2.4.2)
- aws-sdk-resources (= 2.4.2)
- aws-sdk-core (2.4.2)
+ aws-sdk (2.5.0)
+ aws-sdk-resources (= 2.5.0)
+ aws-sdk-core (2.5.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.4.2)
- aws-sdk-core (= 2.4.2)
+ aws-sdk-resources (2.5.0)
+ aws-sdk-core (= 2.5.0)
berkshelf (4.3.5)
addressable (~> 2.3, >= 2.3.4)
berkshelf-api-client (~> 2.0, >= 2.0.2)
@@ -114,7 +114,7 @@ GEM
buff-extensions (~> 1.0)
varia_model (~> 0.4)
buff-extensions (1.0.0)
- buff-ignore (1.1.1)
+ buff-ignore (1.2.0)
buff-ruby_engine (0.1.0)
buff-shell_out (0.2.0)
buff-ruby_engine (~> 0.1.0)
@@ -131,7 +131,7 @@ GEM
cleanroom (1.0.0)
coderay (1.1.1)
diff-lcs (1.2.5)
- docker-api (1.29.1)
+ docker-api (1.29.2)
excon (>= 0.38.0)
json
erubis (2.7.0)
@@ -224,7 +224,7 @@ GEM
rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0)
rspec-mocks (~> 3.5.0)
- rspec-core (3.5.1)
+ rspec-core (3.5.2)
rspec-support (~> 3.5.0)
rspec-expectations (3.5.0)
diff-lcs (>= 1.2.0, < 2.0)
diff --git a/chef-config/chef-config.gemspec b/chef-config/chef-config.gemspec
index 307112126e..3d6243b898 100644
--- a/chef-config/chef-config.gemspec
+++ b/chef-config/chef-config.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
spec.add_dependency "mixlib-shellout", "~> 2.0"
spec.add_dependency "mixlib-config", "~> 2.0"
- spec.add_dependency "fuzzyurl", "~> 0.8.0"
+ spec.add_dependency "fuzzyurl"
spec.add_development_dependency "rake", "~> 10.0"
diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock
index eeecf4954f..e54aace074 100644
--- a/kitchen-tests/Berksfile.lock
+++ b/kitchen-tests/Berksfile.lock
@@ -30,19 +30,19 @@ GRAPH
ubuntu (>= 0.0.0)
users (>= 0.0.0)
yum-epel (>= 0.0.0)
- build-essential (6.0.0)
+ build-essential (6.0.3)
compat_resource (>= 12.10)
mingw (>= 1.1)
seven_zip (>= 0.0.0)
- chef-client (4.6.0)
+ chef-client (5.0.0)
cron (>= 1.7.0)
logrotate (>= 1.9.0)
windows (>= 1.42.0)
- chef-sugar (3.3.0)
+ chef-sugar (3.4.0)
chef_handler (1.4.0)
chef_hostname (0.4.1)
compat_resource (>= 0.0.0)
- compat_resource (12.10.6)
+ compat_resource (12.10.7)
cron (1.7.6)
database (2.3.1)
aws (>= 0.0.0)
@@ -53,8 +53,9 @@ GRAPH
iis (4.1.10)
windows (>= 1.34.6)
iptables (2.2.0)
- logrotate (1.9.2)
- mingw (1.2.2)
+ logrotate (2.1.0)
+ compat_resource (>= 0.0.0)
+ mingw (1.2.4)
compat_resource (>= 0.0.0)
seven_zip (>= 0.0.0)
multipackage (3.0.28)
@@ -68,7 +69,7 @@ GRAPH
compat_resource (>= 0.0.0)
ntp (2.0.0)
windows (>= 1.38.0)
- ohai (4.1.1)
+ ohai (4.2.0)
compat_resource (>= 12.10)
openssh (2.0.0)
iptables (>= 1.0)
@@ -92,7 +93,7 @@ GRAPH
sudo (2.9.0)
ubuntu (1.2.0)
apt (>= 0.0.0)
- users (2.0.3)
+ users (3.0.0)
webapp (0.1.0)
apache2 (~> 3.2.2)
database (~> 2.3.1)
@@ -107,5 +108,5 @@ GRAPH
yum (3.11.0)
yum-epel (0.7.0)
yum (>= 3.6.3)
- yum-mysql-community (0.2.0)
+ yum-mysql-community (0.3.0)
yum (>= 3.2)
diff --git a/kitchen-tests/Gemfile.lock b/kitchen-tests/Gemfile.lock
index edc91cc8b2..278d2f5465 100644
--- a/kitchen-tests/Gemfile.lock
+++ b/kitchen-tests/Gemfile.lock
@@ -3,12 +3,12 @@ GEM
specs:
addressable (2.4.0)
artifactory (2.3.3)
- aws-sdk (2.3.21)
- aws-sdk-resources (= 2.3.21)
- aws-sdk-core (2.3.21)
+ aws-sdk (2.5.0)
+ aws-sdk-resources (= 2.5.0)
+ aws-sdk-core (2.5.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.3.21)
- aws-sdk-core (= 2.3.21)
+ aws-sdk-resources (2.5.0)
+ aws-sdk-core (= 2.5.0)
berkshelf (4.3.5)
addressable (~> 2.3, >= 2.3.4)
berkshelf-api-client (~> 2.0, >= 2.0.2)
@@ -35,7 +35,7 @@ GEM
buff-extensions (~> 1.0)
varia_model (~> 0.4)
buff-extensions (1.0.0)
- buff-ignore (1.1.1)
+ buff-ignore (1.2.0)
buff-ruby_engine (0.1.0)
buff-shell_out (0.2.0)
buff-ruby_engine (~> 0.1.0)
@@ -52,7 +52,7 @@ GEM
cleanroom (1.0.0)
coderay (1.1.1)
diff-lcs (1.2.5)
- docker-api (1.29.0)
+ docker-api (1.29.2)
excon (>= 0.38.0)
json
erubis (2.7.0)
@@ -60,6 +60,7 @@ GEM
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.14)
+ ffi (1.9.14-x86-mingw32)
fuzzyurl (0.8.0)
gssapi (1.2.0)
ffi (>= 1.0.1)
@@ -67,8 +68,9 @@ GEM
builder (>= 2.1.2)
hashie (3.4.4)
hitimes (1.2.4)
+ hitimes (1.2.4-x86-mingw32)
httpclient (2.7.2)
- inspec (0.27.0)
+ inspec (0.28.1)
hashie (~> 3.4)
json (~> 1.8)
method_source (~> 0.8)
@@ -79,19 +81,19 @@ GEM
rubyzip (~> 1.1)
thor (~> 0.19)
train (>= 0.15.1, < 1.0)
- jmespath (1.3.0)
+ jmespath (1.3.1)
json (1.8.3)
kitchen-appbundle-updater (0.1.2)
kitchen-dokken (0.0.31)
docker-api (~> 1.29)
test-kitchen (~> 1.5)
- kitchen-ec2 (1.0.0)
+ kitchen-ec2 (1.0.1)
aws-sdk (~> 2)
excon
multi_json
retryable (~> 2.0)
test-kitchen (~> 1.4, >= 1.4.1)
- kitchen-inspec (0.14.0)
+ kitchen-inspec (0.15.0)
inspec (>= 0.22.0, < 1.0.0)
test-kitchen (~> 1.6)
kitchen-vagrant (0.20.0)
@@ -113,6 +115,9 @@ GEM
mixlib-versioning
mixlib-log (1.6.0)
mixlib-shellout (2.2.6)
+ mixlib-shellout (2.2.6-universal-mingw32)
+ win32-process (~> 0.8.2)
+ wmi-lite (~> 1.0)
mixlib-versioning (1.1.0)
molinillo (0.4.5)
multi_json (1.12.1)
@@ -129,8 +134,8 @@ GEM
method_source (~> 0.8.1)
slop (~> 3.4)
rainbow (2.1.0)
- retryable (2.0.3)
- ridley (4.5.1)
+ retryable (2.0.4)
+ ridley (4.6.0)
addressable
buff-config (~> 1.0)
buff-extensions (~> 1.0)
@@ -152,7 +157,7 @@ GEM
rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0)
rspec-mocks (~> 3.5.0)
- rspec-core (3.5.1)
+ rspec-core (3.5.2)
rspec-support (~> 3.5.0)
rspec-expectations (3.5.0)
diff-lcs (>= 1.2.0, < 2.0)
@@ -197,6 +202,8 @@ GEM
varia_model (0.4.1)
buff-extensions (~> 1.0)
hashie (>= 2.0.2, < 4.0.0)
+ win32-process (0.8.3)
+ ffi (>= 1.0.0)
winrm (1.8.1)
builder (>= 2.1.2)
gssapi (~> 1.2)
@@ -210,9 +217,11 @@ GEM
logging (>= 1.6.1, < 3.0)
rubyzip (~> 1.1)
winrm (~> 1.5)
+ wmi-lite (1.0.0)
PLATFORMS
ruby
+ x86-mingw32
DEPENDENCIES
berkshelf
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index f8cfeec014..a414225c4c 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,13 +1,14 @@
GIT
remote: https://github.com/chef/omnibus-software.git
- revision: 5e767a6d220f024256439b0a8415eefe923967dc
+ revision: f0de110b280a1b6a70493c984565dc56cce9a1e7
specs:
omnibus-software (4.0.0)
+ chef-sugar (>= 3.4.0)
omnibus (>= 5.2.0)
GIT
remote: https://github.com/chef/omnibus.git
- revision: 29d390ec93709ceec2667038aed6769ee29a0646
+ revision: 184c3f7916f0deed7f1b25ecc755c332729fc2a8
specs:
omnibus (5.4.0)
aws-sdk (~> 2)
@@ -36,15 +37,15 @@ GEM
remote: https://rubygems.org/
specs:
addressable (2.4.0)
- artifactory (2.3.2)
+ artifactory (2.3.3)
awesome_print (1.7.0)
- aws-sdk (2.4.2)
- aws-sdk-resources (= 2.4.2)
- aws-sdk-core (2.4.2)
+ aws-sdk (2.5.0)
+ aws-sdk-resources (= 2.5.0)
+ aws-sdk-core (2.5.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.4.2)
- aws-sdk-core (= 2.4.2)
- berkshelf (4.3.3)
+ aws-sdk-resources (2.5.0)
+ aws-sdk-core (= 2.5.0)
+ berkshelf (4.3.5)
addressable (~> 2.3, >= 2.3.4)
berkshelf-api-client (~> 2.0, >= 2.0.2)
buff-config (~> 1.0)
@@ -56,6 +57,7 @@ GEM
faraday (~> 0.9)
httpclient (~> 2.7)
minitar (~> 0.5, >= 0.5.4)
+ mixlib-archive (~> 0.1)
octokit (~> 4.0)
retryable (~> 2.0)
ridley (~> 4.5)
@@ -71,7 +73,7 @@ GEM
buff-extensions (~> 1.0)
varia_model (~> 0.4)
buff-extensions (1.0.0)
- buff-ignore (1.1.1)
+ buff-ignore (1.2.0)
buff-ruby_engine (0.1.0)
buff-shell_out (0.2.0)
buff-ruby_engine (~> 0.1.0)
@@ -109,7 +111,7 @@ GEM
iostruct (0.0.4)
ipaddress (0.8.3)
jmespath (1.3.1)
- json (1.8.3)
+ json (2.0.2)
kitchen-vagrant (0.19.0)
test-kitchen (~> 1.4)
libyajl2 (1.2.0)
@@ -119,11 +121,13 @@ GEM
multi_json (~> 1.10)
method_source (0.8.2)
minitar (0.5.4)
+ mixlib-archive (0.2.0)
+ mixlib-log
mixlib-authentication (1.4.1)
mixlib-log
- mixlib-cli (1.6.0)
+ mixlib-cli (1.7.0)
mixlib-config (2.2.1)
- mixlib-install (1.0.12)
+ mixlib-install (1.1.0)
artifactory
mixlib-shellout
mixlib-versioning
@@ -138,7 +142,7 @@ GEM
multipart-post (1.2.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
- net-ssh (3.1.1)
+ net-ssh (3.2.0)
nio4r (1.2.1)
nori (2.6.0)
octokit (4.3.0)
@@ -157,7 +161,7 @@ GEM
wmi-lite (~> 1.0)
plist (3.2.0)
progressbar (0.21.0)
- pry (0.10.3)
+ pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
@@ -167,8 +171,8 @@ GEM
pry-stack_explorer (0.4.9.2)
binding_of_caller (>= 0.7)
pry (>= 0.9.11)
- retryable (2.0.3)
- ridley (4.5.1)
+ retryable (2.0.4)
+ ridley (4.6.0)
addressable
buff-config (~> 1.0)
buff-extensions (~> 1.0)
@@ -199,7 +203,7 @@ GEM
molinillo (~> 0.4.2)
semverse (~> 1.1)
systemu (2.6.5)
- test-kitchen (1.9.2)
+ test-kitchen (1.10.2)
mixlib-install (~> 1.0, >= 1.0.4)
mixlib-shellout (>= 1.2, < 3.0)
net-scp (~> 1.1)
@@ -222,7 +226,7 @@ GEM
logging (>= 1.6.1, < 3.0)
nori (~> 2.0)
rubyntlm (~> 0.6.0)
- winrm-fs (0.4.2)
+ winrm-fs (0.4.3)
erubis (~> 2.7)
logging (>= 1.6.1, < 3.0)
rubyzip (~> 1.1)
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 7771e805e3..b71a60a938 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -1,5 +1,5 @@
# DO NOT EDIT. Generated by "rake dependencies". Edit version_policy.rb instead.
-override :rubygems, version: "2.6.4"
+override :rubygems, version: "2.6.6"
override :bundler, version: "1.12.5"
override "libffi", version: "3.2.1"
override "libiconv", version: "1.14"
diff --git a/version_policy.rb b/version_policy.rb
index b8bead7bef..d47c49fa18 100644
--- a/version_policy.rb
+++ b/version_policy.rb
@@ -74,14 +74,12 @@ OMNIBUS_RUBYGEMS_AT_LATEST_VERSION = {
# stove - halite pins to ~> 3.2 in 1.2.1
# rubocop - chef-style pins to 0.39.0 in 0.3.1
#
-ACCEPTABLE_OUTDATED_GEMS = %w{
- gherkin
- jwt
- mini_portile2
- slop
- stove
- rubocop
-}
+ACCEPTABLE_OUTDATED_GEMS = [
+ "json", # aws-sdk-v1 disallows JSON 2.x (no fix pending yet)
+ "rack", # Rack 2.0+ requires Ruby 2.2
+ "rubocop", # chef-style pins to 0.39.0 in 0.3.1
+ "slop", # expected to disappear with pry 0.11
+]
#
# Some gems are part of our bundle (must be installed) but not important
View Lorry Controller Status