summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-07-06 15:03:13 -0700
committerTim Smith <tsmith@chef.io>2018-07-06 15:03:13 -0700
commit3b2c0f9446ef3e08beedb409b2c43ffcc4dc7c0f (patch)
treedc0ce769542cfc39ad298172dfb5da6be6d7f450
parent047fac8812d32989ef9309a91355590d29e8289c (diff)
downloadchef-3b2c0f9446ef3e08beedb409b2c43ffcc4dc7c0f.tar.gz
Pull in latest win32-service gem
Also bump all the omnibus gems. This new gem resolves deprecation warnings on Ruby 2.4 Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--Gemfile.lock6
-rw-r--r--chef-universal-mingw32.gemspec2
-rw-r--r--omnibus/Gemfile.lock63
3 files changed, 36 insertions, 35 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index bab09e9c65..35265971a2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -77,7 +77,7 @@ PATH
win32-mmap (~> 0.4.1)
win32-mutex (~> 0.4.2)
win32-process (~> 0.8.2)
- win32-service (~> 0.8.7)
+ win32-service (~> 1.0)
windows-api (~> 0.4.4)
wmi-lite (~> 1.0)
@@ -235,7 +235,7 @@ GEM
ast (~> 2.4.0)
parslet (1.8.2)
plist (3.4.0)
- powerpack (0.1.1)
+ powerpack (0.1.2)
proxifier (1.0.3)
pry (0.11.3)
coderay (~> 1.1.0)
@@ -356,7 +356,7 @@ GEM
win32-ipc (>= 0.6.0)
win32-process (0.8.3)
ffi (>= 1.0.0)
- win32-service (0.8.10)
+ win32-service (1.0.1)
ffi
ffi-win32-extensions
windows-api (0.4.4)
diff --git a/chef-universal-mingw32.gemspec b/chef-universal-mingw32.gemspec
index 449f909bb2..661ee0a3c8 100644
--- a/chef-universal-mingw32.gemspec
+++ b/chef-universal-mingw32.gemspec
@@ -12,7 +12,7 @@ gemspec.add_dependency "win32-eventlog", "0.6.3"
gemspec.add_dependency "win32-mmap", "~> 0.4.1"
gemspec.add_dependency "win32-mutex", "~> 0.4.2"
gemspec.add_dependency "win32-process", "~> 0.8.2"
-gemspec.add_dependency "win32-service", "~> 0.8.7"
+gemspec.add_dependency "win32-service", "~> 1.0"
gemspec.add_dependency "windows-api", "~> 0.4.4"
gemspec.add_dependency "wmi-lite", "~> 1.0"
gemspec.extensions << "ext/win32-eventlog/Rakefile"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 5ab4d71bc0..2ca2c29e80 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,8 +1,8 @@
GIT
remote: https://github.com/chef/omnibus
- revision: 7f3652f85986ba24d681493bf2968326bfc2de46
+ revision: 7e9c9a6a71c1ada2d7f42484f13074e1ec6b7cd3
specs:
- omnibus (5.6.11)
+ omnibus (5.6.12)
aws-sdk (~> 2)
chef-sugar (~> 3.3)
cleanroom (~> 1.0)
@@ -17,7 +17,7 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: 0cb3a8dfb6cebd56684c1d4609a676959389e4c5
+ revision: 836bd650d49e6350dfa40b43a1398c5847a6fd42
specs:
omnibus-software (4.0.0)
chef-sugar (>= 3.4.0)
@@ -29,14 +29,14 @@ GEM
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
awesome_print (1.8.0)
- aws-sdk (2.11.31)
- aws-sdk-resources (= 2.11.31)
- aws-sdk-core (2.11.31)
+ aws-sdk (2.11.83)
+ aws-sdk-resources (= 2.11.83)
+ aws-sdk-core (2.11.83)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.11.31)
- aws-sdk-core (= 2.11.31)
- aws-sigv4 (1.0.2)
+ aws-sdk-resources (2.11.83)
+ aws-sdk-core (= 2.11.83)
+ aws-sigv4 (1.0.3)
berkshelf (4.3.5)
addressable (~> 2.3, >= 2.3.4)
berkshelf-api-client (~> 2.0, >= 2.0.2)
@@ -76,7 +76,7 @@ GEM
celluloid-io (0.16.2)
celluloid (>= 0.16.0)
nio4r (>= 1.1.0)
- chef-config (14.0.190)
+ chef-config (14.2.0)
addressable
fuzzyurl
mixlib-config (~> 2.0)
@@ -90,9 +90,9 @@ GEM
erubis (2.7.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
- ffi (1.9.23)
- ffi (1.9.23-x64-mingw32)
- ffi (1.9.23-x86-mingw32)
+ ffi (1.9.25)
+ ffi (1.9.25-x64-mingw32)
+ ffi (1.9.25-x86-mingw32)
ffi-yajl (2.3.1)
libyajl2 (~> 1.2)
fuzzyurl (0.9.0)
@@ -101,8 +101,9 @@ GEM
gyoku (1.3.1)
builder (>= 2.1.2)
hashie (3.5.7)
- hitimes (1.2.6)
- hitimes (1.2.6-x86-mingw32)
+ hitimes (1.3.0)
+ hitimes (1.3.0-x64-mingw32)
+ hitimes (1.3.0-x86-mingw32)
httpclient (2.7.2)
iostruct (0.0.4)
ipaddress (0.8.3)
@@ -111,7 +112,7 @@ GEM
kitchen-vagrant (0.19.0)
test-kitchen (~> 1.4)
libyajl2 (1.2.0)
- license_scout (1.0.1)
+ license_scout (1.0.10)
ffi-yajl (~> 2.2)
mixlib-shellout (~> 2.2)
toml-rb (~> 1.0)
@@ -121,17 +122,17 @@ GEM
multi_json (~> 1.10)
method_source (0.9.0)
minitar (0.6.1)
- mixlib-archive (0.4.1)
+ mixlib-archive (0.4.8)
mixlib-log
- mixlib-authentication (1.4.2)
+ mixlib-authentication (2.1.1)
mixlib-cli (1.7.0)
- mixlib-config (2.2.6)
+ mixlib-config (2.2.12)
tomlrb
- mixlib-install (3.9.3)
+ mixlib-install (3.10.0)
mixlib-shellout
mixlib-versioning
thor
- mixlib-log (2.0.3)
+ mixlib-log (2.0.4)
mixlib-shellout (2.3.2)
mixlib-shellout (2.3.2-universal-mingw32)
win32-process (~> 0.8.2)
@@ -145,11 +146,11 @@ GEM
net-ssh (4.2.0)
net-ssh-gateway (1.3.0)
net-ssh (>= 2.6.5)
- nio4r (2.3.0)
+ nio4r (2.3.1)
nori (2.6.0)
- octokit (4.8.0)
+ octokit (4.9.0)
sawyer (~> 0.8.0, >= 0.5.3)
- ohai (14.0.29)
+ ohai (14.2.0)
chef-config (>= 12.8, < 15)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
@@ -209,22 +210,22 @@ GEM
molinillo (~> 0.4.2)
semverse (~> 1.1)
systemu (2.6.5)
- test-kitchen (1.20.0)
+ test-kitchen (1.22.0)
mixlib-install (~> 3.6)
mixlib-shellout (>= 1.2, < 3.0)
net-scp (~> 1.1)
net-ssh (>= 2.9, < 5.0)
net-ssh-gateway (~> 1.2)
- thor (~> 0.19, < 0.19.2)
+ thor (~> 0.19)
winrm (~> 2.0)
winrm-elevated (~> 1.0)
- winrm-fs (~> 1.1.0)
- thor (0.19.1)
+ winrm-fs (~> 1.1)
+ thor (0.20.0)
timers (4.0.4)
hitimes
toml-rb (1.1.1)
citrus (~> 3.0, > 3.0)
- tomlrb (1.2.6)
+ tomlrb (1.2.7)
varia_model (0.4.1)
buff-extensions (~> 1.0)
hashie (>= 2.0.2, < 4.0.0)
@@ -242,7 +243,7 @@ GEM
winrm-elevated (1.1.0)
winrm (~> 2.0)
winrm-fs (~> 1.0)
- winrm-fs (1.1.1)
+ winrm-fs (1.2.0)
erubis (~> 2.7)
logging (>= 1.6.1, < 3.0)
rubyzip (~> 1.1)
@@ -268,4 +269,4 @@ DEPENDENCIES
winrm-fs (~> 1.0)
BUNDLED WITH
- 1.16.1
+ 1.16.2