Pick up omnibus and omnibus-software that supports including licensing information of transitive dependencies in the omnibus package.sersut/transitive-dep-licensing

15 files changed, 17 insertions, 2 deletions

diff --git a/omnibus/config/software/chef-appbundle.rb b/omnibus/config/software/chef-appbundle.rb
index 495f58bfb1..8ea21103fb 100644
--- a/omnibus/config/software/chef-appbundle.rb
+++ b/omnibus/config/software/chef-appbundle.rb
@@ -2,6 +2,7 @@ name "chef-appbundle"
 default_version "local_source"
 
 license :project_license
+skip_transitive_dependency_licensing true
 
 source path: project.files_path
 
diff --git a/omnibus/config/software/chef-complete.rb b/omnibus/config/software/chef-complete.rb
index 0098f89cdf..8ca370c832 100644
--- a/omnibus/config/software/chef-complete.rb
+++ b/omnibus/config/software/chef-complete.rb
@@ -1,6 +1,7 @@
 name "chef-complete"
 
 license :project_license
+skip_transitive_dependency_licensing true
 
 dependency "chef"
 dependency "chef-appbundle"
diff --git a/omnibus/config/software/chef-gem-binding_of_caller.rb b/omnibus/config/software/chef-gem-binding_of_caller.rb
index ed9083f3b9..3e7a9f9c70 100644
--- a/omnibus/config/software/chef-gem-binding_of_caller.rb
+++ b/omnibus/config/software/chef-gem-binding_of_caller.rb
@@ -7,3 +7,4 @@ BuildChefGem::GemInstallSoftwareDef.define(self, __FILE__)
 
 license "MIT"
 license_file "https://github.com/banister/binding_of_caller/blob/master/LICENSE"
+skip_transitive_dependency_licensing true
diff --git a/omnibus/config/software/chef-gem-byebug.rb b/omnibus/config/software/chef-gem-byebug.rb
index f16daa29a0..3aef706e82 100644
--- a/omnibus/config/software/chef-gem-byebug.rb
+++ b/omnibus/config/software/chef-gem-byebug.rb
@@ -7,3 +7,4 @@ BuildChefGem::GemInstallSoftwareDef.define(self, __FILE__)
 
 license "MIT"
 license_file "https://github.com/deivid-rodriguez/byebug/blob/master/LICENSE"
+skip_transitive_dependency_licensing true
diff --git a/omnibus/config/software/chef-gem-debug_inspector.rb b/omnibus/config/software/chef-gem-debug_inspector.rb
index a3432a8de3..ab818768ea 100644
--- a/omnibus/config/software/chef-gem-debug_inspector.rb
+++ b/omnibus/config/software/chef-gem-debug_inspector.rb
@@ -7,3 +7,4 @@ BuildChefGem::GemInstallSoftwareDef.define(self, __FILE__)
 
 license "MIT"
 license_file "https://github.com/banister/debug_inspector/blob/master/README.md"
+skip_transitive_dependency_licensing true
diff --git a/omnibus/config/software/chef-gem-ffi-yajl.rb b/omnibus/config/software/chef-gem-ffi-yajl.rb
index bba55a3882..44f98446bd 100644
--- a/omnibus/config/software/chef-gem-ffi-yajl.rb
+++ b/omnibus/config/software/chef-gem-ffi-yajl.rb
@@ -7,5 +7,6 @@ BuildChefGem::GemInstallSoftwareDef.define(self, __FILE__)
 
 license "MIT"
 license_file "https://github.com/chef/ffi-yajl/blob/master/LICENSE"
+skip_transitive_dependency_licensing true
 
 dependency "chef-gem-libyajl2"
diff --git a/omnibus/config/software/chef-gem-ffi.rb b/omnibus/config/software/chef-gem-ffi.rb
index 4d54105a0c..ea8879c2ac 100644
--- a/omnibus/config/software/chef-gem-ffi.rb
+++ b/omnibus/config/software/chef-gem-ffi.rb
@@ -5,7 +5,8 @@
 require_relative "../../files/chef-gem/build-chef-gem/gem-install-software-def"
 BuildChefGem::GemInstallSoftwareDef.define(self, __FILE__)
 
-license "BSD-3-CLAUSE"
+license "BSD-3-Clause"
 license_file "https://github.com/ffi/ffi/blob/master/LICENSE"
 license_file "https://github.com/ffi/ffi/blob/master/COPYING"
 license_file "https://github.com/ffi/ffi/blob/master/LICENSE.SPECS"
+skip_transitive_dependency_licensing true
diff --git a/omnibus/config/software/chef-gem-json.rb b/omnibus/config/software/chef-gem-json.rb
index b2d848c77a..9217359ba2 100644
--- a/omnibus/config/software/chef-gem-json.rb
+++ b/omnibus/config/software/chef-gem-json.rb
@@ -8,3 +8,4 @@ BuildChefGem::GemInstallSoftwareDef.define(self, __FILE__)
 license "Ruby"
 license_file "https://github.com/flori/json/blob/master/README.md"
 license_file "https://www.ruby-lang.org/en/about/license.txt"
