root
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

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
This commit is contained in:
Rafael Dominguez 2018-11-30 09:09:43 -06:00 committed by Rob Winch
parent 1a80d4a66c
commit 2cb8794e35
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@ -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
View File

@ -19,23 +19,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'
} }
} }