From d0dcbd2aedf1ec38dc9b1af8db4737ebff8aadf0 Mon Sep 17 00:00:00 2001
From: Tim Smith <tsmith@chef.io>
Date: Mon, 11 Mar 2019 10:59:12 -0700
Subject: Allow win32-service 2.x and bump InSpec to 3.7.1

We shipped win32-service 2.x. Let's allow it here.

Signed-off-by: Tim Smith <tsmith@chef.io>
---
 Gemfile.lock                   | 12 ++++++++----
 chef-universal-mingw32.gemspec |  2 +-
 omnibus/Gemfile.lock           | 20 ++++++++++----------
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 68a71bbeba..75b959f8fa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -96,7 +96,7 @@ PATH
       win32-mmap (~> 0.4.1)
       win32-mutex (~> 0.4.2)
       win32-process (~> 0.8.2)
-      win32-service (~> 1.0)
+      win32-service (>= 1.0, < 3.0)
       win32-taskscheduler (~> 2.0)
       windows-api (~> 0.4.4)
       wmi-lite (~> 1.0)
@@ -168,7 +168,7 @@ GEM
     highline (1.7.10)
     htmlentities (4.3.4)
     iniparse (1.4.4)
-    inspec-core (3.6.6)
+    inspec-core (3.7.1)
       addressable (~> 2.4)
       faraday (>= 0.9.0)
       hashie (~> 3.4)
@@ -185,6 +185,7 @@ GEM
       rubyzip (~> 1.1)
       semverse
       sslshake (~> 1.2)
+      term-ansicolor
       thor (~> 0.20)
       tomlrb (~> 1.2)
       train-core (~> 1.5, >= 1.7.2)
@@ -321,10 +322,13 @@ GEM
     structured_warnings (0.3.0)
     syslog-logger (1.6.8)
     systemu (2.6.5)
+    term-ansicolor (1.7.1)
+      tins (~> 1.0)
     thor (0.20.3)
     timers (4.3.0)
+    tins (1.20.2)
     tomlrb (1.2.8)
-    train-core (1.7.2)
+    train-core (1.7.4)
       json (>= 1.8, < 3.0)
       mixlib-shellout (~> 2.0)
     travis (1.8.9)
@@ -337,7 +341,7 @@ GEM
       pusher-client (~> 0.4)
       typhoeus (~> 0.6, >= 0.6.8)
     tty-color (0.4.3)
-    tty-cursor (0.6.0)
+    tty-cursor (0.6.1)
     tty-prompt (0.18.1)
       necromancer (~> 0.4.0)
       pastel (~> 0.7.0)
diff --git a/chef-universal-mingw32.gemspec b/chef-universal-mingw32.gemspec
index 9bbcbc635d..c19d9d438a 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", "~> 1.0"
+gemspec.add_dependency "win32-service", ">= 1.0", "< 3.0"
 gemspec.add_dependency "windows-api", "~> 0.4.4"
 gemspec.add_dependency "wmi-lite", "~> 1.0"
 gemspec.add_dependency "win32-taskscheduler", "~> 2.0"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index e3f41c4c99..f962b9256a 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -18,7 +18,7 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus-software
-  revision: 00c81e99278b7d715f39968e72eb96c3c948f015
+  revision: 44f52c320c3fe866e4d4186319fb6b5537f0656f
   branch: master
   specs:
     omnibus-software (4.0.0)
@@ -32,7 +32,7 @@ GEM
       public_suffix (>= 2.0.2, < 4.0)
     awesome_print (1.8.0)
     aws-eventstream (1.0.1)
-    aws-partitions (1.141.0)
+    aws-partitions (1.143.0)
     aws-sdk-core (3.46.2)
       aws-eventstream (~> 1.0)
       aws-partitions (~> 1.0)
@@ -41,7 +41,7 @@ GEM
     aws-sdk-kms (1.13.0)
       aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-s3 (1.30.1)
+    aws-sdk-s3 (1.31.0)
       aws-sdk-core (~> 3, >= 3.39.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.0)
@@ -60,10 +60,10 @@ GEM
       solve (~> 4.0)
       thor (>= 0.20)
     builder (3.2.3)
-    chef (14.10.9)
+    chef (14.11.21)
       addressable
       bundler (>= 1.10)
-      chef-config (= 14.10.9)
+      chef-config (= 14.11.21)
       chef-zero (>= 13.0)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -90,10 +90,10 @@ GEM
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
       uuidtools (~> 2.1.5)
-    chef (14.10.9-universal-mingw32)
+    chef (14.11.21-universal-mingw32)
       addressable
       bundler (>= 1.10)
-      chef-config (= 14.10.9)
+      chef-config (= 14.11.21)
       chef-zero (>= 13.0)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -122,7 +122,7 @@ GEM
       syslog-logger (~> 1.6)
       uuidtools (~> 2.1.5)
       win32-api (~> 1.5.3)
-      win32-certstore (>= 0.1.8)
+      win32-certstore (~> 0.2.4)
       win32-dir (~> 0.5.0)
       win32-event (~> 0.6.1)
       win32-eventlog (= 0.6.3)
@@ -133,7 +133,7 @@ GEM
       win32-taskscheduler (~> 2.0)
       windows-api (~> 0.4.4)
       wmi-lite (~> 1.0)
-    chef-config (14.10.9)
+    chef-config (14.11.21)
       addressable
       fuzzyurl
       mixlib-config (>= 2.2.12, < 3.0)
@@ -148,7 +148,7 @@ GEM
       uuidtools (~> 2.1)
     citrus (3.0.2)
     cleanroom (1.0.0)
-    concurrent-ruby (1.1.4)
+    concurrent-ruby (1.1.5)
     diff-lcs (1.3)
     erubis (2.7.0)
     faraday (0.15.4)
-- 
cgit v1.2.1