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/09/22 02:58:18 UTC
[1/3] git commit: Update pmd addon to use pmd version 5.1.3.
Repository: buildr
Updated Branches:
refs/heads/master 3ab4ac621 -> e7f6ce487
Update pmd addon to use pmd version 5.1.3.
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/887cd2df
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/887cd2df
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/887cd2df
Branch: refs/heads/master
Commit: 887cd2df9780d0ee3d41d5b26e17b3adbcc36377
Parents: 3ab4ac6
Author: Peter Donald <pe...@realityforge.org>
Authored: Mon Sep 22 08:52:54 2014 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Mon Sep 22 08:52:54 2014 +1000
----------------------------------------------------------------------
CHANGELOG | 1 +
addon/buildr/pmd.rb | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/887cd2df/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index b959b9c..672644f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,5 @@
1.4.21 (Pending)
+* Fixed : Update pmd addon to use pmd version 5.1.3.
* Fixed : BUILDR-702 - Retain Unix permission flags when merging
zip files into another zip or tar archive. Submitted by Pepijn Van Eeckhoudt.
http://git-wip-us.apache.org/repos/asf/buildr/blob/887cd2df/addon/buildr/pmd.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/pmd.rb b/addon/buildr/pmd.rb
index 0752221..ad9f170 100644
--- a/addon/buildr/pmd.rb
+++ b/addon/buildr/pmd.rb
@@ -25,7 +25,7 @@ module Buildr
# The specs for requirements
def dependencies
[
- 'net.sourceforge.pmd:pmd:jar:5.1.1',
+ 'net.sourceforge.pmd:pmd:jar:5.1.3',
'jaxen:jaxen:jar:1.1.1',
'commons-io:commons-io:jar:2.2',
'com.beust:jcommander:jar:1.27',
[2/3] git commit: Prefer single quotes
Posted by do...@apache.org.
Prefer single quotes
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/85be90c3
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/85be90c3
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/85be90c3
Branch: refs/heads/master
Commit: 85be90c32e23b1328fa4c96d97934872c23a7759
Parents: 887cd2d
Author: Peter Donald <pe...@realityforge.org>
Authored: Mon Sep 22 08:55:57 2014 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Mon Sep 22 08:55:57 2014 +1000
----------------------------------------------------------------------
addon/buildr/pmd.rb | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/85be90c3/addon/buildr/pmd.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/pmd.rb b/addon/buildr/pmd.rb
index ad9f170..ba42a07 100644
--- a/addon/buildr/pmd.rb
+++ b/addon/buildr/pmd.rb
@@ -17,7 +17,7 @@ module Buildr
# Provides the <code>pmd:rule:xml</code>, <code>pmd:rule:html</code>, <code>pmd:cpd:xml</code>
# and <code>pmd:cpd:html</code> tasks.
#
- # Require explicitly using <code>require "buildr/pmd"</code>.
+ # Require explicitly using <code>require 'buildr/pmd'</code>.
module Pmd
class << self
@@ -38,10 +38,10 @@ module Buildr
cp = Buildr.artifacts(dependencies).each(&:invoke).map(&:to_s)
(options[:rule_set_paths] || []).each {|p| cp << p}
- puts "PMD: Analyzing source code..."
+ puts 'PMD: Analyzing source code...'
mkdir_p File.dirname(output_file_prefix)
- Buildr.ant("pmd-report") do |ant|
+ Buildr.ant('pmd-report') do |ant|
ant.taskdef :name=> 'pmd', :classpath => cp.join(';'), :classname => 'net.sourceforge.pmd.ant.PMDTask'
ant.pmd :shortFilenames => true, :rulesetfiles => rule_set_files.join(',') do
ant.formatter :type => format, :toFile => "#{output_file_prefix}.#{format}"
@@ -59,10 +59,10 @@ module Buildr
minimum_token_count = options[:minimum_token_count] || 100
encoding = options[:encoding] || 'UTF-8'
- puts "PMD-CPD: Analyzing source code..."
+ puts 'PMD-CPD: Analyzing source code...'
mkdir_p File.dirname(output_file_prefix)
- Buildr.ant("cpd-report") do |ant|
+ Buildr.ant('cpd-report') do |ant|
ant.taskdef :name=> 'cpd', :classpath => cp.join(';'), :classname => 'net.sourceforge.pmd.cpd.CPDTask'
ant.cpd :format => format, :minimumTokenCount => minimum_token_count, :encoding => encoding, :outputFile => "#{output_file_prefix}.#{format}" do
source_paths.each do |src|
@@ -138,23 +138,23 @@ module Buildr
after_define do |project|
if project.pmd.enabled?
- desc "Generate pmd xml report."
- project.task("pmd:rule:xml") do
+ desc 'Generate pmd xml report.'
+ project.task('pmd:rule:xml') do
Buildr::Pmd.pmd(project.pmd.rule_set_files, 'xml', project.pmd.output_file_prefix, project.pmd.flat_source_paths, :rule_set_paths => project.pmd.rule_set_paths)
end
- desc "Generate pmd html report."
- project.task("pmd:rule:html") do
+ desc 'Generate pmd html report.'
+ project.task('pmd:rule:html') do
Buildr::Pmd.pmd(project.pmd.rule_set_files, 'html', project.pmd.output_file_prefix, project.pmd.flat_source_paths, :rule_set_paths => project.pmd.rule_set_paths)
end
- desc "Generate pmd cpd xml report."
- project.task("pmd:cpd:xml") do
+ desc 'Generate pmd cpd xml report.'
+ project.task('pmd:cpd:xml') do
Buildr::Pmd.cpd('xml', project.pmd.cpd_output_file_prefix, project.pmd.flat_source_paths)
end
- desc "Generate pmd cpd text report."
- project.task("pmd:cpd:text") do
+ desc 'Generate pmd cpd text report.'
+ project.task('pmd:cpd:text') do
Buildr::Pmd.cpd('text', project.pmd.cpd_output_file_prefix, project.pmd.flat_source_paths)
end
end
[3/3] git commit: Update pmd addon to support downloading rule files
as an artifact.
Posted by do...@apache.org.
Update pmd addon to support downloading rule files as an artifact.
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/e7f6ce48
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/e7f6ce48
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/e7f6ce48
Branch: refs/heads/master
Commit: e7f6ce487ffb5fdb5e555b364d2b189a45ce8cfd
Parents: 85be90c
Author: Peter Donald <pe...@realityforge.org>
Authored: Mon Sep 22 08:57:46 2014 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Mon Sep 22 08:57:46 2014 +1000
----------------------------------------------------------------------
CHANGELOG | 5 +++--
addon/buildr/pmd.rb | 23 +++++++++++++++++++----
2 files changed, 22 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/e7f6ce48/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 672644f..a4d5894 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
1.4.21 (Pending)
-* Fixed : Update pmd addon to use pmd version 5.1.3.
-* Fixed : BUILDR-702 - Retain Unix permission flags when merging
+* Added: Update pmd addon to support downloading rule files as an artifact.
+* Change: Update pmd addon to use pmd version 5.1.3.
+* Fixed: BUILDR-702 - Retain Unix permission flags when merging
zip files into another zip or tar archive. Submitted by Pepijn Van Eeckhoudt.
1.4.20 (2014-08-23)
http://git-wip-us.apache.org/repos/asf/buildr/blob/e7f6ce48/addon/buildr/pmd.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/pmd.rb b/addon/buildr/pmd.rb
index ba42a07..5110e62 100644
--- a/addon/buildr/pmd.rb
+++ b/addon/buildr/pmd.rb
@@ -38,12 +38,22 @@ module Buildr
cp = Buildr.artifacts(dependencies).each(&:invoke).map(&:to_s)
(options[:rule_set_paths] || []).each {|p| cp << p}
+ rule_sets = rule_set_files.dup
+
+ Buildr.artifacts(options[:rule_set_artifacts] || []).each do |artifact|
+ a = artifact.to_s
+ dirname = File.dirname(a)
+ rule_sets << a[dirname.length + 1, a.length]
+ cp << File.dirname(a)
+ artifact.invoke
+ end
+
puts 'PMD: Analyzing source code...'
mkdir_p File.dirname(output_file_prefix)
Buildr.ant('pmd-report') do |ant|
ant.taskdef :name=> 'pmd', :classpath => cp.join(';'), :classname => 'net.sourceforge.pmd.ant.PMDTask'
- ant.pmd :shortFilenames => true, :rulesetfiles => rule_set_files.join(',') do
+ ant.pmd :shortFilenames => true, :rulesetfiles => rule_sets.join(',') do
ant.formatter :type => format, :toFile => "#{output_file_prefix}.#{format}"
source_paths.each do |src|
ant.fileset :dir=> src, :includes=>'**/*.java'
@@ -85,7 +95,12 @@ module Buildr
attr_writer :rule_set_files
def rule_set_files
- @rule_set_files ||= ['rulesets/java/basic.xml', 'rulesets/java/imports.xml', 'rulesets/java/unusedcode.xml', 'rulesets/java/finalizers.xml', 'rulesets/java/braces.xml']
+ @rule_set_files ||= (self.rule_set_artifacts.empty? ? ['rulesets/java/basic.xml', 'rulesets/java/imports.xml', 'rulesets/java/unusedcode.xml', 'rulesets/java/finalizers.xml', 'rulesets/java/braces.xml'] : [])
+ end
+
+ # Support specification of rule sets that are distributed as part of a maven repository
+ def rule_set_artifacts
+ @rule_set_artifacts ||= []
end
attr_writer :rule_set_paths
@@ -140,12 +155,12 @@ module Buildr
if project.pmd.enabled?
desc 'Generate pmd xml report.'
project.task('pmd:rule:xml') do
- Buildr::Pmd.pmd(project.pmd.rule_set_files, 'xml', project.pmd.output_file_prefix, project.pmd.flat_source_paths, :rule_set_paths => project.pmd.rule_set_paths)
+ Buildr::Pmd.pmd(project.pmd.rule_set_files, 'xml', project.pmd.output_file_prefix, project.pmd.flat_source_paths, :rule_set_paths => project.pmd.rule_set_paths, :rule_set_artifacts => project.pmd.rule_set_artifacts)
end
desc 'Generate pmd html report.'
project.task('pmd:rule:html') do
- Buildr::Pmd.pmd(project.pmd.rule_set_files, 'html', project.pmd.output_file_prefix, project.pmd.flat_source_paths, :rule_set_paths => project.pmd.rule_set_paths)
+ Buildr::Pmd.pmd(project.pmd.rule_set_files, 'html', project.pmd.output_file_prefix, project.pmd.flat_source_paths, :rule_set_paths => project.pmd.rule_set_paths, :rule_set_artifacts => project.pmd.rule_set_artifacts)
end
desc 'Generate pmd cpd xml report.'