Merge pull request #6186 from chef/tm/copy_gems

Copy chef gems in place

2 files changed, 21 insertions, 19 deletions

diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index bf7777fa1c..065ca8907a 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -19,7 +19,7 @@
 # task instead.
 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-require 'chef/version_string'
+require "chef/version_string"
 
 class Chef
   CHEF_ROOT = File.expand_path("../..", __FILE__)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index caf63bef43..dba62c2170 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/chef/license_scout
-  revision: 92e9e27d71f457ea222b09c8fb3819bcb30a330a
+  revision: 4f781af91c03e40db797c104a65612690a567d2d
   specs:
     license_scout (0.1.3)
       ffi-yajl (~> 2.2)
@@ -8,7 +8,7 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus
-  revision: ffbda9ad7d37ddb485342505ff4407c6ff23d95f
+  revision: ad5d3f983c87931904dbfaec9f6c09de1027330f
   specs:
     omnibus (5.5.0)
       aws-sdk (~> 2)
@@ -25,7 +25,7 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus-software
-  revision: 986940586711c0ea8895120605ed59e2cacdea26
+  revision: dff477bf41d361fdec34e3dd464f8bbfb7f219e4
   specs:
     omnibus-software (4.0.0)
       chef-sugar (>= 3.4.0)
@@ -38,13 +38,13 @@ GEM
       public_suffix (~> 2.0, >= 2.0.2)
     artifactory (2.8.1)
     awesome_print (1.7.0)
-    aws-sdk (2.9.15)
-      aws-sdk-resources (= 2.9.15)
-    aws-sdk-core (2.9.15)
+    aws-sdk (2.9.25)
+      aws-sdk-resources (= 2.9.25)
+    aws-sdk-core (2.9.25)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.9.15)
-      aws-sdk-core (= 2.9.15)
+    aws-sdk-resources (2.9.25)
+      aws-sdk-core (= 2.9.25)
     aws-sigv4 (1.0.0)
     berkshelf (4.3.5)
       addressable (~> 2.3, >= 2.3.4)
@@ -85,7 +85,7 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (12.20.3)
+    chef-config (13.1.31)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
@@ -93,11 +93,12 @@ GEM
     chef-sugar (3.4.0)
     cleanroom (1.0.0)
     coderay (1.1.1)
-    debug_inspector (0.0.2)
+    debug_inspector (0.0.3)
     erubis (2.7.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.18)
+    ffi (1.9.18-x64-mingw32)
     ffi (1.9.18-x86-mingw32)
     ffi-yajl (2.3.0)
       libyajl2 (~> 1.2)
@@ -107,13 +108,13 @@ GEM
     gyoku (1.3.1)
       builder (>= 2.1.2)
     hashie (3.5.5)
-    hitimes (1.2.4)
-    hitimes (1.2.4-x86-mingw32)
+    hitimes (1.2.5)
+    hitimes (1.2.5-x86-mingw32)
     httpclient (2.7.2)
     iostruct (0.0.4)
     ipaddress (0.8.3)
     jmespath (1.3.1)
-    json (2.0.4)
+    json (2.1.0)
     kitchen-vagrant (0.19.0)
       test-kitchen (~> 1.4)
     libyajl2 (1.2.0)
@@ -148,12 +149,12 @@ GEM
     net-ssh (4.1.0)
     net-ssh-gateway (1.3.0)
       net-ssh (>= 2.6.5)
-    nio4r (2.0.0)
+    nio4r (2.1.0)
     nori (2.6.0)
     octokit (4.7.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (8.23.0)
-      chef-config (>= 12.5.0.alpha.1, < 13)
+    ohai (8.24.0)
+      chef-config (>= 12.5.0.alpha.1, < 14)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
       ipaddress
@@ -203,7 +204,7 @@ GEM
       semverse (~> 1.1)
       varia_model (~> 0.4.0)
     ruby-progressbar (1.8.1)
-    rubyntlm (0.6.1)
+    rubyntlm (0.6.2)
     rubyzip (1.2.1)
     safe_yaml (1.0.4)
     sawyer (0.8.1)
@@ -231,7 +232,7 @@ GEM
       hashie (>= 2.0.2, < 4.0.0)
     win32-process (0.8.3)
       ffi (>= 1.0.0)
-    winrm (2.2.1)
+    winrm (2.2.3)
       builder (>= 2.1.2)
       erubis (~> 2.7)
       gssapi (~> 1.2)
@@ -250,6 +251,7 @@ GEM
 
 PLATFORMS
   ruby
+  x64-mingw32
   x86-mingw32
 
 DEPENDENCIES