summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-06-29 10:32:53 -0700
committerTim Smith <tsmith@chef.io>2018-06-29 10:32:53 -0700
commitb31ed8297b8d8ac9a66571f6be968677106e5247 (patch)
tree8882ecd3c1e030f2edc428acbd6d4c4e1fd73963
parent8ab299ec5e5a4c6daad45e2581326c5f7c14973d (diff)
downloadchef-b31ed8297b8d8ac9a66571f6be968677106e5247.tar.gz
Pull in new InSpec and win32-service
This resolves Ruby deprecation warnings when interacting with Windows services. Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--Gemfile.lock10
-rw-r--r--chef-universal-mingw32.gemspec2
-rw-r--r--omnibus/Gemfile.lock18
3 files changed, 15 insertions, 15 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 98b8ffda69..ab372f8040 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -78,7 +78,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)
win32-taskscheduler (~> 1.0.0)
windows-api (~> 0.4.4)
wmi-lite (~> 1.0)
@@ -149,7 +149,7 @@ GEM
highline (1.7.10)
htmlentities (4.3.4)
iniparse (1.4.4)
- inspec-core (2.2.10)
+ inspec-core (2.2.27)
addressable (~> 2.4)
faraday (>= 0.9.0)
hashie (~> 3.4)
@@ -167,7 +167,7 @@ GEM
sslshake (~> 1.2)
thor (~> 0.20)
tomlrb (~> 1.2)
- train-core (~> 1.4)
+ train-core (~> 1.4, >= 1.4.15)
ipaddress (0.8.3)
iso8601 (0.9.1)
json (2.1.0)
@@ -300,7 +300,7 @@ GEM
systemu (2.6.5)
thor (0.20.0)
tomlrb (1.2.7)
- train-core (1.4.11)
+ train-core (1.4.19)
json (>= 1.8, < 3.0)
mixlib-shellout (~> 2.0)
travis (1.8.8)
@@ -336,7 +336,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
win32-taskscheduler (1.0.2)
diff --git a/chef-universal-mingw32.gemspec b/chef-universal-mingw32.gemspec
index 05877d19b3..e0dde26732 100644
--- a/chef-universal-mingw32.gemspec
+++ b/chef-universal-mingw32.gemspec
@@ -11,7 +11,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.add_dependency "win32-taskscheduler", "~> 1.0.0"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index fd190ca04a..e639a0f771 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -18,7 +18,7 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: 88ce7ac44a6be8a36b6582fa6f50150ed38a87c7
+ revision: ff6dbf50afc4ad4c2b157deb1f38bf636197ca55
branch: master
specs:
omnibus-software (4.0.0)
@@ -31,14 +31,14 @@ GEM
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
awesome_print (1.8.0)
- aws-sdk (2.11.70)
- aws-sdk-resources (= 2.11.70)
- aws-sdk-core (2.11.70)
+ aws-sdk (2.11.78)
+ aws-sdk-resources (= 2.11.78)
+ aws-sdk-core (2.11.78)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.11.70)
- aws-sdk-core (= 2.11.70)
- aws-sigv4 (1.0.2)
+ aws-sdk-resources (2.11.78)
+ aws-sdk-core (= 2.11.78)
+ aws-sigv4 (1.0.3)
berkshelf (4.3.5)
addressable (~> 2.3, >= 2.3.4)
berkshelf-api-client (~> 2.0, >= 2.0.2)
@@ -124,7 +124,7 @@ GEM
multi_json (~> 1.10)
method_source (0.9.0)
minitar (0.6.1)
- mixlib-archive (0.4.7)
+ mixlib-archive (0.4.8)
mixlib-log
mixlib-authentication (2.1.1)
mixlib-cli (1.7.0)
@@ -212,7 +212,7 @@ GEM
molinillo (~> 0.4.2)
semverse (~> 1.1)
systemu (2.6.5)
- test-kitchen (1.21.2)
+ test-kitchen (1.22.0)
mixlib-install (~> 3.6)
mixlib-shellout (>= 1.2, < 3.0)
net-scp (~> 1.1)