Browse Source

Restored Jacoco default task dependence

This commit ensures that the jacoco plugin is applied when calling
check and test tasks.
Also remoed the clean task that prevented sonarqube using coverage data

Fixes: gh-6199
pull/6577/head
Rafael Dominguez 7 years ago committed by Rob Winch
parent
commit
ec77c630ec
  1. 2
      Jenkinsfile
  2. 15
      build.gradle

2
Jenkinsfile vendored

@ -30,7 +30,7 @@ try {
checkout scm checkout scm
withCredentials([string(credentialsId: 'spring-sonar.login', variable: 'SONAR_LOGIN')]) { withCredentials([string(credentialsId: 'spring-sonar.login', variable: 'SONAR_LOGIN')]) {
try { try {
sh "./gradlew clean jacocoTestReport sonarqube -Dsonar.jacoco.reportPaths='**/build/jacoco/*.exec' -PexcludeProjects='**/samples/**' -Dsonar.host.url=$SPRING_SONAR_HOST_URL -Dsonar.login=$SONAR_LOGIN --refresh-dependencies --no-daemon --stacktrace" sh "./gradlew sonarqube -PexcludeProjects='**/samples/**' -Dsonar.host.url=$SPRING_SONAR_HOST_URL -Dsonar.login=$SONAR_LOGIN --refresh-dependencies --no-daemon --stacktrace"
} catch(Exception e) { } catch(Exception e) {
currentBuild.result = 'FAILED: sonar' currentBuild.result = 'FAILED: sonar'
throw e throw e

15
build.gradle

@ -18,23 +18,8 @@ ext.milestoneBuild = !(snapshotBuild || releaseBuild)
dependencyManagementExport.projects = subprojects.findAll { !it.name.contains('-boot') } dependencyManagementExport.projects = subprojects.findAll { !it.name.contains('-boot') }
// Disable JaCoCo when not explicitly requested to enable caching of test
// See https://discuss.gradle.org/t/do-not-cache-if-condition-matched-jacoco-agent-configured-with-append-true-satisfied/23504
gradle.taskGraph.whenReady { graph ->
def enabled = graph.allTasks.any { it instanceof JacocoReport }
subprojects { project ->
project.plugins.withType(JacocoPlugin) {
project.tasks.withType(Test) {
jacoco.enabled = enabled
}
}
}
}
subprojects { subprojects {
plugins.withType(JavaPlugin) { plugins.withType(JavaPlugin) {
project.sourceCompatibility='1.8' project.sourceCompatibility='1.8'
} }
} }

Loading…
Cancel
Save