From 1287f939b514da177f48722af25c910f99f95331 Mon Sep 17 00:00:00 2001 From: Chris Helma <25470211+chelma@users.noreply.github.com> Date: Wed, 10 Jul 2024 12:46:04 -0500 Subject: [PATCH] Centralized Gradle behavior for sub-projects (#807) Signed-off-by: Chris Helma --- CreateSnapshot/build.gradle | 18 ------------------ DocumentsFromSnapshotMigration/build.gradle | 17 +---------------- MetadataMigration/build.gradle | 18 ------------------ RFS/build.gradle | 18 ------------------ TrafficCapture/build.gradle | 8 -------- build.gradle | 18 ++++++++++++++++++ coreUtilities/build.gradle | 18 ------------------ 7 files changed, 19 insertions(+), 96 deletions(-) diff --git a/CreateSnapshot/build.gradle b/CreateSnapshot/build.gradle index d01e8275d..b9c981302 100644 --- a/CreateSnapshot/build.gradle +++ b/CreateSnapshot/build.gradle @@ -1,7 +1,6 @@ plugins { id 'application' id 'java' - id 'jacoco' id 'io.freefair.lombok' version '8.6' } @@ -27,23 +26,6 @@ application { mainClassName = 'com.rfs.CreateSnapshot' } -// Utility task to allow copying required libraries into a 'dependencies' folder for security scanning -tasks.register('copyDependencies', Sync) { - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - - from configurations.runtimeClasspath - into "${buildDir}/dependencies" -} - -jacocoTestReport { - reports { - xml.required = true - xml.destination file("${buildDir}/reports/jacoco/test/jacocoTestReport.xml") - html.required = true - html.destination file("${buildDir}/reports/jacoco/test/html") - } -} - test { useJUnitPlatform() } \ No newline at end of file diff --git a/DocumentsFromSnapshotMigration/build.gradle b/DocumentsFromSnapshotMigration/build.gradle index bd4a2f733..0918be645 100644 --- a/DocumentsFromSnapshotMigration/build.gradle +++ b/DocumentsFromSnapshotMigration/build.gradle @@ -1,7 +1,6 @@ plugins { id 'application' id 'java' - id 'jacoco' id 'io.freefair.lombok' version '8.6' id "com.avast.gradle.docker-compose" version "0.17.4" id 'com.bmuschko.docker-remote-api' @@ -70,14 +69,6 @@ clean.doFirst { delete project.file("./docker/build") } -// Utility task to allow copying required libraries into a 'dependencies' folder for security scanning -tasks.register('copyDependencies', Sync) { - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - - from configurations.runtimeClasspath - into "${buildDir}/dependencies" -} - task copyDockerRuntimeJars (type: Sync) { duplicatesStrategy = DuplicatesStrategy.EXCLUDE description = 'Copy runtime JARs and app jar to docker build directory' @@ -167,12 +158,6 @@ task slowTest(type: Test) { } } -jacocoTestReport { +tasks.named('jacocoTestReport').configure { dependsOn slowTest - reports { - xml.required = true - xml.destination file("${buildDir}/reports/jacoco/test/jacocoTestReport.xml") - html.required = true - html.destination file("${buildDir}/reports/jacoco/test/html") - } } \ No newline at end of file diff --git a/MetadataMigration/build.gradle b/MetadataMigration/build.gradle index 2cb5f3778..e62b27bf0 100644 --- a/MetadataMigration/build.gradle +++ b/MetadataMigration/build.gradle @@ -1,7 +1,6 @@ plugins { id 'application' id 'java' - id 'jacoco' id 'io.freefair.lombok' version '8.6' } @@ -27,23 +26,6 @@ application { mainClassName = 'com.rfs.MetadataMigration' } -// Utility task to allow copying required libraries into a 'dependencies' folder for security scanning -tasks.register('copyDependencies', Sync) { - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - - from configurations.runtimeClasspath - into "${buildDir}/dependencies" -} - -jacocoTestReport { - reports { - xml.required = true - xml.destination file("${buildDir}/reports/jacoco/test/jacocoTestReport.xml") - html.required = true - html.destination file("${buildDir}/reports/jacoco/test/html") - } -} - test { useJUnitPlatform() } \ No newline at end of file diff --git a/RFS/build.gradle b/RFS/build.gradle index 4f9b6a379..73b1a1080 100644 --- a/RFS/build.gradle +++ b/RFS/build.gradle @@ -1,7 +1,6 @@ plugins { id 'application' id 'java' - id 'jacoco' id 'io.freefair.lombok' version '8.6' id 'java-test-fixtures' } @@ -94,23 +93,6 @@ task migrateDocuments (type: JavaExec) { mainClass = 'com.rfs.RfsMigrateDocuments' } -// Utility task to allow copying required libraries into a 'dependencies' folder for security scanning -tasks.register('copyDependencies', Sync) { - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - - from configurations.runtimeClasspath - into "${buildDir}/dependencies" -} - -jacocoTestReport { - reports { - xml.required = true - xml.destination file("${buildDir}/reports/jacoco/test/jacocoTestReport.xml") - html.required = true - html.destination file("${buildDir}/reports/jacoco/test/html") - } -} - test { useJUnitPlatform { excludeTags 'longTest' diff --git a/TrafficCapture/build.gradle b/TrafficCapture/build.gradle index 6b2a46e2e..8189023b2 100644 --- a/TrafficCapture/build.gradle +++ b/TrafficCapture/build.gradle @@ -77,14 +77,6 @@ allprojects { enabled = true } } - - // Utility task to allow copying required libraries into a 'dependencies' folder for security scanning - tasks.register('copyDependencies', Copy) { - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - - from configurations.runtimeClasspath - into "${buildDir}/dependencies" - } } jacocoTestReport { diff --git a/build.gradle b/build.gradle index c9fb394f6..0a54fb9d1 100644 --- a/build.gradle +++ b/build.gradle @@ -9,6 +9,7 @@ task buildDockerImages() { } subprojects { + apply plugin: 'jacoco' apply plugin: 'java' apply plugin: 'maven-publish' @@ -88,6 +89,23 @@ subprojects { } } } + + // Utility task to allow copying required libraries into a 'dependencies' folder for security scanning + tasks.register('copyDependencies', Sync) { + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + + from configurations.runtimeClasspath + into "${buildDir}/dependencies" + } + + jacocoTestReport { + reports { + xml.required = true + xml.destination file("${buildDir}/reports/jacoco/test/jacocoTestReport.xml") + html.required = true + html.destination file("${buildDir}/reports/jacoco/test/html") + } + } } task listPublishedArtifacts { diff --git a/coreUtilities/build.gradle b/coreUtilities/build.gradle index d877fbb42..b3eef4141 100644 --- a/coreUtilities/build.gradle +++ b/coreUtilities/build.gradle @@ -20,7 +20,6 @@ plugins { id 'org.opensearch.migrations.java-library-conventions' id 'io.freefair.lombok' id 'java' - id 'jacoco' id 'java-test-fixtures' } @@ -66,23 +65,6 @@ dependencies { testFixturesImplementation group: 'org.slf4j', name: 'slf4j-api' } -// Utility task to allow copying required libraries into a 'dependencies' folder for security scanning -tasks.register('copyDependencies', Sync) { - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - - from configurations.runtimeClasspath - into "${buildDir}/dependencies" -} - -jacocoTestReport { - reports { - xml.required = true - xml.destination file("${buildDir}/reports/jacoco/test/jacocoTestReport.xml") - html.required = true - html.destination file("${buildDir}/reports/jacoco/test/html") - } -} - tasks.named('test') { useJUnitPlatform() }