INTEXT-67 - Upgrade to Sonar-Runner

* Upgrade to Gradle 1.6
* Upgrade from Gradle plugin sonar to sonar-runner
* Upgrade Gradle wrapper
* Fix several Group Ids
This commit is contained in:
Gunnar Hillert
2013-05-15 23:15:06 -04:00
parent 527fca9bdd
commit f18549427a
3 changed files with 18 additions and 34 deletions

View File

@@ -42,6 +42,12 @@ ext {
idPrefix = 'aws'
linkHomepage = 'https://github.com/SpringSource/spring-integration-extensions'
linkCi = 'https://build.springsource.org/browse/INTEXT'
linkIssue = 'https://jira.springsource.org/browse/INTEXT'
linkScmUrl = 'https://github.com/SpringSource/spring-integration-extensions'
linkScmConnection = 'https://github.com/SpringSource/spring-integration-extensions.git'
linkScmDevConnection = 'git@github.com:SpringSource/spring-integration-extensions.git'
}
ext.javadocLinks = [
@@ -137,39 +143,17 @@ artifacts {
archives javadocJar
}
apply plugin: 'sonar'
apply plugin: 'sonar-runner' //New for Gradle 1.5
apply plugin: 'sonar-runner'
sonar {
if (rootProject.hasProperty('sonarHostUrl')) {
server.url = rootProject.sonarHostUrl
sonarRunner {
sonarProperties {
property "sonar.jacoco.reportPath", "${buildDir.name}/jacoco.exec"
property "sonar.links.homepage", linkHomepage
property "sonar.links.ci", linkCi
property "sonar.links.issue", linkIssue
property "sonar.links.scm", linkScmUrl
property "sonar.links.scm_dev", linkScmDevConnection
}
database {
if (rootProject.hasProperty('sonarJdbcUrl')) {
url = rootProject.sonarJdbcUrl
}
if (rootProject.hasProperty('sonarJdbcDriver')) {
driverClassName = rootProject.sonarJdbcDriver
}
if (rootProject.hasProperty('sonarJdbcUsername')) {
username = rootProject.sonarJdbcUsername
}
if (rootProject.hasProperty('sonarJdbcPassword')) {
password = rootProject.sonarJdbcPassword
}
}
project {
dynamicAnalysis = "reuseReports"
withProjectProperties { props ->
props["sonar.core.codeCoveragePlugin"] = "jacoco"
props["sonar.jacoco.reportPath"] = "${buildDir.name}/jacoco.exec"
}
}
logger.info("Sonar parameters used: server.url='${server.url}'; database.url='${database.url}'; database.driverClassName='${database.driverClassName}'; database.username='${database.username}'")
}
task schemaZip(type: Zip) {
@@ -285,5 +269,5 @@ task dist(dependsOn: assemble) {
task wrapper(type: Wrapper) {
description = 'Generates gradlew[.bat] scripts'
gradleVersion = '1.5-rc-1'
gradleVersion = '1.6'
}

Binary file not shown.

View File

@@ -1,6 +1,6 @@
#Mon Mar 11 17:28:12 EDT 2013
#Wed May 15 22:09:50 EDT 2013
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-1.5-rc-1-bin.zip
distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip