From dade1e4e1ddb044218f652dda4f1f26f1e2bbf7a Mon Sep 17 00:00:00 2001 From: RyanHolstien Date: Wed, 11 Mar 2020 20:22:55 -0500 Subject: [PATCH] =?UTF-8?q?Issue=20#1590:=20Gradle=20build=20fails=20when?= =?UTF-8?q?=20run=20in=20parallel=20-=20add=20dependency=E2=80=A6=20(#1591?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Issue #1590: Gradle build fails when run in parallel - add dependency on avro schema generation to metadata models jar generation * Issue #1590: Adding processResource dependencies * Issue #1590: Remove unnecessary gradle tasks Co-authored-by: Ryan Holstien --- metadata-events/mxe-utils-avro-1.7/build.gradle | 3 ++- metadata-models/build.gradle | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/metadata-events/mxe-utils-avro-1.7/build.gradle b/metadata-events/mxe-utils-avro-1.7/build.gradle index 586e1323bc..f74e3a786e 100644 --- a/metadata-events/mxe-utils-avro-1.7/build.gradle +++ b/metadata-events/mxe-utils-avro-1.7/build.gradle @@ -27,7 +27,8 @@ task copyOriginalMXESchemas(type: Copy) { } compileJava.dependsOn copyOriginalMXESchemas +processResources.dependsOn copyOriginalMXESchemas clean { project.delete("src/main/resources/avro") -} \ No newline at end of file +} diff --git a/metadata-models/build.gradle b/metadata-models/build.gradle index 7e8ed3a9ff..74cbb31158 100644 --- a/metadata-models/build.gradle +++ b/metadata-models/build.gradle @@ -9,4 +9,6 @@ dependencies { testCompile externalDependency.guava } -pegasus.main.generationModes = [PegasusGenerationMode.PEGASUS, PegasusGenerationMode.AVRO] \ No newline at end of file +mainAvroSchemaJar.dependsOn generateAvroSchema + +pegasus.main.generationModes = [PegasusGenerationMode.PEGASUS, PegasusGenerationMode.AVRO]