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 2015/11/27 10:10:35 UTC
[1/5] buildr git commit: Avoid unnecessary brackets
Repository: buildr
Updated Branches:
refs/heads/master 4e2461623 -> f11b0314f
Avoid unnecessary brackets
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/79576b98
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/79576b98
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/79576b98
Branch: refs/heads/master
Commit: 79576b9813411ddba207059a4ebc256110d64e94
Parents: 4e24616
Author: Peter Donald <pe...@realityforge.org>
Authored: Fri Nov 27 18:05:35 2015 +1100
Committer: Peter Donald <pe...@realityforge.org>
Committed: Fri Nov 27 18:05:35 2015 +1100
----------------------------------------------------------------------
addon/buildr/checkstyle.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/79576b98/addon/buildr/checkstyle.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/checkstyle.rb b/addon/buildr/checkstyle.rb
index ed5fbea..48f6d79 100644
--- a/addon/buildr/checkstyle.rb
+++ b/addon/buildr/checkstyle.rb
@@ -37,7 +37,7 @@ module Buildr
def checkstyle(configuration_file, format, output_file, source_paths, options = {})
dependencies = self.dependencies + (options[:dependencies] || [])
- cp = Buildr.artifacts(dependencies).each { |a| a.invoke() if a.respond_to?(:invoke) }.map(&:to_s)
+ cp = Buildr.artifacts(dependencies).each { |a| a.invoke if a.respond_to?(:invoke) }.map(&:to_s)
args = []
if options[:properties_file]
[2/5] buildr git commit: Gracefully handle all sorts of exceptions
Posted by do...@apache.org.
Gracefully handle all sorts of exceptions
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/a0d695fc
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/a0d695fc
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/a0d695fc
Branch: refs/heads/master
Commit: a0d695fcde6bb5583d82952de6a7a7ec2afbaaac
Parents: 79576b9
Author: Peter Donald <pe...@realityforge.org>
Authored: Fri Nov 27 18:06:03 2015 +1100
Committer: Peter Donald <pe...@realityforge.org>
Committed: Fri Nov 27 18:06:03 2015 +1100
----------------------------------------------------------------------
addon/buildr/checkstyle.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/a0d695fc/addon/buildr/checkstyle.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/checkstyle.rb b/addon/buildr/checkstyle.rb
index 48f6d79..97843b5 100644
--- a/addon/buildr/checkstyle.rb
+++ b/addon/buildr/checkstyle.rb
@@ -55,7 +55,7 @@ module Buildr
begin
touch output_file
Java::Commands.java 'com.puppycrawl.tools.checkstyle.Main', *(args + [{:classpath => cp, :properties => options[:properties], :java_args => options[:java_args]}])
- rescue => e
+ rescue Exception => e
rm_f output_file
raise e if options[:fail_on_error]
end
[5/5] buildr git commit: Upgrade to checkstyle 6.12.1
Posted by do...@apache.org.
Upgrade to checkstyle 6.12.1
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/f11b0314
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/f11b0314
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/f11b0314
Branch: refs/heads/master
Commit: f11b0314fa30b8b0fe07b9be6038939ee372eb51
Parents: 8b77fa2
Author: Peter Donald <pe...@realityforge.org>
Authored: Fri Nov 27 18:07:35 2015 +1100
Committer: Peter Donald <pe...@realityforge.org>
Committed: Fri Nov 27 18:07:35 2015 +1100
----------------------------------------------------------------------
CHANGELOG | 2 +-
addon/buildr/checkstyle.rb | 21 ++++++++++-----------
2 files changed, 11 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/f11b0314/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index c64baa7..02dcc70 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,7 +11,7 @@
the bug that allowed unintended sharing has been fixed.
* Fixed: Fix bug in IDEA module generation that resulted in dependencies in IDEA module
using shared references to compile dependencies.
-* Change: Update the checkstyle addon to use checkstyle 6.7.
+* Change: Update the checkstyle addon to use checkstyle 6.12.1.
1.4.23 (2015-06-12)
* Change: BUILDR-706 - Update the checkstyle addon use checkstyle 6.6. Submitted
http://git-wip-us.apache.org/repos/asf/buildr/blob/f11b0314/addon/buildr/checkstyle.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/checkstyle.rb b/addon/buildr/checkstyle.rb
index 774ba9d..7135dbd 100644
--- a/addon/buildr/checkstyle.rb
+++ b/addon/buildr/checkstyle.rb
@@ -22,17 +22,16 @@ module Buildr
# The specs for requirements
def dependencies
- [
- 'com.puppycrawl.tools:checkstyle:jar:6.7',
- 'org.antlr:antlr4-runtime:jar:4.5',
- 'antlr:antlr:jar:2.7.7',
- 'com.google.guava:guava:jar:18.0',
- 'org.apache.commons:commons-lang3:jar:3.4',
- 'org.abego.treelayout:org.abego.treelayout.core:jar:1.0.1',
- 'commons-cli:commons-cli:jar:1.3',
- 'commons-beanutils:commons-beanutils-core:jar:1.8.3',
- 'commons-logging:commons-logging:jar:1.1.1'
- ]
+ %w(
+ com.puppycrawl.tools:checkstyle:jar:6.12.1
+ org.antlr:antlr4-runtime:jar:4.5.1-1
+ antlr:antlr:jar:2.7.7
+ com.google.guava:guava:jar:18.0 org.apache.commons:commons-lang3:jar:3.4
+ org.abego.treelayout:org.abego.treelayout.core:jar:1.0.1
+ commons-cli:commons-cli:jar:1.3
+ commons-beanutils:commons-beanutils-core:jar:1.8.3
+ commons-logging:commons-logging:jar:1.1.1
+ )
end
def checkstyle(configuration_file, format, output_file, source_paths, options = {})
[3/5] buildr git commit: Only add files to source path if the exist
Posted by do...@apache.org.
Only add files to source path if the exist
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/ccf25217
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/ccf25217
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/ccf25217
Branch: refs/heads/master
Commit: ccf25217012788eaf86d4e0ce5801719e720572f
Parents: a0d695f
Author: Peter Donald <pe...@realityforge.org>
Authored: Fri Nov 27 18:06:25 2015 +1100
Committer: Peter Donald <pe...@realityforge.org>
Committed: Fri Nov 27 18:06:25 2015 +1100
----------------------------------------------------------------------
addon/buildr/checkstyle.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/ccf25217/addon/buildr/checkstyle.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/checkstyle.rb b/addon/buildr/checkstyle.rb
index 97843b5..011b0a7 100644
--- a/addon/buildr/checkstyle.rb
+++ b/addon/buildr/checkstyle.rb
@@ -50,7 +50,7 @@ module Buildr
args << format
args << '-o'
args << output_file
- args += source_paths
+ args += source_paths.select { |p| File.exist?(p) }
begin
touch output_file
[4/5] buildr git commit: Avoid messing around with outputfile and
assume checkstyle command line application behaves sensibly
Posted by do...@apache.org.
Avoid messing around with outputfile and assume checkstyle command line application behaves sensibly
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/8b77fa2d
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/8b77fa2d
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/8b77fa2d
Branch: refs/heads/master
Commit: 8b77fa2d9aa35c75eeddd4f984124be9e2b40eb5
Parents: ccf2521
Author: Peter Donald <pe...@realityforge.org>
Authored: Fri Nov 27 18:07:11 2015 +1100
Committer: Peter Donald <pe...@realityforge.org>
Committed: Fri Nov 27 18:07:11 2015 +1100
----------------------------------------------------------------------
addon/buildr/checkstyle.rb | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/8b77fa2d/addon/buildr/checkstyle.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/checkstyle.rb b/addon/buildr/checkstyle.rb
index 011b0a7..774ba9d 100644
--- a/addon/buildr/checkstyle.rb
+++ b/addon/buildr/checkstyle.rb
@@ -53,10 +53,8 @@ module Buildr
args += source_paths.select { |p| File.exist?(p) }
begin
- touch output_file
Java::Commands.java 'com.puppycrawl.tools.checkstyle.Main', *(args + [{:classpath => cp, :properties => options[:properties], :java_args => options[:java_args]}])
rescue Exception => e
- rm_f output_file
raise e if options[:fail_on_error]
end
end