+skip_transitive_dependency_licensing true
diff --git a/omnibus/config/software/chef-gem-libyajl2.rb b/omnibus/config/software/chef-gem-libyajl2.rb
index 609e3c3089..47ef42e1cf 100644
--- a/omnibus/config/software/chef-gem-libyajl2.rb
+++ b/omnibus/config/software/chef-gem-libyajl2.rb
@@ -7,3 +7,4 @@ BuildChefGem::GemInstallSoftwareDef.define(self, __FILE__)
 
 license "Apache-2.0"
 license_file "https://github.com/chef/libyajl2-gem/blob/master/LICENSE"
+skip_transitive_dependency_licensing true
diff --git a/omnibus/config/software/chef-gem-mini_portile2.rb b/omnibus/config/software/chef-gem-mini_portile2.rb
index 9ffa040c14..36a2b833dd 100644
--- a/omnibus/config/software/chef-gem-mini_portile2.rb
+++ b/omnibus/config/software/chef-gem-mini_portile2.rb
@@ -7,3 +7,4 @@ BuildChefGem::GemInstallSoftwareDef.define(self, __FILE__)
 
 license "MIT"
 license_file "https://github.com/flavorjones/mini_portile/blob/master/LICENSE.txt"
+skip_transitive_dependency_licensing true
diff --git a/omnibus/config/software/chef-gem-nokogiri.rb b/omnibus/config/software/chef-gem-nokogiri.rb
index a25a47d341..c6b8d03822 100644
--- a/omnibus/config/software/chef-gem-nokogiri.rb
+++ b/omnibus/config/software/chef-gem-nokogiri.rb
@@ -7,6 +7,7 @@ BuildChefGem::GemInstallSoftwareDef.define(self, __FILE__)
 
 license "MIT"
 license_file "https://github.com/ruby-prof/ruby-prof/blob/master/LICENSE"
+skip_transitive_dependency_licensing true
 
 dependency "chef-gem-pkg-config"
 dependency "chef-gem-mini_portile2"
diff --git a/omnibus/config/software/chef-gem-pkg-config.rb b/omnibus/config/software/chef-gem-pkg-config.rb
index 9c6e6fa695..051091b73f 100644
--- a/omnibus/config/software/chef-gem-pkg-config.rb
+++ b/omnibus/config/software/chef-gem-pkg-config.rb
@@ -7,3 +7,4 @@ BuildChefGem::GemInstallSoftwareDef.define(self, __FILE__)
 
 license "LGPL-2.1"
 license_file "https://github.com/ruby-gnome2/pkg-config/blob/master/LGPL-2.1"
+skip_transitive_dependency_licensing true
diff --git a/omnibus/config/software/chef-gem-ruby-prof.rb b/omnibus/config/software/chef-gem-ruby-prof.rb
index 47ecfea02a..af90212d23 100644
--- a/omnibus/config/software/chef-gem-ruby-prof.rb
+++ b/omnibus/config/software/chef-gem-ruby-prof.rb
@@ -5,5 +5,6 @@
 require_relative "../../files/chef-gem/build-chef-gem/gem-install-software-def"
 BuildChefGem::GemInstallSoftwareDef.define(self, __FILE__)
 
-license "BSD-2-CLAUSE"
+license "BSD-2-Clause"
 license_file "https://github.com/ruby-prof/ruby-prof/blob/master/LICENSE"
+skip_transitive_dependency_licensing true
diff --git a/omnibus/config/software/chef-gem-ruby-shadow.rb b/omnibus/config/software/chef-gem-ruby-shadow.rb
index 8091fd9460..02fc906d9d 100644
--- a/omnibus/config/software/chef-gem-ruby-shadow.rb
+++ b/omnibus/config/software/chef-gem-ruby-shadow.rb
@@ -8,3 +8,4 @@ BuildChefGem::GemInstallSoftwareDef.define(self, __FILE__)
 license "Public-Domain"
 license_file "https://github.com/apalmblad/ruby-shadow/blob/master/LICENSE"
 license_file "http://creativecommons.org/licenses/publicdomain/"
+skip_transitive_dependency_licensing true
diff --git a/omnibus/config/software/chef-remove-docs.rb b/omnibus/config/software/chef-remove-docs.rb
index 2e71e63792..31e2797afd 100644
--- a/omnibus/config/software/chef-remove-docs.rb
+++ b/omnibus/config/software/chef-remove-docs.rb
@@ -17,6 +17,7 @@
 name "chef-remove-docs"
 
 license :project_license
+skip_transitive_dependency_licensing true
 
 build do
   # This is where we get the definitions below