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 2014/07/25 23:27:35 UTC
[2/7] git commit: Ensure that the 'source_paths' and
'extra_dependencies' properties in the findbugs addon does not contain arrays
or nils.
Ensure that the 'source_paths' and 'extra_dependencies' properties in the findbugs addon does not contain arrays or nils.
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/35a8d65c
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/35a8d65c
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/35a8d65c
Branch: refs/heads/master
Commit: 35a8d65c267034cb2beaf0999ed8044deba0ca09
Parents: 18fff04
Author: Peter Donald <pe...@realityforge.org>
Authored: Sat Jul 26 07:19:34 2014 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Sat Jul 26 07:19:34 2014 +1000
----------------------------------------------------------------------
CHANGELOG | 2 ++
addon/buildr/findbugs.rb | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/35a8d65c/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index ef8b027..ab391ec 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
1.4.20 (Pending)
+* Fixed: Ensure that the 'source_paths' and 'extra_dependencies' properties
+ in the findbugs addon does not contain arrays or nils.
* Fixed: Ensure that the 'single_intermediate_layout' addon removes the top
level target and reports directories during 'clean' phase.
* Fixed: Ensure that the 'source_paths' property in the pmd addon does not
http://git-wip-us.apache.org/repos/asf/buildr/blob/35a8d65c/addon/buildr/findbugs.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/findbugs.rb b/addon/buildr/findbugs.rb
index a5b8d05..7ae34e9 100644
--- a/addon/buildr/findbugs.rb
+++ b/addon/buildr/findbugs.rb
@@ -154,7 +154,7 @@ module Buildr
end
def source_paths
- @source_paths ||= [self.project.compile.sources, self.project.test.compile.sources]
+ @source_paths ||= [self.project.compile.sources, self.project.test.compile.sources].flatten.compact
end
def analyze_paths
@@ -162,7 +162,7 @@ module Buildr
end
def extra_dependencies
- @extra_dependencies ||= [self.project.compile.dependencies, self.project.test.compile.dependencies]
+ @extra_dependencies ||= [self.project.compile.dependencies, self.project.test.compile.dependencies].flatten.compact
end
protected