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/24 01:46:51 UTC

git commit: Ensure that the 'source_paths' property in the pmd addon does not arrays or nils.

Repository: buildr
Updated Branches:
  refs/heads/master 65ffd4c50 -> 84a948b39


Ensure that the 'source_paths' property in the pmd addon does not 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/84a948b3
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/84a948b3
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/84a948b3

Branch: refs/heads/master
Commit: 84a948b39b2cddf258c271fedd57ef76256be6e0
Parents: 65ffd4c
Author: Peter Donald <pe...@realityforge.org>
Authored: Thu Jul 24 09:46:44 2014 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Thu Jul 24 09:46:44 2014 +1000

----------------------------------------------------------------------
 CHANGELOG           | 2 ++
 addon/buildr/pmd.rb | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/buildr/blob/84a948b3/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index fca4fa1..7e04869 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
 1.4.20 (Pending)
+* Fixed:  Ensure that the 'source_paths' property in the pmd addon does not
+          arrays or nils.
 
 1.4.19 (2014-07-06)
 * Fixed:  BUILDR-700 - Ensure SNAPSHOT artifacts, constructed using the

http://git-wip-us.apache.org/repos/asf/buildr/blob/84a948b3/addon/buildr/pmd.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/pmd.rb b/addon/buildr/pmd.rb
index 9e6be27..0752221 100644
--- a/addon/buildr/pmd.rb
+++ b/addon/buildr/pmd.rb
@@ -113,7 +113,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 flat_source_paths