Repository: buildr Updated Branches: refs/heads/master 478c7cdff -> 7f68ba739
Add support for adding dependencies to the pom via the `pom.additional_dependencies` configuration setting Project: http://git-wip-us.apache.org/repos/asf/buildr/repo Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/7f68ba73 Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/7f68ba73 Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/7f68ba73 Branch: refs/heads/master Commit: 7f68ba7390d343d9cf4794c7eb7006c997807e04 Parents: 478c7cd Author: Peter Donald <pe...@realityforge.org> Authored: Thu Mar 22 21:43:35 2018 +1100 Committer: Peter Donald <pe...@realityforge.org> Committed: Thu Mar 22 21:43:35 2018 +1100 ---------------------------------------------------------------------- CHANGELOG | 3 +++ lib/buildr/java/custom_pom.rb | 13 +++++++++++++ 2 files changed, 16 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/buildr/blob/7f68ba73/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index 2ba3014..aadd985 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,7 @@ 1.5.6 (Pending) +* Added: Add support for adding dependencies to the pom via the `pom.additional_dependencies` configuration + setting. These dependencies are `compile` scope and are in addition to any derived from the normal + compile dependencies. * Fixed: Dependencies added as `pom.provided_dependencies` or `pom.runtime_dependencies` and not included as compile dependencies were incorrectly omitted from pom. * Fixed: Dependencies added as `pom.provided_dependencies` and `pom.runtime_dependencies` were being http://git-wip-us.apache.org/repos/asf/buildr/blob/7f68ba73/lib/buildr/java/custom_pom.rb ---------------------------------------------------------------------- diff --git a/lib/buildr/java/custom_pom.rb b/lib/buildr/java/custom_pom.rb index 292d2eb..2e0337a 100644 --- a/lib/buildr/java/custom_pom.rb +++ b/lib/buildr/java/custom_pom.rb @@ -128,6 +128,14 @@ module Buildr @runtime_dependencies = runtime_dependencies end + def additional_dependencies + @additional_dependencies ||= [] + end + + def additional_dependencies=(additional_dependencies) + @additional_dependencies = additional_dependencies + end + def optional_dependencies @optional_dependencies ||= [] end @@ -214,6 +222,7 @@ module Buildr provided_deps = Buildr.artifacts(project.pom.provided_dependencies) runtime_deps = Buildr.artifacts(project.pom.runtime_dependencies) + additional_deps = Buildr.artifacts(project.pom.additional_dependencies) optional_deps = Buildr.artifacts(project.pom.optional_dependencies).collect{|dep| dep.to_s} done = [] @@ -227,6 +236,10 @@ module Buildr select {|d| d.is_a?(ActsAsArtifact)}. select {|d| !done.include?(d.to_s)}. collect {|dep| done << dep.to_s; dep.to_hash.merge(:scope => 'runtime', :optional => optional_deps.include?(dep.to_s))} + deps += additional_deps. + select {|d| d.is_a?(ActsAsArtifact)}. + select {|d| !done.include?(d.to_s)}. + collect {|dep| done << dep.to_s; dep.to_hash.merge(:scope => 'compile', :optional => optional_deps.include?(dep.to_s))} deps += Buildr.artifacts(project.compile.dependencies).
