bump omnibus deps

Signed-off-by: Thom May <thom@chef.io>

2 files changed, 19 insertions, 17 deletions

diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index dbf7409032..9470a86266 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
-gem "omnibus", git: "https://github.com/chef/omnibus"
-gem "omnibus-software", git: "https://github.com/chef/omnibus-software"
+gem "omnibus", git: "https://github.com/chef/omnibus", branch: "lcg/improve-appbundling"
+gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "lcg/appbundle-0.11-without"
 
 gem "pedump"
 
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index a36078d763..bc5e9cbbbf 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,8 +1,9 @@
 GIT
   remote: https://github.com/chef/omnibus
-  revision: 63e908114e460d47609869ece898c45d7250247b
+  revision: bc76c699bc8b85959bb546933efa6b5cf0ff1823
+  branch: lcg/improve-appbundling
   specs:
-    omnibus (5.6.9)
+    omnibus (5.6.10)
       aws-sdk (~> 2)
       chef-sugar (~> 3.3)
       cleanroom (~> 1.0)
@@ -10,14 +11,15 @@ GIT
       license_scout (~> 1.0)
       mixlib-shellout (~> 2.0)
       mixlib-versioning
-      ohai (~> 8.0)
+      ohai (>= 8.6.0.alpha.1, < 15)
       pedump
       ruby-progressbar (~> 1.7)
       thor (~> 0.18)
 
 GIT
   remote: https://github.com/chef/omnibus-software
-  revision: 4ef2d1a5b9162f4f5f52617d2a0122796b4f3c43
+  revision: 3f6f9836cb041ad6187b7b52a25cf759fc830bc6
+  branch: lcg/appbundle-0.11-without
   specs:
     omnibus-software (4.0.0)
       chef-sugar (>= 3.4.0)
@@ -29,13 +31,13 @@ GEM
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     awesome_print (1.8.0)
-    aws-sdk (2.10.129)
-      aws-sdk-resources (= 2.10.129)
-    aws-sdk-core (2.10.129)
+    aws-sdk (2.11.6)
+      aws-sdk-resources (= 2.11.6)
+    aws-sdk-core (2.11.6)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.10.129)
-      aws-sdk-core (= 2.10.129)
+    aws-sdk-resources (2.11.6)
+      aws-sdk-core (= 2.11.6)
     aws-sigv4 (1.0.2)
     berkshelf (4.3.5)
       addressable (~> 2.3, >= 2.3.4)
@@ -76,7 +78,7 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (13.7.16)
+    chef-config (13.8.0)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
@@ -90,9 +92,9 @@ GEM
     erubis (2.7.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.21)
-    ffi (1.9.21-x64-mingw32)
-    ffi (1.9.21-x86-mingw32)
+    ffi (1.9.23)
+    ffi (1.9.23-x64-mingw32)
+    ffi (1.9.23-x86-mingw32)
     ffi-yajl (2.3.1)
       libyajl2 (~> 1.2)
     fuzzyurl (0.9.0)
@@ -111,7 +113,7 @@ GEM
     kitchen-vagrant (0.19.0)
       test-kitchen (~> 1.4)
     libyajl2 (1.2.0)
-    license_scout (1.0.0)
+    license_scout (1.0.1)
       ffi-yajl (~> 2.2)
       mixlib-shellout (~> 2.2)
       toml-rb (~> 1.0)
@@ -148,7 +150,7 @@ GEM
     nori (2.6.0)
     octokit (4.8.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (8.26.1)
+    ohai (13.7.1)
       chef-config (>= 12.5.0.alpha.1, < 14)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)