Use OpenClover 4.2.0 for coverage (no license required anymore)

qodana · Oct 8, 2017 · 3650342 · 3650342
1 parent 6e17406
commit 3650342
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,6 +23,5 @@ bin/
 *.log
 *.graphml
 coverage.db*
-clover.license
 out
 .metadata
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -66,9 +66,7 @@ pipeline {
     }
     stage('Coverage') {
       steps {
-        withCredentials([file(credentialsId: 'CLOVER_LICENSE', variable: 'ORG_GRADLE_PROJECT_clover.license.path')]) {
-          sh './gradlew --no-daemon --refresh-dependencies -PenableClover clean cloverHtmlReport cloverXmlReport'
-        }
+        sh './gradlew --no-daemon --refresh-dependencies -PenableClover clean cloverHtmlReport cloverXmlReport'
       }
       post {
         success {

diff --git a/README.md b/README.md
@@ -42,13 +42,12 @@ Ask JUnit 5 related questions on [StackOverflow] or chat with us on [Gitter].
 
 ## Code Coverage
 
-Code coverage using [Clover] for the latest build is available on the [Jenkins CI server].
-We are thankful to [Atlassian] for providing the Clover license free of charge.
+Code coverage using [OpenClover] for the latest build is available on the
+[Jenkins CI server].
 
 A code coverage report can also be generated locally by executing
-`gradlew -PenableClover clean cloverHtmlReport` if you have a local Clover license file
-on your computer. The results will be available in
-`junit-tests/build/reports/clover/html/index.html`.
+`gradlew -PenableClover clean cloverHtmlReport`. The results will be available in
+`build/reports/clover/html/index.html`.
 
 ## Gradle Build Scans
 
@@ -143,9 +142,8 @@ The `junit-platform-console-standalone` JAR does not provide an automatic module
 as it is not intended to be used as a module.
 
 
-[Atlassian]: https://www.atlassian.com/
 [Automatic-Module-Name]: http://mail.openjdk.java.net/pipermail/jpms-spec-experts/2017-April/000667.html
-[Clover]: https://www.atlassian.com/software/clover/
+[OpenClover]: http://openclover.org
 [CONTRIBUTING.md]: https://github.com/junit-team/junit5/blob/master/CONTRIBUTING.md
 [Gitter]: https://gitter.im/junit-team/junit5
 [Jenkins CI server]: https://junit.ci.cloudbees.com/job/JUnit5/job/master/lastSuccessfulBuild/clover-report/

diff --git a/build.gradle b/build.gradle
@@ -198,7 +198,7 @@ allprojects { subproj ->
 		}
 
 		dependencies {
-			clover('com.atlassian.clover:clover:4.1.2')
+			clover('org.openclover:clover:4.2.0')
 		}
 
 		ext.cloverDir = file("$buildDir/clover")
@@ -207,10 +207,7 @@ allprojects { subproj ->
 		def instrumentedJavaSourcesDir = file("$cloverDir/instrumentedSources/java")
 
 		task cloverTaskdef {
-			def cloverLicensePath = (project.hasProperty('clover.license.path')
-					? project.property('clover.license.path') : rootProject.file('clover.license').absolutePath)
 			ant.taskdef(resource:'cloverlib.xml', classpath: configurations.clover.asPath)
-			ant.property(name: 'clover.license.path', value: cloverLicensePath)
 		}
 
 		task cloverInstrumentJava(dependsOn: cloverTaskdef) {

diff --git a/clover.license.enc b/clover.license.enc