Fix build (#254)

Co-authored-by: Michael Peels <[email protected]>
CDCgov · Dec 13, 2024 · 3ce3e7f · 3ce3e7f
1 parent aae4c97
commit 3ce3e7f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/cdaschema/build.gradle b/cdaschema/build.gradle
@@ -44,11 +44,6 @@ task generateXmlBeans(type: JavaExec) {
 
 }
 
-task copyJar(type: Copy) {
-  from 'build/libs/cda-schema.jar'
-  into "${project(':data-ingestion-service').projectDir}/libs/"
-}
-
 compileJava.dependsOn generateXmlBeans
 
 // Disable the default jar task
@@ -63,5 +58,9 @@ artifacts {
     archives cdaSchemaJar
 }
 
+task copyJar(type: Copy) {
+  from "${buildDir}/libs/cda-schema.jar"
+  into "${project(':data-ingestion-service').projectDir}/libs/"
+}
 cdaSchemaJar.mustRunAfter compileJava
-build.finalizedBy copyJar
+generateXmlBeans.finalizedBy(copyJar)
diff --git a/data-ingestion-service/build.gradle b/data-ingestion-service/build.gradle
@@ -182,7 +182,7 @@ task jaxb {
 compileJava.dependsOn jaxb
 
 if (project != project.rootProject || project.hasProperty('remoteBuild')) {
-	compileJava.mustRunAfter(":hl7-parser:build")
+	compileJava.mustRunAfter(":hl7-parser:copyJar")
 	compileJava.mustRunAfter(":cdaschema:copyJar")
 }
 
@@ -283,7 +283,7 @@ jar {
 
 	// Conditionally add dependencies from projects
 	if (findProject(':hl7-parser')) {
-		dependsOn(':hl7-parser:jar')
+		dependsOn(':hl7-parser:copyJar')
 	}
 
 	if (findProject(':cdaschema')) {

diff --git a/hl7-parser/build.gradle b/hl7-parser/build.gradle
@@ -39,5 +39,5 @@ task copyJar(type: Copy) {
   into "${project(':data-ingestion-service').projectDir}/libs/"
 }
 
-build.dependsOn copyJar
+build.finalizedBy(copyJar)