summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2019-10-08 09:17:36 -0700
committerTim Smith <tsmith84@gmail.com>2019-10-08 09:17:36 -0700
commit35b4bbaa21e7c493a81c605ef81388a6d7d6c0ed (patch)
tree7a6542a875d475d5af47f7686008a84c1de5d3c3
parentbed47ece7b8b13e69c7464104f6a22a6f60932f4 (diff)
downloadchef-bumps_2019.tar.gz
Require train ~3.1 for bootstrapping and openssl 1.0.2tbumps_2019
Somehow we missed the actual openssl 1.0.2t bump. We need this train bump to fix a bug in bootstrap that had to happen on the train side. Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--Gemfile.lock32
-rw-r--r--chef.gemspec2
-rw-r--r--omnibus/Gemfile.lock4
-rw-r--r--omnibus_overrides.rb2
4 files changed, 20 insertions, 20 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 44c895cb15..8402bd25b7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -54,7 +54,7 @@ PATH
plist (~> 3.2)
proxifier (~> 1.0)
syslog-logger (~> 1.6)
- train-core (~> 3.0)
+ train-core (~> 3.1)
train-winrm (>= 0.2.5)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
@@ -86,7 +86,7 @@ PATH
plist (~> 3.2)
proxifier (~> 1.0)
syslog-logger (~> 1.6)
- train-core (~> 3.0)
+ train-core (~> 3.1)
train-winrm (>= 0.2.5)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
@@ -135,7 +135,7 @@ GEM
builder (3.2.3)
byebug (11.0.1)
chef-vault (3.4.3)
- chef-zero (14.0.12)
+ chef-zero (14.0.13)
ffi-yajl (~> 2.2)
hashie (>= 2.0, < 4.0)
mixlib-log (>= 2.0, < 4.0)
@@ -153,7 +153,7 @@ GEM
ed25519 (1.2.4)
equatable (0.6.1)
erubis (2.7.0)
- faraday (0.16.2)
+ faraday (0.17.0)
multipart-post (>= 1.2, < 3)
faraday_middleware (0.12.2)
faraday (>= 0.7.4, < 1.0)
@@ -248,7 +248,7 @@ GEM
net-ssh (>= 2.6.5)
net-ssh-gateway (>= 1.2.0)
nori (2.6.0)
- parallel (1.17.0)
+ parallel (1.18.0)
parser (2.6.5.0)
ast (~> 2.4.0)
parslet (1.8.2)
@@ -274,22 +274,22 @@ GEM
rainbow (3.0.0)
rake (12.3.2)
rb-readline (0.5.5)
- rspec (3.8.0)
- rspec-core (~> 3.8.0)
- rspec-expectations (~> 3.8.0)
- rspec-mocks (~> 3.8.0)
- rspec-core (3.8.2)
- rspec-support (~> 3.8.0)
- rspec-expectations (3.8.5)
+ rspec (3.9.0)
+ rspec-core (~> 3.9.0)
+ rspec-expectations (~> 3.9.0)
+ rspec-mocks (~> 3.9.0)
+ rspec-core (3.9.0)
+ rspec-support (~> 3.9.0)
+ rspec-expectations (3.9.0)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.8.0)
+ rspec-support (~> 3.9.0)
rspec-its (1.3.0)
rspec-core (>= 3.0.0)
rspec-expectations (>= 3.0.0)
- rspec-mocks (3.8.2)
+ rspec-mocks (3.9.0)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.8.0)
- rspec-support (3.8.3)
+ rspec-support (~> 3.9.0)
+ rspec-support (3.9.0)
rspec_junit_formatter (0.2.3)
builder (< 4)
rspec-core (>= 2, < 4, != 2.12.0)
diff --git a/chef.gemspec b/chef.gemspec
index 80a8d9c2bb..a4a505d872 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
s.required_ruby_version = ">= 2.5.0"
s.add_dependency "chef-config", "= #{Chef::VERSION}"
- s.add_dependency "train-core", "~> 3.0"
+ s.add_dependency "train-core", "~> 3.1"
s.add_dependency "train-winrm", ">= 0.2.5"
s.add_dependency "license-acceptance", "~> 1.0", ">= 1.0.5"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 5a5153cc60..725d0c856a 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -145,7 +145,7 @@ GEM
mixlib-shellout (>= 2.0, < 4.0)
tomlrb (~> 1.2)
chef-sugar-ng (5.0.4)
- chef-zero (14.0.12)
+ chef-zero (14.0.13)
ffi-yajl (~> 2.2)
hashie (>= 2.0, < 4.0)
mixlib-log (>= 2.0, < 4.0)
@@ -158,7 +158,7 @@ GEM
ed25519 (1.2.4)
equatable (0.6.1)
erubis (2.7.0)
- faraday (0.16.2)
+ faraday (0.17.0)
multipart-post (>= 1.2, < 3)
ffi (1.11.1)
ffi (1.11.1-x64-mingw32)
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 0a29952fe9..06382af2b5 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -16,7 +16,7 @@ override "libyaml", version: "0.1.7"
override "makedepend", version: "1.0.5"
override "ncurses", version: "5.9"
override "nokogiri", version: "1.10.4"
-override "openssl", version: "1.0.2s"
+override "openssl", version: "1.0.2t"
override "pkg-config-lite", version: "0.28-1"
override "ruby", version: "2.6.5"
override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18"