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:34 UTC
[1/7] git commit: Fix english
Repository: buildr
Updated Branches:
refs/heads/master 1bb504161 -> 5cab75f6c
Fix english
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/18fff044
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/18fff044
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/18fff044
Branch: refs/heads/master
Commit: 18fff0446582a17b409a0bb48af9e0e63b740028
Parents: 1bb5041
Author: Peter Donald <pe...@realityforge.org>
Authored: Sat Jul 26 07:18:35 2014 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Sat Jul 26 07:18:35 2014 +1000
----------------------------------------------------------------------
CHANGELOG | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/18fff044/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 9e683d5..ef8b027 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,7 +2,7 @@
* 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
- arrays or nils.
+ contain arrays or nils.
1.4.19 (2014-07-06)
* Fixed: BUILDR-700 - Ensure SNAPSHOT artifacts, constructed using the
[4/7] git commit: Move the creation of the directory into the task
method
Posted by do...@apache.org.
Move the creation of the directory into the task method
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/4e6792d6
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/4e6792d6
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/4e6792d6
Branch: refs/heads/master
Commit: 4e6792d68e8f6493d501b06ad98236f407b661a0
Parents: 46d52d7
Author: Peter Donald <pe...@realityforge.org>
Authored: Sat Jul 26 07:22:18 2014 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Sat Jul 26 07:22:18 2014 +1000
----------------------------------------------------------------------
addon/buildr/findbugs.rb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/4e6792d6/addon/buildr/findbugs.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/findbugs.rb b/addon/buildr/findbugs.rb
index f6459b6..14b5a15 100644
--- a/addon/buildr/findbugs.rb
+++ b/addon/buildr/findbugs.rb
@@ -61,6 +61,8 @@ module Buildr
args[:excludeFilter] = options[:exclude_filter] if options[:exclude_filter]
args[:jvmargs] = options[:java_args] if options[:java_args]
+ mkdir_p File.dirname(output_file)
+
Buildr.ant('findBugs') do |ant|
ant.taskdef :name =>'findBugs',
:classname =>'edu.umd.cs.findbugs.anttask.FindBugsTask',
@@ -187,7 +189,6 @@ module Buildr
desc 'Generate findbugs xml report.'
project.task('findbugs:xml') do
puts 'Findbugs: Analyzing source code...'
- mkdir_p File.dirname(project.findbugs.xml_output_file)
options =
{
:properties => project.findbugs.properties,
[7/7] git commit: Update the findbugs addon to use version Findbugs
3.0.0.
Posted by do...@apache.org.
Update the findbugs addon to use version Findbugs 3.0.0.
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/5cab75f6
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/5cab75f6
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/5cab75f6
Branch: refs/heads/master
Commit: 5cab75f6c5c156206a6fcf68f55d0c046ffa61bf
Parents: a886299
Author: Peter Donald <pe...@realityforge.org>
Authored: Sat Jul 26 07:27:22 2014 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Sat Jul 26 07:27:22 2014 +1000
----------------------------------------------------------------------
CHANGELOG | 1 +
addon/buildr/findbugs.rb | 30 ++++++++++--------------------
2 files changed, 11 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/5cab75f6/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index dbf45a1..f8cefa6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,5 @@
1.4.20 (Pending)
+* Change: Update the findbugs addon to use version Findbugs 3.0.0.
* Change: Update the findbugs addon to use the built-in findbugs stylesheet
to generate the html report.
* Fixed: Ensure that the 'source_paths' and 'extra_dependencies' properties
http://git-wip-us.apache.org/repos/asf/buildr/blob/5cab75f6/addon/buildr/findbugs.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/findbugs.rb b/addon/buildr/findbugs.rb
index 3fd30af..a87ccbd 100644
--- a/addon/buildr/findbugs.rb
+++ b/addon/buildr/findbugs.rb
@@ -22,26 +22,16 @@ module Buildr
# The specs for requirements
def dependencies
- [
- 'com.google.code.findbugs:findbugs-ant:jar:1.3.9',
- 'com.google.code.findbugs:findbugs:jar:1.3.9',
- 'com.google.code.findbugs:bcel:jar:1.3.9',
- 'com.google.code.findbugs:jsr305:jar:1.3.9',
- 'com.google.code.findbugs:jFormatString:jar:1.3.9',
- 'com.google.code.findbugs:annotations:jar:1.3.9',
- 'dom4j:dom4j:jar:1.6.1',
- 'jaxen:jaxen:jar:1.1.1',
- 'jdom:jdom:jar:1.0',
- 'xom:xom:jar:1.0',
- 'com.ibm.icu:icu4j:jar:2.6.1',
- 'asm:asm:jar:3.1',
- 'asm:asm-analysis:jar:3.1',
- 'asm:asm-tree:jar:3.1',
- 'asm:asm-commons:jar:3.1',
- 'asm:asm-util:jar:3.1',
- 'asm:asm-xml:jar:3.1',
- 'commons-lang:commons-lang:jar:2.4'
- ]
+ %w(
+ com.google.code.findbugs:findbugs:jar:3.0.0
+ com.google.code.findbugs:jFormatString:jar:3.0.0
+ com.google.code.findbugs:bcel-findbugs:jar:6.0
+ com.google.code.findbugs:annotations:jar:3.0.0
+ org.ow2.asm:asm-debug-all:jar:5.0.2
+ commons-lang:commons-lang:jar:2.6
+ dom4j:dom4j:jar:1.6.1
+ jaxen:jaxen:jar:1.1.6
+ )
end
def findbugs(output_file, source_paths, analyze_paths, options = {})
[2/7] git commit: Ensure that the 'source_paths' and
'extra_dependencies' properties in the findbugs addon does not contain arrays
or nils.
Posted by do...@apache.org.
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
[6/7] git commit: Update the html task to use the built-in findbugs
xsl
Posted by do...@apache.org.
Update the html task to use the built-in findbugs xsl
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/a8862998
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/a8862998
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/a8862998
Branch: refs/heads/master
Commit: a8862998fb47d478000e675dcaf8a238818259aa
Parents: 3e3c12c
Author: Peter Donald <pe...@realityforge.org>
Authored: Sat Jul 26 07:26:09 2014 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Sat Jul 26 07:26:09 2014 +1000
----------------------------------------------------------------------
CHANGELOG | 2 ++
addon/buildr/findbugs.rb | 40 +++++++++++++++++-----------------------
2 files changed, 19 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/a8862998/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index ab391ec..dbf45a1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
1.4.20 (Pending)
+* Change: Update the findbugs addon to use the built-in findbugs stylesheet
+ to generate the html report.
* 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
http://git-wip-us.apache.org/repos/asf/buildr/blob/a8862998/addon/buildr/findbugs.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/findbugs.rb b/addon/buildr/findbugs.rb
index 7eb4688..3fd30af 100644
--- a/addon/buildr/findbugs.rb
+++ b/addon/buildr/findbugs.rb
@@ -51,7 +51,6 @@ module Buildr
args = {
:output => options[:output] || 'xml',
:outputFile => output_file,
- :output => "xml:withMessages",
:effort => 'max',
:pluginList => '',
:classpath => cp,
@@ -100,10 +99,6 @@ module Buildr
!!@enabled
end
- def html_enabled?
- File.exist?(self.style_file)
- end
-
attr_writer :config_directory
def config_directory
@@ -134,12 +129,6 @@ module Buildr
@html_output_file || "#{self.report_dir}/findbugs.html"
end
- attr_writer :style_file
-
- def style_file
- @style_file || "#{self.config_directory}/findbugs-report.xsl"
- end
-
attr_writer :filter_file
def filter_file
@@ -196,6 +185,7 @@ module Buildr
:extra_dependencies => project.findbugs.extra_dependencies
}
options[:exclude_filter] = project.findbugs.filter_file if File.exist?(project.findbugs.filter_file)
+ options[:output] = 'xml:withMessages'
Buildr::Findbugs.findbugs(project.findbugs.xml_output_file,
project.findbugs.source_paths.flatten.compact,
@@ -203,18 +193,22 @@ module Buildr
options)
end
- if project.findbugs.html_enabled?
- xml_task = project.task("findbugs:xml")
- desc "Generate findbugs html report."
- project.task("findbugs:html" => xml_task) do
- puts "Findbugs: Generating report"
- mkdir_p File.dirname(project.findbugs.html_output_file)
- Buildr.ant "findbugs" do |ant|
- ant.style :in => project.findbugs.xml_output_file,
- :out => project.findbugs.html_output_file,
- :style => project.findbugs.style_file
- end
- end
+ desc 'Generate findbugs html report.'
+ project.task('findbugs:html') do
+ puts 'Findbugs: Analyzing source code...'
+ options =
+ {
+ :properties => project.findbugs.properties,
+ :fail_on_error => project.findbugs.fail_on_error?,
+ :extra_dependencies => project.findbugs.extra_dependencies
+ }
+ options[:exclude_filter] = project.findbugs.filter_file if File.exist?(project.findbugs.filter_file)
+ options[:output] = 'html'
+
+ Buildr::Findbugs.findbugs(project.findbugs.html_output_file,
+ project.findbugs.source_paths.flatten.compact,
+ project.findbugs.analyze_paths.flatten.compact,
+ options)
end
end
end
[5/7] git commit: Whitespace cleanup
Posted by do...@apache.org.
Whitespace cleanup
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/3e3c12c3
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/3e3c12c3
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/3e3c12c3
Branch: refs/heads/master
Commit: 3e3c12c39e65d4be5c7c8721dfca6b5c4fc367d4
Parents: 4e6792d
Author: Peter Donald <pe...@realityforge.org>
Authored: Sat Jul 26 07:24:21 2014 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Sat Jul 26 07:24:21 2014 +1000
----------------------------------------------------------------------
addon/buildr/findbugs.rb | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/3e3c12c3/addon/buildr/findbugs.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/findbugs.rb b/addon/buildr/findbugs.rb
index 14b5a15..7eb4688 100644
--- a/addon/buildr/findbugs.rb
+++ b/addon/buildr/findbugs.rb
@@ -44,18 +44,19 @@ module Buildr
]
end
- def findbugs(output_file, source_paths, analyze_paths, options = { })
+ def findbugs(output_file, source_paths, analyze_paths, options = {})
dependencies = (options[:dependencies] || []) + self.dependencies
cp = Buildr.artifacts(dependencies).each { |a| a.invoke() if a.respond_to?(:invoke) }.map(&:to_s).join(File::PATH_SEPARATOR)
args = {
+ :output => options[:output] || 'xml',
+ :outputFile => output_file,
:output => "xml:withMessages",
- :outputFile => output_file,
- :effort => 'max',
- :pluginList => '',
- :classpath => cp,
- :timeout => "90000000",
- :debug => "false"
+ :effort => 'max',
+ :pluginList => '',
+ :classpath => cp,
+ :timeout => '90000000',
+ :debug => 'false'
}
args[:failOnError] = true if options[:fail_on_error]
args[:excludeFilter] = options[:exclude_filter] if options[:exclude_filter]
@@ -64,8 +65,8 @@ module Buildr
mkdir_p File.dirname(output_file)
Buildr.ant('findBugs') do |ant|
- ant.taskdef :name =>'findBugs',
- :classname =>'edu.umd.cs.findbugs.anttask.FindBugsTask',
+ ant.taskdef :name => 'findBugs',
+ :classname => 'edu.umd.cs.findbugs.anttask.FindBugsTask',
:classpath => cp
ant.findBugs args do
source_paths.each do |source_path|
@@ -146,7 +147,7 @@ module Buildr
end
def properties
- @properties ||= { }
+ @properties ||= {}
end
attr_writer :java_args
@@ -174,7 +175,6 @@ module Buildr
end
attr_reader :project
-
end
module ProjectExtension
[3/7] git commit: Use single quotes
Posted by do...@apache.org.
Use single quotes
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/46d52d75
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/46d52d75
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/46d52d75
Branch: refs/heads/master
Commit: 46d52d75eb921d7730f02abc71ffa4f871caab21
Parents: 35a8d65
Author: Peter Donald <pe...@realityforge.org>
Authored: Sat Jul 26 07:21:08 2014 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Sat Jul 26 07:21:08 2014 +1000
----------------------------------------------------------------------
addon/buildr/findbugs.rb | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/46d52d75/addon/buildr/findbugs.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/findbugs.rb b/addon/buildr/findbugs.rb
index 7ae34e9..f6459b6 100644
--- a/addon/buildr/findbugs.rb
+++ b/addon/buildr/findbugs.rb
@@ -150,7 +150,7 @@ module Buildr
attr_writer :java_args
def java_args
- @java_args || "-server -Xss1m -Xmx800m -Duser.language=en -Duser.region=EN "
+ @java_args || '-server -Xss1m -Xmx800m -Duser.language=en -Duser.region=EN '
end
def source_paths
@@ -184,11 +184,10 @@ module Buildr
after_define do |project|
if project.findbugs.enabled?
- desc "Generate findbugs xml report."
- project.task("findbugs:xml") do
- puts "Findbugs: Analyzing source code..."
+ desc 'Generate findbugs xml report.'
+ project.task('findbugs:xml') do
+ puts 'Findbugs: Analyzing source code...'
mkdir_p File.dirname(project.findbugs.xml_output_file)
-
options =
{
:properties => project.findbugs.properties,