Repository: buildr Updated Branches: refs/heads/master eb944e154 -> 090b00356
BUILDR-664 - Update Checkstyle addon so that extra_dependencies is the project dependencies by default. Move the checkstyle dependencies to the start of the classpath to avoid problems running checkstyle. Submitted by Dieter Vrancken. Project: http://git-wip-us.apache.org/repos/asf/buildr/repo Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/090b0035 Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/090b0035 Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/090b0035 Branch: refs/heads/master Commit: 090b0035674b2388d6419972ce861114a513078d Parents: eb944e1 Author: Peter Donald <[email protected]> Authored: Tue Jun 17 09:55:42 2014 +1000 Committer: Peter Donald <[email protected]> Committed: Tue Jun 17 09:55:42 2014 +1000 ---------------------------------------------------------------------- CHANGELOG | 4 ++++ addon/buildr/checkstyle.rb | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/buildr/blob/090b0035/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index a6a9bdb..742f817 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,8 @@ 1.4.18 (Pending) +* Change: BUILDR-664 - Update Checkstyle addon so that extra_dependencies is + the project dependencies by default. Move the checkstyle dependencies + to the start of the classpath to avoid problems running checkstyle. + Submitted by Dieter Vrancken. * Fixed: BUILDR-698 - Correct "Lines of code" example in documentation. Submitted By: Trejkaz. * Added: Add ipr.add_glassfish_configuration method for defining a local http://git-wip-us.apache.org/repos/asf/buildr/blob/090b0035/addon/buildr/checkstyle.rb ---------------------------------------------------------------------- diff --git a/addon/buildr/checkstyle.rb b/addon/buildr/checkstyle.rb index 2175948..b72d5b6 100644 --- a/addon/buildr/checkstyle.rb +++ b/addon/buildr/checkstyle.rb @@ -35,7 +35,7 @@ module Buildr end def checkstyle(configuration_file, format, output_file, source_paths, options = {}) - dependencies = (options[:dependencies] || []) + self.dependencies + dependencies = self.dependencies + (options[:dependencies] || []) cp = Buildr.artifacts(dependencies).each { |a| a.invoke() if a.respond_to?(:invoke) }.map(&:to_s) args = [] @@ -153,7 +153,7 @@ module Buildr end def extra_dependencies - @extra_dependencies ||= [] + @extra_dependencies ||= [self.project.compile.dependencies, self.project.test.compile.dependencies].flatten end protected
