INSPECTIT-2158, INSPECTIT-2076: optimized gradle build and replaced cobertura with jacoco

Author: pbouillet

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip

inspectit.agent.java/inspectit.agent.java.gradle

@@ -51,12 +51,6 @@ tasks.withType(JavaCompile) { t ->
 	options.bootClasspath = configurations.java16rt.asPath
 }
 
-
-/** This is not working when specified in the subprojects{ } part, thus each project must do it */
-cobertura {
-	coverageDirs += project(':inspectit.shared.all').sourceSets.main.output.classesDir.path
-}
-
 /**
  * Creates the jar. Excludes libs from the configurations.agentJavaProd that are not Java5 compatible. Uses existing manifest.
  */

inspectit.root.gradle

@@ -12,7 +12,6 @@ buildscript {
 		jcenter()
 	}
 	dependencies {
-		classpath "net.saliman:gradle-cobertura-plugin:2.3.1"
 		classpath "gradle.plugin.me.champeau.gradle:jmh-gradle-plugin:0.3.0"
 		classpath "org.standardout:bnd-platform:1.4.0"
 	}
@@ -250,8 +249,8 @@ subprojects {
 	apply plugin: 'pmd'
 	apply plugin: 'checkstyle'
 	apply plugin: 'findbugs'
-	apply plugin: 'net.saliman.cobertura'
 	apply plugin: 'me.champeau.gradle.jmh'
+	apply plugin: 'jacoco'
 
 	/** all compile, test and runtime configurations to transitive = false */
 	configurations.compile.transitive = false
@@ -292,21 +291,12 @@ subprojects {
 	task analyze {
 		description = 'Runs all unit tests and all checks.'
 		group = 'Verification'
-		dependsOn(project.tasks.cobertura, check)
+		dependsOn(check)
 	}
 
 	/**
 	 *  Tasks for the TestNG and Cobertura.
 	 */
-	cobertura {
-		// ignore getters and setters, new options from Cobertura
-		// can not be used for now due to the https://github.com/cobertura/cobertura/issues/200
-		//coverageIgnoreTrivial = true
-
-		//reporting
-		coverageReportDir = file(buildQATestCoveragedata)
-		coverageFormats = ['xml', 'html']
-	}
 
 	/**
 	 * Definition of the test properties.
@@ -399,5 +389,12 @@ subprojects {
 		humanOutputFile = file("${buildQAPerfTest}/jmh/human.txt") 
 		resultsFile = file("${buildQAPerfTest}/jmh/results.txt")
 	}
-
+	
+	/** 
+	 * Configures the jacoco plugin.
+	 */
+	jacoco {
+		reportsDir = file(buildQATestCoveragedata)
+	}
+	
 }

inspectit.server/inspectit.server.gradle

@@ -138,7 +138,7 @@ classes.finalizedBy ciSchemaCheck
  */
 def schemagen(sourceDir, outputDir, fileName, excludes) {
 	return tasks.create(name: "schemagen-${outputDir}/${fileName}", dependsOn: compileJava) {
-		inputs.sourceDir(sourceDir)
+		inputs.files(fileTree(sourceDir))
 		outputs.file file("${outputDir}/${fileName}")
 
 		doLast {
@@ -166,12 +166,6 @@ test {
 	jvmArgs += serverJavaOptsForTests
 }
 
-/** Include shared.all & shared.cs also for the coverage */
-cobertura {
-	coverageDirs += project(':inspectit.shared.all').sourceSets.main.output.classesDir.path
-	coverageDirs += project(':inspectit.shared.cs').sourceSets.main.output.classesDir.path
-}
-
 /**
  * Creates the jar. Manifest 'Class-Path' is constructed from the configurations.serverProd and jars from the depending projects.
  */ 

inspectit.shared.all/inspectit.shared.all.gradle

@@ -14,6 +14,7 @@ targetCompatibility = '1.6'
 ext {
 	distJarName = 'inspectit-shared-all'
 	pluginName = 'rocks.inspectit.shared.all'
+	versionFile = new File(buildDir.getAbsolutePath(), 'version/version.log')
 }
 
 /** Setting compile configuration as plugin in Eclipse needs it */
@@ -35,22 +36,29 @@ tasks.withType(JavaCompile) {
 	options.bootClasspath = configurations.java16rt.asPath
 }
 
+/** Task for creating the version file if needed. */
+task createVersionFile {
+	inputs.property(versionInfo, null)
+	outputs.file versionFile
+	
+	doLast {
+		versionFile.getParentFile().mkdirs()
+		if (!versionFile.exists()) {
+			versionFile.createNewFile()
+		}
+		versionFile.text = versionInfo
+	}
+}
+createVersionFile.onlyIf { project.hasProperty('versionInfo') }
+
 /** 
  * Creates the jar. If needed create version.log on the fly and update the version in the MANIFEST.MF.
  */
 jar {
 	archivesBaseName = distJarName
 
-	// add version.log only to shared.all
-	if (project.hasProperty('versionInfo')) {
-		def tempFile = File.createTempFile('version', '.log')
-		tempFile.text = versionInfo
-		tempFile.deleteOnExit()
-		
-		into('') {
-			from tempFile
-			rename tempFile.getName(), 'version.log'
-		}
+	into('') {
+		from versionFile
 	}
 
 	manifest  {
@@ -63,6 +71,7 @@ jar {
 		}
 	}
 }
+jar.dependsOn createVersionFile
 
 task releaseAndAnalyze {
 	description = "Runs all unit tests, all checks and assembles a jar archive."

inspectit.shared.cs/inspectit.shared.cs.gradle

@@ -39,11 +39,6 @@ tasks.withType(JavaCompile) {
 	targetCompatibility = '1.7'
 }
 
-/** Include shared.all also for the coverage */
-cobertura {
-	coverageDirs += project(':inspectit.shared.all').sourceSets.main.output.classesDir.path
-}
-
 /**
  * Creates the jar. If needed update the version in the MANIFEST.MF.
  */

inspectit.ui.rcp/inspectit.ui.rcp.gradle

@@ -45,13 +45,6 @@ tasks.withType(JavaCompile) {
 	targetCompatibility = '1.7'
 }
 
-/** Include shared.all & shared.cs also for the coverage Extend auxiliaryClasspath so that corbertura can find eclipse-base jars. */
-cobertura {
-	coverageDirs += project(':inspectit.shared.all').sourceSets.main.output.classesDir.path
-	coverageDirs += project(':inspectit.shared.cs').sourceSets.main.output.classesDir.path
-	auxiliaryClasspath += fileTree(include: '**/*.jar', dir: eclipsePlugins) 
-}
-
 /**
  * Cleans the PDE build 'plugins/rocks.inspectit.ui.rcp' folder.
  */