From e61383c98a24274b438d45bb48a645361bfe68c6 Mon Sep 17 00:00:00 2001
From: Thom May <thom@chef.io>
Date: Wed, 25 Oct 2017 14:34:07 +0100
Subject: update omnibus for windows xslt reloc

Signed-off-by: Thom May <thom@chef.io>
---
 omnibus/Gemfile      |  2 +-
 omnibus/Gemfile.lock | 41 +++++++++++++++++++++++------------------
 omnibus_overrides.rb |  2 +-
 3 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index 652a6e69b8..02ad5f3af8 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-software", git: "https://github.com/chef/omnibus-software", branch: "tm/new_win_xslt"
 gem "license_scout", git: "https://github.com/chef/license_scout"
 
 gem "pedump"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 2bfb0931e2..d7379e893c 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/chef/license_scout
-  revision: 013b1f8b9663f76fd0d1cd0bb95c8fb5b5198f3f
+  revision: b7b1e6c5d027f201fc4fa30c775384112d81c1bd
   specs:
     license_scout (0.1.3)
       ffi-yajl (~> 2.2)
@@ -9,7 +9,7 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus
-  revision: 52393d7cab443b61790f94c62775d9032d283497
+  revision: e3807801e61b9012ea2e0677a60c2bf72c0e4972
   specs:
     omnibus (5.6.1)
       aws-sdk (~> 2)
@@ -26,7 +26,8 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus-software
-  revision: 23de2052e79b7a03d2b0a080d2f6e111ce4c760d
+  revision: a6782df1ec688b92ce4451e4c11034cba0cfb917
+  branch: tm/new_win_xslt
   specs:
     omnibus-software (4.0.0)
       chef-sugar (>= 3.4.0)
@@ -37,15 +38,14 @@ GEM
   specs:
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
-    artifactory (2.8.2)
     awesome_print (1.8.0)
-    aws-sdk (2.10.54)
-      aws-sdk-resources (= 2.10.54)
-    aws-sdk-core (2.10.54)
+    aws-sdk (2.10.71)
+      aws-sdk-resources (= 2.10.71)
+    aws-sdk-core (2.10.71)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.10.54)
-      aws-sdk-core (= 2.10.54)
+    aws-sdk-resources (2.10.71)
+      aws-sdk-core (= 2.10.71)
     aws-sigv4 (1.0.2)
     berkshelf (4.3.5)
       addressable (~> 2.3, >= 2.3.4)
@@ -69,7 +69,7 @@ GEM
       faraday (~> 0.9.1)
       httpclient (~> 2.7.0)
       ridley (~> 4.5)
-    binding_of_caller (0.7.2)
+    binding_of_caller (0.7.3)
       debug_inspector (>= 0.0.1)
     buff-config (1.0.1)
       buff-extensions (~> 1.0)
@@ -86,7 +86,7 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (13.4.24)
+    chef-config (13.5.3)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
@@ -131,8 +131,7 @@ GEM
     mixlib-authentication (1.4.2)
     mixlib-cli (1.7.0)
     mixlib-config (2.2.4)
-    mixlib-install (2.1.12)
-      artifactory
+    mixlib-install (3.6.0)
       mixlib-shellout
       mixlib-versioning
       thor
@@ -154,7 +153,7 @@ GEM
     nori (2.6.0)
     octokit (4.7.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (8.24.1)
+    ohai (8.25.0)
       chef-config (>= 12.5.0.alpha.1, < 14)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
@@ -174,7 +173,7 @@ GEM
       zhexdump (>= 0.0.2)
     plist (3.3.0)
     progressbar (1.9.0)
-    pry (0.11.1)
+    pry (0.11.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     pry-byebug (3.5.0)
@@ -215,18 +214,21 @@ GEM
       molinillo (~> 0.4.2)
       semverse (~> 1.1)
     systemu (2.6.5)
-    test-kitchen (1.17.0)
-      mixlib-install (>= 1.2, < 3.0)
+    test-kitchen (1.18.0)
+      mixlib-install (~> 3.6)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
       net-ssh (>= 2.9, < 5.0)
       net-ssh-gateway (~> 1.2)
       safe_yaml (~> 1.0)
       thor (~> 0.19, < 0.19.2)
+      winrm (~> 2.0)
+      winrm-elevated (~> 1.0)
+      winrm-fs (~> 1.0.2)
     thor (0.19.1)
     timers (4.0.4)
       hitimes
-    toml-rb (1.0.0)
+    toml-rb (1.1.0)
       citrus (~> 3.0, > 3.0)
     varia_model (0.4.1)
       buff-extensions (~> 1.0)
@@ -242,6 +244,9 @@ GEM
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
       rubyntlm (~> 0.6.0, >= 0.6.1)
+    winrm-elevated (1.1.0)
+      winrm (~> 2.0)
+      winrm-fs (~> 1.0)
     winrm-fs (1.0.2)
       erubis (~> 2.7)
       logging (>= 1.6.1, < 3.0)
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 5e2f1af4d9..fe0d649719 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -9,7 +9,7 @@ override "libiconv", version: "1.14"
 override "liblzma", version: "5.2.3"
 override "libtool", version: "2.4.2"
 override "libxml2", version: "2.9.4"
-override "libxslt", version: "1.1.29"
+override "libxslt", version: "1.1.30"
 override "libyaml", version: "0.1.6"
 override "makedepend", version: "1.0.5"
 override "ncurses", version: "5.9"
-- 
cgit v1.2.1