diff --git a/armadillo/build.gradle b/armadillo/build.gradle index ba356952f..fbf7b21c6 100644 --- a/armadillo/build.gradle +++ b/armadillo/build.gradle @@ -70,7 +70,7 @@ dependencies { jacocoTestReport { reports { - xml.enabled true + xml.required } dependsOn test } diff --git a/build.gradle b/build.gradle index 7978a05ec..9374e9792 100644 --- a/build.gradle +++ b/build.gradle @@ -90,7 +90,7 @@ springBoot { buildInfo() } bootJar { - mainClassName = mainClassName + mainClass = mainClassName manifest { attributes( 'Specification-Version': project.version.toString(), @@ -105,7 +105,7 @@ bootJar { //define run application { - mainClass.set(mainClassName) + mainClass.set(rootProject.mainClassName) } //define release @@ -123,8 +123,8 @@ docker { name imageName tags 'latest', tagName dockerfile file('Dockerfile') - files bootJar.archivePath - buildArgs(['JAR_FILE': "${bootJar.archiveName}"]) + files bootJar.archiveFile + buildArgs(['JAR_FILE': "${bootJar.archiveFile.get().asFile.name}"]) } dockerPrepare.dependsOn bootJar @@ -141,9 +141,7 @@ task jacocoMergedReport(type: JacocoReport) { classDirectories.setFrom files(subprojects.sourceSets.main.output) executionData.setFrom project.fileTree(dir: '.', include: '**/build/jacoco/test.exec') reports { - xml.enabled true - csv.enabled false - html.enabled false + xml.required } } diff --git a/r/build.gradle b/r/build.gradle index c802fcc4d..28728a53f 100644 --- a/r/build.gradle +++ b/r/build.gradle @@ -50,7 +50,7 @@ build.dependsOn spotlessApply jacocoTestReport { reports { - xml.enabled true + xml.required } dependsOn test }