Merge pull request #6290 from chef/jsinha/BEN-180-chef-12

[BEN-180] Rename resource template in chef-12 and update omnibus

4 files changed, 22 insertions, 22 deletions

diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 879c37c538..97301f874c 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/chef/license_scout
-  revision: e9c48c6773dec6fd718642194bfcb166d5685e03
+  revision: 1bf2f1c9127516b933e9dc9c02db00c9b28a9cd3
   specs:
     license_scout (0.1.3)
       ffi-yajl (~> 2.2)
@@ -8,9 +8,9 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus
-  revision: 0212438d74eb408791724d737afba83868e416ed
+  revision: 2215d10c1d13c30f058f126806bff09807706c41
   specs:
-    omnibus (5.5.0)
+    omnibus (5.6.1)
       aws-sdk (~> 2)
       chef-sugar (~> 3.3)
       cleanroom (~> 1.0)
@@ -25,11 +25,11 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus-software
-  revision: 266a8ab07b0380607ce8a6ec5fd824ea002be2f1
+  revision: ecc5d6cb06610ae5b3c098d0ad32d1d202f47b4f
   specs:
     omnibus-software (4.0.0)
       chef-sugar (>= 3.4.0)
-      omnibus (>= 5.5.0)
+      omnibus (>= 5.6.1)
 
 GEM
   remote: https://rubygems.org/
@@ -37,15 +37,15 @@ GEM
     addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
     artifactory (2.8.2)
-    awesome_print (1.7.0)
-    aws-sdk (2.9.41)
-      aws-sdk-resources (= 2.9.41)
-    aws-sdk-core (2.9.41)
+    awesome_print (1.8.0)
+    aws-sdk (2.10.19)
+      aws-sdk-resources (= 2.10.19)
+    aws-sdk-core (2.10.19)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.9.41)
-      aws-sdk-core (= 2.9.41)
-    aws-sigv4 (1.0.0)
+    aws-sdk-resources (2.10.19)
+      aws-sdk-core (= 2.10.19)
+    aws-sigv4 (1.0.1)
     berkshelf (4.3.5)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (~> 2.0, >= 2.0.2)
@@ -85,12 +85,12 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (13.1.31)
+    chef-config (13.2.20)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
-    chef-sugar (3.4.0)
+    chef-sugar (3.5.0)
     cleanroom (1.0.0)
     coderay (1.1.1)
     debug_inspector (0.0.3)
@@ -99,14 +99,14 @@ GEM
       multipart-post (>= 1.2, < 3)
     ffi (1.9.18)
     ffi (1.9.18-x86-mingw32)
-    ffi-yajl (2.3.0)
+    ffi-yajl (2.3.1)
       libyajl2 (~> 1.2)
     fuzzyurl (0.9.0)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
-    hashie (3.5.5)
+    hashie (3.5.6)
     hitimes (1.2.5)
     hitimes (1.2.5-x86-mingw32)
     httpclient (2.7.2)
@@ -135,11 +135,11 @@ GEM
       mixlib-versioning
       thor
     mixlib-log (1.7.1)
-    mixlib-shellout (2.2.7)
-    mixlib-shellout (2.2.7-universal-mingw32)
+    mixlib-shellout (2.3.2)
+    mixlib-shellout (2.3.2-universal-mingw32)
       win32-process (~> 0.8.2)
       wmi-lite (~> 1.0)
-    mixlib-versioning (1.1.0)
+    mixlib-versioning (1.2.2)
     molinillo (0.4.5)
     multi_json (1.12.1)
     multipart-post (2.0.0)
@@ -152,7 +152,7 @@ GEM
     nori (2.6.0)
     octokit (4.7.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (8.24.0)
+    ohai (8.24.1)
       chef-config (>= 12.5.0.alpha.1, < 14)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
diff --git a/omnibus/resources/chef/ips/symlinks.erb b/omnibus/resources/chef/ips/chef-symlinks.erb
index 419d52ddf7..419d52ddf7 100644
--- a/omnibus/resources/chef/ips/symlinks.erb
+++ b/omnibus/resources/chef/ips/chef-symlinks.erb
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 8ea3f3be48..8c97f16d8a 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -2,7 +2,7 @@
 override :rubygems, version: "2.6.10"
 override :bundler, version: "1.12.5"
 override "libffi", version: "3.2.1"
-override "libiconv", version: "1.14"
+override "libiconv", version: "1.15"
 override "liblzma", version: "5.2.2"
 override "libtool", version: "2.4.2"
 override "libxml2", version: "2.9.4"
diff --git a/version_policy.rb b/version_policy.rb
index 85c29a760b..34336f7296 100644
--- a/version_policy.rb
+++ b/version_policy.rb
@@ -22,7 +22,7 @@ OMNIBUS_OVERRIDES = {
   # https://github.com/chef/omnibus-software/blob/aefb7e79d29ca746c3f843673ef5e317fa3cba54/config/software/libtool.rb#L23
   :bundler => "1.12.5", # until we figure out how to work with 1.13.0
   "libffi" => "3.2.1",
-  "libiconv" => "1.14",
+  "libiconv" => "1.15",
   "liblzma" => "5.2.2",
   ## according to comment in omnibus-sw, the very latest versions don't work on solaris
   # https://github.com/chef/omnibus-software/blob/aefb7e79d29ca746c3f843673ef5e317fa3cba54/config/software/libtool.rb#L23