summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2016-05-02 10:12:37 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2016-05-02 10:12:37 -0700
commita1bcac03b0ad13544aba51f2de42f550983945c9 (patch)
tree8bc17f256cb9d97341c662a95c4851845ce0f900
parent2954cdbe205b6bbae862f9bcdced37a8729570e2 (diff)
downloadchef-a1bcac03b0ad13544aba51f2de42f550983945c9.tar.gz
results of rake dependencieslcg/remove-pinning
-rw-r--r--Gemfile.lock62
-rw-r--r--acceptance/Gemfile.lock34
-rw-r--r--kitchen-tests/Berksfile.lock6
-rw-r--r--kitchen-tests/Gemfile.lock24
-rw-r--r--kitchen-tests/test/integration/webapp/serverspec/Gemfile.lock2
-rw-r--r--omnibus/Gemfile.lock34
-rw-r--r--omnibus_overrides.rb4
7 files changed, 56 insertions, 110 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 3f196fa5b2..8c52b207ef 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -26,6 +26,7 @@ PATH
erubis (~> 2.7)
ffi-yajl (~> 2.2)
highline (~> 1.6, >= 1.6.9)
+ iniparse (~> 1.4)
mixlib-authentication (~> 1.4)
mixlib-cli (~> 1.4)
mixlib-log (~> 1.3)
@@ -44,43 +45,6 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (12.10.26-universal-mingw32)
- bundler (>= 1.10)
- chef-config (= 12.10.26)
- chef-zero (~> 4.5)
- diff-lcs (~> 1.2, >= 1.2.4)
- erubis (~> 2.7)
- ffi (~> 1.9)
- ffi-yajl (~> 2.2)
- highline (~> 1.6, >= 1.6.9)
- mixlib-authentication (~> 1.4)
- mixlib-cli (~> 1.4)
- mixlib-log (~> 1.3)
- mixlib-shellout (~> 2.0)
- net-sftp (~> 2.1, >= 2.1.2)
- net-ssh (>= 2.9, < 4.0)
- net-ssh-multi (~> 1.1)
- ohai (>= 8.6.0.alpha.1, < 9)
- plist (~> 3.2)
- proxifier (~> 1.0)
- rspec-core (~> 3.4)
- rspec-expectations (~> 3.4)
- rspec-mocks (~> 3.4)
- rspec_junit_formatter (~> 0.2.0)
- serverspec (~> 2.7)
- specinfra (~> 2.10)
- syslog-logger (~> 1.6)
- uuidtools (~> 2.1.5)
- win32-api (~> 1.5.3)
- win32-dir (~> 0.5.0)
- win32-event (~> 0.6.1)
- win32-eventlog (= 0.6.3)
- win32-mmap (~> 0.4.1)
- win32-mutex (~> 0.4.2)
- win32-process (~> 0.8.2)
- win32-service (~> 0.8.7)
- windows-api (~> 0.4.4)
- wmi-lite (~> 1.0)
PATH
remote: chef-config
@@ -161,7 +125,6 @@ GEM
fauxhai (3.4.0)
net-ssh
ffi (1.9.10)
- ffi (1.9.10-x86-mingw32)
ffi-yajl (2.2.3)
libyajl2 (~> 1.2)
foodcritic (6.2.0)
@@ -198,7 +161,7 @@ GEM
chef (~> 12.0)
stove (~> 3.2, >= 3.2.3)
thor
- hashie (3.4.3)
+ hashie (3.4.4)
highline (1.7.8)
httpclient (2.8.0)
inifile (3.0.0)
@@ -369,27 +332,10 @@ GEM
treetop (1.6.5)
polyglot (~> 0.3)
ubuntu_ami (0.4.1)
- unicode-display_width (1.0.3)
+ unicode-display_width (1.0.5)
uuidtools (2.1.5)
- win32-api (1.5.3-universal-mingw32)
- win32-dir (0.5.1)
- ffi (>= 1.0.0)
- win32-event (0.6.3)
- win32-ipc (>= 0.6.0)
- win32-eventlog (0.6.3)
- ffi
- win32-ipc (0.6.6)
- ffi
- win32-mmap (0.4.2)
- ffi
- win32-mutex (0.4.3)
- win32-ipc (>= 0.6.0)
win32-process (0.8.3)
ffi (>= 1.0.0)
- win32-service (0.8.7)
- ffi
- windows-api (0.4.4)
- win32-api (>= 1.4.5)
winrm (1.8.0)
builder (>= 2.1.2)
gssapi (~> 1.2)
@@ -441,4 +387,4 @@ DEPENDENCIES
yard
BUNDLED WITH
- 1.11.2
+ 1.12.1
diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock
index 009c7cee73..99670d8fd6 100644
--- a/acceptance/Gemfile.lock
+++ b/acceptance/Gemfile.lock
@@ -11,12 +11,12 @@ GEM
specs:
addressable (2.4.0)
artifactory (2.3.2)
- aws-sdk (2.2.34)
- aws-sdk-resources (= 2.2.34)
- aws-sdk-core (2.2.34)
+ aws-sdk (2.3.0)
+ aws-sdk-resources (= 2.3.0)
+ aws-sdk-core (2.3.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.2.34)
- aws-sdk-core (= 2.2.34)
+ aws-sdk-resources (2.3.0)
+ aws-sdk-core (= 2.3.0)
berkshelf (4.3.2)
addressable (~> 2.3, >= 2.3.4)
berkshelf-api-client (~> 2.0, >= 2.0.2)
@@ -52,7 +52,7 @@ GEM
celluloid-io (0.16.2)
celluloid (>= 0.16.0)
nio4r (>= 1.1.0)
- chef-config (12.9.38)
+ chef-config (12.10.26)
fuzzyurl (~> 0.8.0)
mixlib-config (~> 2.0)
mixlib-shellout (~> 2.0)
@@ -72,14 +72,14 @@ GEM
ffi (>= 1.0.1)
gyoku (1.3.1)
builder (>= 2.1.2)
- hashie (3.4.3)
+ hashie (3.4.4)
hitimes (1.2.3)
- httpclient (2.7.1)
- inspec (0.19.1)
+ httpclient (2.7.2)
+ inspec (0.20.1)
json (~> 1.8)
method_source (~> 0.8)
pry (~> 0)
- r-train (~> 0.10.5)
+ r-train (~> 0.11)
rainbow (~> 2)
rspec (~> 3)
rspec-its (~> 1.2)
@@ -112,15 +112,15 @@ GEM
rspec-expectations (~> 3.2)
rspec-mocks (~> 3.2)
mixlib-config (2.2.1)
- mixlib-install (1.0.7)
+ mixlib-install (1.0.11)
artifactory
mixlib-shellout
mixlib-versioning
mixlib-log (1.6.0)
mixlib-shellout (2.2.6)
mixlib-versioning (1.1.0)
- molinillo (0.4.4)
- multi_json (1.11.2)
+ molinillo (0.4.5)
+ multi_json (1.11.3)
multipart-post (2.0.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
@@ -133,10 +133,10 @@ GEM
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
- r-train (0.10.5)
+ r-train (0.11.2)
docker-api (~> 1.26.2)
json (~> 1.8)
- mixlib-shellout (~> 2.1)
+ mixlib-shellout (~> 2.0)
net-scp (~> 1.2)
net-ssh (>= 2.9, < 4.0)
winrm (~> 1.6)
@@ -203,7 +203,7 @@ GEM
hashie (>= 2.0.2, < 4.0.0)
windows_chef_zero (2.0.0)
test-kitchen (>= 1.2.1)
- winrm (1.7.3)
+ winrm (1.8.0)
builder (>= 2.1.2)
gssapi (~> 1.2)
gyoku (~> 1.0)
@@ -232,4 +232,4 @@ DEPENDENCIES
winrm-fs
BUNDLED WITH
- 1.11.2
+ 1.12.1
diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock
index ee5027e4b7..2c3b22b985 100644
--- a/kitchen-tests/Berksfile.lock
+++ b/kitchen-tests/Berksfile.lock
@@ -46,14 +46,14 @@ GRAPH
database (~> 2.3.1)
mysql (>= 0.0.0)
php (>= 0.0.0)
- windows (1.39.2)
+ windows (1.40.0)
chef_handler (>= 0.0.0)
xfs (2.0.1)
xml (2.0.0)
build-essential (>= 0.0.0)
chef-sugar (>= 0.0.0)
yum (3.10.0)
- yum-epel (0.6.6)
- yum (~> 3.10.0)
+ yum-epel (0.7.0)
+ yum (>= 3.6.3)
yum-mysql-community (0.2.0)
yum (>= 3.2)
diff --git a/kitchen-tests/Gemfile.lock b/kitchen-tests/Gemfile.lock
index 78caba0014..94e6f6d22e 100644
--- a/kitchen-tests/Gemfile.lock
+++ b/kitchen-tests/Gemfile.lock
@@ -14,12 +14,12 @@ GEM
specs:
addressable (2.4.0)
artifactory (2.3.2)
- aws-sdk (2.2.34)
- aws-sdk-resources (= 2.2.34)
- aws-sdk-core (2.2.34)
+ aws-sdk (2.3.0)
+ aws-sdk-resources (= 2.3.0)
+ aws-sdk-core (2.3.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.2.34)
- aws-sdk-core (= 2.2.34)
+ aws-sdk-resources (2.3.0)
+ aws-sdk-core (= 2.3.0)
berkshelf (4.3.2)
addressable (~> 2.3, >= 2.3.4)
berkshelf-api-client (~> 2.0, >= 2.0.2)
@@ -54,7 +54,7 @@ GEM
celluloid-io (0.16.2)
celluloid (>= 0.16.0)
nio4r (>= 1.1.0)
- chef-config (12.9.38)
+ chef-config (12.10.26)
fuzzyurl (~> 0.8.0)
mixlib-config (~> 2.0)
mixlib-shellout (~> 2.0)
@@ -66,10 +66,10 @@ GEM
multipart-post (>= 1.2, < 3)
ffi (1.9.10-x86-mingw32)
fuzzyurl (0.8.0)
- hashie (3.4.3)
+ hashie (3.4.4)
hitimes (1.2.3)
hitimes (1.2.3-x86-mingw32)
- httpclient (2.7.1)
+ httpclient (2.7.2)
jmespath (1.2.4)
json_pure (>= 1.8.1)
json (1.8.3)
@@ -84,7 +84,7 @@ GEM
rspec-expectations (~> 3.2)
rspec-mocks (~> 3.2)
mixlib-config (2.2.1)
- mixlib-install (1.0.7)
+ mixlib-install (1.0.11)
artifactory
mixlib-shellout
mixlib-versioning
@@ -94,8 +94,8 @@ GEM
win32-process (~> 0.8.2)
wmi-lite (~> 1.0)
mixlib-versioning (1.1.0)
- molinillo (0.4.4)
- multi_json (1.11.2)
+ molinillo (0.4.5)
+ multi_json (1.11.3)
multipart-post (2.0.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
@@ -170,4 +170,4 @@ DEPENDENCIES
vagrant-wrapper
BUNDLED WITH
- 1.11.2
+ 1.12.1
diff --git a/kitchen-tests/test/integration/webapp/serverspec/Gemfile.lock b/kitchen-tests/test/integration/webapp/serverspec/Gemfile.lock
index ac6c11f28c..fd00a6daa1 100644
--- a/kitchen-tests/test/integration/webapp/serverspec/Gemfile.lock
+++ b/kitchen-tests/test/integration/webapp/serverspec/Gemfile.lock
@@ -16,4 +16,4 @@ DEPENDENCIES
ffi-yajl (~> 1.1)
BUNDLED WITH
- 1.11.2
+ 1.12.1
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 5214847aa1..23a2df9f5d 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,15 +1,15 @@
GIT
remote: https://github.com/chef/omnibus-software.git
- revision: 6127be3af79941c32419228cbd9e63c4f061d76b
+ revision: 02b070d484a1916953dbd5af66ea6d304887d2ff
specs:
omnibus-software (4.0.0)
omnibus (>= 5.2.0)
GIT
remote: https://github.com/chef/omnibus.git
- revision: e73722f46fbd5f302d9e1541aaae0b2f8be2110e
+ revision: e2b6cfa813277222f47fde02b9a4a4437350989f
specs:
- omnibus (5.3.0)
+ omnibus (5.4.0)
aws-sdk (~> 2)
chef-sugar (~> 3.3)
cleanroom (~> 1.0)
@@ -38,12 +38,12 @@ GEM
addressable (2.3.8)
artifactory (2.3.2)
awesome_print (1.6.1)
- aws-sdk (2.2.34)
- aws-sdk-resources (= 2.2.34)
- aws-sdk-core (2.2.34)
+ aws-sdk (2.3.0)
+ aws-sdk-resources (= 2.3.0)
+ aws-sdk-core (2.3.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.2.34)
- aws-sdk-core (= 2.2.34)
+ aws-sdk-resources (2.3.0)
+ aws-sdk-core (= 2.3.0)
berkshelf (3.3.0)
addressable (~> 2.3.4)
berkshelf-api-client (~> 1.2)
@@ -75,13 +75,13 @@ GEM
buff-shell_out (0.2.0)
buff-ruby_engine (~> 0.1.0)
builder (3.2.2)
- byebug (8.2.4)
+ byebug (8.2.5)
celluloid (0.16.0)
timers (~> 4.0.0)
celluloid-io (0.16.2)
celluloid (>= 0.16.0)
nio4r (>= 1.1.0)
- chef-config (12.9.38)
+ chef-config (12.10.26)
fuzzyurl (~> 0.8.0)
mixlib-config (~> 2.0)
mixlib-shellout (~> 2.0)
@@ -106,7 +106,7 @@ GEM
ffi (>= 1.0.1)
gyoku (1.3.1)
builder (>= 2.1.2)
- hashie (3.4.3)
+ hashie (3.4.4)
hitimes (1.2.3)
hitimes (1.2.3-x86-mingw32)
httpclient (2.6.0.1)
@@ -132,7 +132,7 @@ GEM
rspec-mocks (~> 3.2)
mixlib-cli (1.5.0)
mixlib-config (2.2.1)
- mixlib-install (1.0.7)
+ mixlib-install (1.0.11)
artifactory
mixlib-shellout
mixlib-versioning
@@ -142,7 +142,7 @@ GEM
win32-process (~> 0.8.2)
wmi-lite (~> 1.0)
mixlib-versioning (1.1.0)
- multi_json (1.11.2)
+ multi_json (1.11.3)
multipart-post (1.2.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
@@ -151,7 +151,7 @@ GEM
nori (2.6.0)
octokit (3.8.0)
sawyer (~> 0.6.0, >= 0.5.3)
- ohai (8.14.0)
+ ohai (8.15.1)
chef-config (>= 12.5.0.alpha.1, < 13)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
@@ -203,7 +203,7 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.4.0)
rspec-support (3.4.1)
- ruby-progressbar (1.7.5)
+ ruby-progressbar (1.8.0)
rubyntlm (0.6.0)
rubyzip (1.2.0)
safe_yaml (1.0.4)
@@ -231,7 +231,7 @@ GEM
hashie (>= 2.0.2, < 4.0.0)
win32-process (0.8.3)
ffi (>= 1.0.0)
- winrm (1.7.3)
+ winrm (1.8.0)
builder (>= 2.1.2)
gssapi (~> 1.2)
gyoku (~> 1.0)
@@ -264,4 +264,4 @@ DEPENDENCIES
winrm-fs (~> 0.4.0)
BUNDLED WITH
- 1.11.2
+ 1.12.1
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 17d0dc4b89..b80073eaf5 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -1,6 +1,6 @@
# DO NOT EDIT. Generated by "rake dependencies". Edit version_policy.rb instead.
-override :rubygems, version: "2.6.3"
-override :bundler, version: "1.11.2"
+override :rubygems, version: "2.6.4"
+override :bundler, version: "1.12.1"
override "libffi", version: "3.2.1"
override "libiconv", version: "1.14"
override "liblzma", version: "5.2.2"