summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2020-02-05 14:12:40 -0800
committerGitHub <noreply@github.com>2020-02-05 14:12:40 -0800
commitbee9aa8e697a80a4eba433ec048ac106bdf934e1 (patch)
treeddb88691a0fa6d99e0250d29d1d7b025fe8a7955
parent2a2d42937e1de39bf60c119aceba861bf87376aa (diff)
parent96a03560ed2dd79b677aaf3846d101ad58e28e47 (diff)
downloadchef-bee9aa8e697a80a4eba433ec048ac106bdf934e1.tar.gz
Merge pull request #9336 from chef/updates_15
Update all the Chef 15 deps to the latest
-rw-r--r--Gemfile.lock12
-rw-r--r--chef-universal-mingw32.gemspec2
-rw-r--r--omnibus/Gemfile.lock12
3 files changed, 13 insertions, 13 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 991300a603..0e79ef6a36 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)
@@ -337,7 +337,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)
@@ -380,7 +380,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 fb30010ecb..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)
@@ -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)
@@ -273,7 +273,7 @@ GEM
retryable (3.0.5)
ruby-progressbar (1.10.1)
rubyntlm (0.6.2)
- rubyzip (2.1.0)
+ rubyzip (2.2.0)
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.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)
@@ -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)