BUILDR-704 - Updated the Sonar addon to support the latest version of SonarQube Runner.
Submitted by Ross Mahony. Project: http://git-wip-us.apache.org/repos/asf/buildr/repo Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/dd2271cf Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/dd2271cf Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/dd2271cf Branch: refs/heads/master Commit: dd2271cfa39f7b6022adfb8b5a9a6a980b2ccc01 Parents: 0ac75c5 Author: Peter Donald <[email protected]> Authored: Sat Feb 28 20:23:58 2015 +1100 Committer: Peter Donald <[email protected]> Committed: Sat Feb 28 20:23:58 2015 +1100 ---------------------------------------------------------------------- CHANGELOG | 2 ++ addon/buildr/sonar.rb | 19 ++++++++----------- 2 files changed, 10 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/buildr/blob/dd2271cf/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index e4195cd..c8eeb1d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,6 @@ 1.4.22 (Pending) +* Change: BUILDR-704 - Updated the Sonar addon to support the latest version of SonarQube + Runner. Submitted by Ross Mahony. * Added: Add support for ipr.add_glassfish_remote_configuration method that generates a remote glassfish configuration in IntelliJ IDEA project files. * Added: Add support for iml.prefix and ipr.prefix settings that prefix the generated http://git-wip-us.apache.org/repos/asf/buildr/blob/dd2271cf/addon/buildr/sonar.rb ---------------------------------------------------------------------- diff --git a/addon/buildr/sonar.rb b/addon/buildr/sonar.rb index 212adf4..acd199e 100644 --- a/addon/buildr/sonar.rb +++ b/addon/buildr/sonar.rb @@ -21,7 +21,7 @@ module Buildr # The specs for requirements def dependencies [ - 'org.codehaus.sonar-plugins:sonar-ant-task:jar:1.3' + 'org.codehaus.sonar-plugins:sonar-ant-task:jar:2.2' ] end @@ -32,17 +32,14 @@ module Buildr cp = Buildr.artifacts(self.dependencies).each(&:invoke).map(&:to_s).join(File::PATH_SEPARATOR) - args = { - :key => key, - :version => '1', - 'xmlns:sonar' => 'antlib:org.sonar.ant' - } - Buildr.ant('sonar') do |ant| - ant.taskdef :name => 'sonar', :classname => 'org.sonar.ant.SonarTask', :classpath => cp + ant.taskdef :name => 'sonar', :classname => 'org.sonar.ant.SonarTask', :classpath => cp ant.property :name => 'sonar.projectName', :value => project_name + ant.property :name => 'sonar.projectKey', :value => key + ant.property :name => 'sonar.projectVersion', :value => '1.0' + ant.property :name => 'sonar.jdbc.url', :value => jdbc_url ant.property :name => 'sonar.jdbc.driverClassName', :value => jdbc_driver_class_name ant.property :name => 'sonar.jdbc.username', :value => jdbc_username @@ -52,10 +49,10 @@ module Buildr ant.property :name => 'sonar.checkstyle.generateXml', :value => 'true' ant.property :name => 'sonar.sources', :value => sources.join(',') - ant.property :name => 'sonar.binaries', :value => binaries.join(',') - ant.property :name => 'sonar.libraries', :value => libraries.join(',') + ant.property :name => 'sonar.java.binaries', :value => binaries.join(',') + ant.property :name => 'sonar.java.libraries', :value => libraries.join(',') - ant.sonar args + ant.sonar end end
