You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildr.apache.org by do...@apache.org on 2018/03/22 11:32:24 UTC
buildr git commit: Add support for allowing some dependencies to
include transitive dependencies via the `pom.include_transitive_dependencies`
configuration setting.
Repository: buildr
Updated Branches:
refs/heads/master 7f68ba739 -> b89918871
Add support for allowing some dependencies to include transitive dependencies via the `pom.include_transitive_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/b8991887
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/b8991887
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/b8991887
Branch: refs/heads/master
Commit: b89918871b6789e80a201f4d8aca179f845b1201
Parents: 7f68ba7
Author: Peter Donald <pe...@realityforge.org>
Authored: Thu Mar 22 22:32:17 2018 +1100
Committer: Peter Donald <pe...@realityforge.org>
Committed: Thu Mar 22 22:32:17 2018 +1100
----------------------------------------------------------------------
CHANGELOG | 2 +
lib/buildr/java/custom_pom.rb | 75 ++++++++++++++++++++++----------------
2 files changed, 45 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/b8991887/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index aadd985..fd4448c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
1.5.6 (Pending)
+* Added: Add support for allowing some dependencies to include transitive dependencies via the
+ `pom.include_transitive_dependencies` configuration setting.
* 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.
http://git-wip-us.apache.org/repos/asf/buildr/blob/b8991887/lib/buildr/java/custom_pom.rb
----------------------------------------------------------------------
diff --git a/lib/buildr/java/custom_pom.rb b/lib/buildr/java/custom_pom.rb
index 2e0337a..355b75e 100644
--- a/lib/buildr/java/custom_pom.rb
+++ b/lib/buildr/java/custom_pom.rb
@@ -136,6 +136,14 @@ module Buildr
@additional_dependencies = additional_dependencies
end
+ def include_transitive_dependencies
+ @include_transitive_dependencies ||= []
+ end
+
+ def include_transitive_dependencies=(include_transitive_dependencies)
+ @include_transitive_dependencies = include_transitive_dependencies
+ end
+
def optional_dependencies
@optional_dependencies ||= []
end
@@ -221,39 +229,40 @@ module Buildr
end unless project.pom.developers.empty?
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 = []
-
- deps = []
- deps += provided_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 => 'provided', :optional => optional_deps.include?(dep.to_s))}
- deps += runtime_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 => '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).
+ runtime_deps = Buildr.artifacts(project.pom.runtime_dependencies)
+ additional_deps = Buildr.artifacts(project.pom.additional_dependencies)
+ include_transitive_deps = Buildr.artifacts(project.pom.include_transitive_dependencies).collect {|dep| dep.to_s}
+ optional_deps = Buildr.artifacts(project.pom.optional_dependencies).collect {|dep| dep.to_s}
+
+ done = []
+
+ deps = []
+ deps += provided_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 => 'provided', :optional => optional_deps.include?(dep.to_s), :include_transitive => include_transitive_deps.include?(dep.to_s))}
+ deps += runtime_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 => 'runtime', :optional => optional_deps.include?(dep.to_s), :include_transitive => include_transitive_deps.include?(dep.to_s))}
+ deps += additional_deps.
select {|d| d.is_a?(ActsAsArtifact)}.
select {|d| !done.include?(d.to_s)}.
- collect {|d| done << d.to_s; d.to_hash.merge(:scope => 'compile', :optional => optional_deps.include?(d.to_s))}
+ collect {|dep| done << dep.to_s; dep.to_hash.merge(:scope => 'compile', :optional => optional_deps.include?(dep.to_s), :include_transitive => include_transitive_deps.include?(dep.to_s))}
- deps += Buildr.artifacts(project.test.compile.dependencies).
- select {|d| d.is_a?(ActsAsArtifact)}.
- select {|d| !done.include?(d.to_s)}.
- collect {|d| d.to_hash.merge(:scope => 'test')}
+ deps +=
+ Buildr.artifacts(project.compile.dependencies).
+ select {|d| d.is_a?(ActsAsArtifact)}.
+ select {|d| !done.include?(d.to_s)}.
+ collect {|d| done << d.to_s; d.to_hash.merge(:scope => 'compile', :optional => optional_deps.include?(d.to_s), :include_transitive => include_transitive_deps.include?(d.to_s))}
+
+ deps += Buildr.artifacts(project.test.compile.dependencies).
+ select {|d| d.is_a?(ActsAsArtifact)}.
+ select {|d| !done.include?(d.to_s)}.
+ collect {|d| d.to_hash.merge(:scope => 'test', :include_transitive => include_transitive_deps.include?(d.to_s))}
xml.dependencies do
- deps.select{|dependency| project.pom.dependency_filter.nil? ? true : project.pom.dependency_filter.call(dependency) }.each do |dependency|
+ deps.select {|dependency| project.pom.dependency_filter.nil? ? true : project.pom.dependency_filter.call(dependency)}.each do |dependency|
xml.dependency do
xml.groupId dependency[:group]
xml.artifactId dependency[:id]
@@ -261,10 +270,12 @@ module Buildr
xml.classifier dependency[:classifier] if dependency[:classifier] && dependency[:classifier].to_s != 'jar'
xml.scope dependency[:scope] unless dependency[:scope] == 'compile'
xml.optional true if dependency[:optional]
- xml.exclusions do
- xml.exclusion do
- xml.groupId '*'
- xml.artifactId '*'
+ unless dependency[:include_transitive]
+ xml.exclusions do
+ xml.exclusion do
+ xml.groupId '*'
+ xml.artifactId '*'
+ end
end
end
end