Merge pull request #9337 from chef/deps

Update FFI and pin win32-service to 2.1.5+

3 files changed, 28 insertions, 28 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 055a86a361..8bab51b378 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -100,7 +100,7 @@ PATH
       win32-mmap (~> 0.4.1)
       win32-mutex (~> 0.4.2)
       win32-process (~> 0.8.2)
-      win32-service (>= 2.1.2, < 3.0)
+      win32-service (>= 2.1.5, < 3.0)
       win32-taskscheduler (~> 2.0)
       wmi-lite (~> 1.0)
 
@@ -176,9 +176,9 @@ GEM
       faraday (>= 0.7.4, < 1.0)
     fauxhai-ng (7.5.1)
       net-ssh
-    ffi (1.12.1)
-    ffi (1.12.1-x64-mingw32)
-    ffi (1.12.1-x86-mingw32)
+    ffi (1.12.2)
+    ffi (1.12.2-x64-mingw32)
+    ffi (1.12.2-x86-mingw32)
     ffi-libarchive (1.0.0)
       ffi (~> 1.0)
     ffi-win32-extensions (1.0.3)
@@ -336,7 +336,7 @@ GEM
     rubyzip (1.3.0)
     safe_yaml (1.0.5)
     semverse (3.0.0)
-    simplecov (0.18.0)
+    simplecov (0.18.1)
       docile (~> 1.1)
       simplecov-html (~> 0.11.0)
     simplecov-html (0.11.0)
@@ -379,7 +379,7 @@ GEM
       tty-cursor (~> 0.7)
       tty-screen (~> 0.7)
       wisper (~> 2.0.0)
-    tty-screen (0.7.0)
+    tty-screen (0.7.1)
     tty-table (0.11.0)
       equatable (~> 0.6)
       necromancer (~> 0.5)
diff --git a/chef-universal-mingw32.gemspec b/chef-universal-mingw32.gemspec
index 58ce54642d..9d77b2526e 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", ">= 2.1.2", "< 3.0"
+gemspec.add_dependency "win32-service", ">= 2.1.5", "< 3.0"
 gemspec.add_dependency "wmi-lite", "~> 1.0"
 gemspec.add_dependency "win32-taskscheduler", "~> 2.0"
 gemspec.add_dependency "iso8601", "~> 0.12.1"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 22312e8fc9..904d5c3447 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -18,7 +18,7 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus-software
-  revision: ad7ed679f1b34c20f8be34365d38cb1c21e737cd
+  revision: 582d6f905ca774fdb72b8f83beb03c4bbaf6645d
   branch: master
   specs:
     omnibus-software (4.0.0)
@@ -32,7 +32,7 @@ GEM
     artifactory (3.0.12)
     awesome_print (1.8.0)
     aws-eventstream (1.0.3)
-    aws-partitions (1.269.0)
+    aws-partitions (1.270.0)
     aws-sdk-core (3.89.1)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
@@ -50,7 +50,7 @@ GEM
     bcrypt_pbkdf (1.0.1)
     bcrypt_pbkdf (1.0.1-x64-mingw32)
     bcrypt_pbkdf (1.0.1-x86-mingw32)
-    berkshelf (7.0.8)
+    berkshelf (7.0.9)
       chef (>= 13.6.52)
       chef-config
       cleanroom (~> 1.0)
@@ -64,12 +64,12 @@ GEM
       solve (~> 4.0)
       thor (>= 0.20)
     builder (3.2.4)
-    chef (15.6.10)
+    chef (15.7.32)
       addressable
       bcrypt_pbkdf (~> 1.0)
       bundler (>= 1.10)
-      chef-config (= 15.6.10)
-      chef-utils (= 15.6.10)
+      chef-config (= 15.7.32)
+      chef-utils (= 15.7.32)
       chef-zero (>= 14.0.11)
       diff-lcs (~> 1.2, >= 1.2.4)
       ed25519 (~> 1.2)
@@ -96,12 +96,12 @@ GEM
       train-winrm (>= 0.2.5)
       tty-screen (~> 0.6)
       uuidtools (~> 2.1.5)
-    chef (15.6.10-universal-mingw32)
+    chef (15.7.32-universal-mingw32)
       addressable
       bcrypt_pbkdf (~> 1.0)
       bundler (>= 1.10)
-      chef-config (= 15.6.10)
-      chef-utils (= 15.6.10)
+      chef-config (= 15.7.32)
+      chef-utils (= 15.7.32)
       chef-zero (>= 14.0.11)
       diff-lcs (~> 1.2, >= 1.2.4)
       ed25519 (~> 1.2)
@@ -141,15 +141,15 @@ GEM
       win32-taskscheduler (~> 2.0)
       wmi-lite (~> 1.0)
     chef-cleanroom (1.0.2)
-    chef-config (15.6.10)
+    chef-config (15.7.32)
       addressable
-      chef-utils (= 15.6.10)
+      chef-utils (= 15.7.32)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
       tomlrb (~> 1.2)
     chef-sugar (5.1.9)
-    chef-utils (15.6.10)
+    chef-utils (15.7.32)
     chef-zero (14.0.17)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 4.0)
@@ -239,7 +239,7 @@ GEM
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
     nori (2.6.0)
-    octokit (4.15.0)
+    octokit (4.16.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     ohai (15.7.4)
@@ -268,12 +268,12 @@ GEM
     progressbar (1.10.1)
     proxifier (1.0.3)
     public_suffix (4.0.3)
-    rack (2.1.1)
+    rack (2.1.2)
     rainbow (3.0.0)
     retryable (3.0.5)
     ruby-progressbar (1.10.1)
     rubyntlm (0.6.2)
-    rubyzip (2.0.0)
+    rubyzip (2.2.0)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
@@ -306,7 +306,7 @@ GEM
     toml-rb (2.0.1)
       citrus (~> 3.0, > 3.0)
     tomlrb (1.2.9)
-    train-core (3.2.5)
+    train-core (3.2.14)
       json (>= 1.8, < 3.0)
       mixlib-shellout (>= 2.0, < 4.0)
       net-scp (>= 1.2, < 3.0)
@@ -318,8 +318,8 @@ GEM
       pastel (~> 0.7.2)
       strings (~> 0.1.6)
       tty-cursor (~> 0.7)
-    tty-color (0.5.0)
-    tty-cursor (0.7.0)
+    tty-color (0.5.1)
+    tty-cursor (0.7.1)
     tty-prompt (0.20.0)
       necromancer (~> 0.5.0)
       pastel (~> 0.7.0)
@@ -328,7 +328,7 @@ GEM
       tty-cursor (~> 0.7)
       tty-screen (~> 0.7)
       wisper (~> 2.0.0)
-    tty-screen (0.7.0)
+    tty-screen (0.7.1)
     unicode-display_width (1.6.1)
     unicode_utils (1.4.0)
     uuidtools (2.1.5)
@@ -350,7 +350,7 @@ GEM
       win32-ipc (>= 0.6.0)
     win32-process (0.8.3)
       ffi (>= 1.0.0)
-    win32-service (2.1.4)
+    win32-service (2.1.5)
       ffi
       ffi-win32-extensions
     win32-taskscheduler (2.0.4)
@@ -365,7 +365,7 @@ GEM
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
       rubyntlm (~> 0.6.0, >= 0.6.1)
-    winrm-elevated (1.1.2)
+    winrm-elevated (1.2.0)
       erubi (~> 1.8)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)