Merge pull request #1582 from chef/tm/bump_deps

Include Chef Client 14.1.12

Gemfile

@@ -52,7 +52,7 @@ group(:omnibus_package) do
   gem "chef-provisioning-aws", ">= 3.0.2", group: :provisioning
   gem "chef-provisioning-fog", ">= 0.26.1", group: :provisioning
   gem "chef-vault", ">= 3.3.0"
-  gem "chef", "= 14.1.1"
+  gem "chef", "= 14.1.12"
   gem "cheffish", ">= 14.0.1"
   gem "chefspec", ">= 7.2.0"
   gem "fauxhai", ">= 5.4.0"

Gemfile.lock

@@ -30,13 +30,13 @@ GEM
       mixlib-shellout (~> 2.0)
     artifactory (2.8.2)
     ast (2.4.0)
-    aws-sdk (2.11.48)
-      aws-sdk-resources (= 2.11.48)
-    aws-sdk-core (2.11.48)
+    aws-sdk (2.11.50)
+      aws-sdk-resources (= 2.11.50)
+    aws-sdk-core (2.11.50)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.11.48)
-      aws-sdk-core (= 2.11.48)
+    aws-sdk-resources (2.11.50)
+      aws-sdk-core (= 2.11.50)
     aws-sigv4 (1.0.2)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
@@ -62,10 +62,10 @@ GEM
       debug_inspector (>= 0.0.1)
     builder (3.2.3)
     byebug (10.0.2)
-    chef (14.1.1)
+    chef (14.1.12)
       addressable
       bundler (>= 1.10)
-      chef-config (= 14.1.1)
+      chef-config (= 14.1.12)
       chef-zero (>= 13.0)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -93,10 +93,10 @@ GEM
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
       uuidtools (~> 2.1.5)
-    chef (14.1.1-universal-mingw32)
+    chef (14.1.12-universal-mingw32)
       addressable
       bundler (>= 1.10)
-      chef-config (= 14.1.1)
+      chef-config (= 14.1.12)
       chef-zero (>= 13.0)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -138,7 +138,7 @@ GEM
     chef-api (0.8.0)
       logify (~> 0.1)
       mime-types
-    chef-config (14.1.1)
+    chef-config (14.1.12)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
@@ -314,7 +314,7 @@ GEM
     gcewinpass (1.0.0)
       google-api-client (~> 0.9.0)
     gherkin (5.0.0)
-    git (1.3.0)
+    git (1.4.0)
     google-api-client (0.9.28)
       addressable (~> 2.3)
       googleauth (~> 0.5)
@@ -511,7 +511,7 @@ GEM
       shellany (~> 0.0)
     octokit (4.9.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (14.1.0)
+    ohai (14.1.3)
       chef-config (>= 12.8, < 15)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
@@ -698,7 +698,7 @@ GEM
     win32-service (0.8.10)
       ffi
       ffi-win32-extensions
-    win32-taskscheduler (0.4.0)
+    win32-taskscheduler (0.4.1)
       ffi
       structured_warnings
     windows-api (0.4.4)
@@ -736,7 +736,7 @@ DEPENDENCIES
   artifactory
   berkshelf (>= 7.0)
   bundler
-  chef (= 14.1.1)
+  chef (= 14.1.12)
   chef-dk!
   chef-provisioning (>= 2.7.1)
   chef-provisioning-aws (>= 3.0.2)

omnibus/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/chef/omnibus-software.git
-  revision: cb42641d8c0af24b87a4750cc415b9493022ab85
+  revision: cd92f43bf80ed5b0a664ef8a83d6beb0a6578a72
   branch: master
   specs:
     omnibus-software (4.0.0)
@@ -31,13 +31,13 @@ GEM
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     awesome_print (1.8.0)
-    aws-sdk (2.11.44)
-      aws-sdk-resources (= 2.11.44)
-    aws-sdk-core (2.11.44)
+    aws-sdk (2.11.50)
+      aws-sdk-resources (= 2.11.50)
+    aws-sdk-core (2.11.50)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.11.44)
-      aws-sdk-core (= 2.11.44)
+    aws-sdk-resources (2.11.50)
+      aws-sdk-core (= 2.11.50)
     aws-sigv4 (1.0.2)
     berkshelf (6.3.2)
       buff-config (~> 2.0)
@@ -150,7 +150,7 @@ GEM
     concurrent-ruby (1.0.5)
     diff-lcs (1.3)
     erubis (2.7.0)
-    faraday (0.15.0)
+    faraday (0.15.1)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.23)
     ffi (1.9.23-x64-mingw32)
@@ -177,7 +177,7 @@ GEM
     kitchen-vagrant (1.3.2)
       test-kitchen (~> 1.4)
     libyajl2 (1.2.0)
-    license_scout (1.0.4)
+    license_scout (1.0.5)
       ffi-yajl (~> 2.2)
       mixlib-shellout (~> 2.2)
       toml-rb (~> 1.0)
@@ -192,7 +192,7 @@ GEM
     mixlib-cli (1.7.0)
     mixlib-config (2.2.6)
       tomlrb
-    mixlib-install (3.9.3)
+    mixlib-install (3.10.0)
       mixlib-shellout
       mixlib-versioning
       thor

omnibus/config/software/chef-dk.rb

@@ -39,6 +39,10 @@
 # ruby and bundler and friends
 dependency "ruby"
 dependency "rubygems"
+
+# depend on train so that we get the correctly built protobuf version
+dependency "train"
+
 dependency "appbundler"
 
 build do