Don't require / include mixins that are built inremove_extra_includes

which and shell_out come for free in universal.

Signed-off-by: Tim Smith <tsmith@chef.io>

6 files changed, 0 insertions, 15 deletions

diff --git a/lib/chef/provider/package/cab.rb b/lib/chef/provider/package/cab.rb
index 3ede6dbe10..a6ae7b385b 100644
--- a/lib/chef/provider/package/cab.rb
+++ b/lib/chef/provider/package/cab.rb
@@ -18,7 +18,6 @@
 
 require_relative "../package"
 require_relative "../../resource/cab_package"
-require_relative "../../mixin/shell_out"
 require_relative "../../mixin/uris"
 require_relative "../../mixin/checksum"
 require "cgi" unless defined?(CGI)
@@ -27,7 +26,6 @@ class Chef
   class Provider
     class Package
       class Cab < Chef::Provider::Package
-        include Chef::Mixin::ShellOut
         include Chef::Mixin::Uris
         include Chef::Mixin::Checksum
 
diff --git a/lib/chef/provider/package/dnf.rb b/lib/chef/provider/package/dnf.rb
index 76961b5bde..445b543be2 100644
--- a/lib/chef/provider/package/dnf.rb
+++ b/lib/chef/provider/package/dnf.rb
@@ -17,8 +17,6 @@
 
 require_relative "../package"
 require_relative "../../resource/dnf_package"
-require_relative "../../mixin/which"
-require_relative "../../mixin/shell_out"
 require_relative "../../mixin/get_source_from_package"
 require_relative "dnf/python_helper"
 require_relative "dnf/version"
@@ -27,8 +25,6 @@ class Chef
   class Provider
     class Package
       class Dnf < Chef::Provider::Package
-        extend Chef::Mixin::Which
-        extend Chef::Mixin::ShellOut
         include Chef::Mixin::GetSourceFromPackage
 
         allow_nils
diff --git a/lib/chef/provider/package/msu.rb b/lib/chef/provider/package/msu.rb
index 4208260cbe..50b1d5e597 100644
--- a/lib/chef/provider/package/msu.rb
+++ b/lib/chef/provider/package/msu.rb
@@ -22,7 +22,6 @@
 # Reference: https://support.microsoft.com/en-in/kb/934307
 require_relative "../package"
 require_relative "../../resource/msu_package"
-require_relative "../../mixin/shell_out"
 require_relative "cab"
 require_relative "../../util/path_helper"
 require_relative "../../mixin/uris"
@@ -33,7 +32,6 @@ class Chef
   class Provider
     class Package
       class Msu < Chef::Provider::Package
-        include Chef::Mixin::ShellOut
         include Chef::Mixin::Uris
         include Chef::Mixin::Checksum
 
diff --git a/lib/chef/provider/package/openbsd.rb b/lib/chef/provider/package/openbsd.rb
index 38ff84f105..7a55d4bd4a 100644
--- a/lib/chef/provider/package/openbsd.rb
+++ b/lib/chef/provider/package/openbsd.rb
@@ -33,7 +33,6 @@ class Chef
         provides :package, os: "openbsd"
         provides :openbsd_package
 
-        include Chef::Mixin::ShellOut
         include Chef::Mixin::GetSourceFromPackage
 
         def initialize(*args)
diff --git a/lib/chef/provider/package/windows/exe.rb b/lib/chef/provider/package/windows/exe.rb
index 191e8fb4ae..b263881a6c 100644
--- a/lib/chef/provider/package/windows/exe.rb
+++ b/lib/chef/provider/package/windows/exe.rb
@@ -17,15 +17,11 @@
 # limitations under the License.
 #
 
-require_relative "../../../mixin/shell_out"
-
 class Chef
   class Provider
     class Package
       class Windows
         class Exe
-          include Chef::Mixin::ShellOut
-
           def initialize(resource, installer_type, uninstall_entries)
             @new_resource = resource
             @logger = new_resource.logger
diff --git a/lib/chef/provider/package/windows/msi.rb b/lib/chef/provider/package/windows/msi.rb
index 0624224f57..d1072ad007 100644
--- a/lib/chef/provider/package/windows/msi.rb
+++ b/lib/chef/provider/package/windows/msi.rb
@@ -19,7 +19,6 @@
 # TODO: Allow new_resource.source to be a Product Code as a GUID for uninstall / network install
 
 require_relative "../../../win32/api/installer" if RUBY_PLATFORM =~ /mswin|mingw32|windows/
-require_relative "../../../mixin/shell_out"
 
 class Chef
   class Provider
@@ -27,7 +26,6 @@ class Chef
       class Windows
         class MSI
           include Chef::ReservedNames::Win32::API::Installer if RUBY_PLATFORM =~ /mswin|mingw32|windows/
-          include Chef::Mixin::ShellOut
 
           def initialize(resource, uninstall_entries)
             @new_resource = resource