FINERACT-2181: Some tweaks in the gradle build to ensure correct task processing

fineract-core/build.gradle

@@ -22,32 +22,50 @@ apply plugin: 'java'
 apply plugin: 'eclipse'
 
 tasks.register('staticWeaveJpa', JavaExec) {
-    group = "build"
-    description = "Performs EclipseLink static weaving of entity classes"
+    dependsOn classes
 
-    dependsOn classes, processResources
+    def classesDir = layout.buildDirectory.dir("classes/java/main").get().asFile
+    def outputDir = layout.buildDirectory.dir("weaved-classes").get().asFile
+    def persistenceInfo = layout.buildDirectory.dir('static-weaving').get()
+    copy {
+        from file("src/main/resources/jpa/static-weaving/module/core/persistence.xml")
+        into "${persistenceInfo}/META-INF/"
+    }
 
-    def classesDir = file(sourceSets.main.output.classesDirs.asPath)
-
-    mainClass.set('org.eclipse.persistence.tools.weaving.jpa.StaticWeave')
+    mainClass.set("org.eclipse.persistence.tools.weaving.jpa.StaticWeave")
     classpath = sourceSets.main.runtimeClasspath
-    args '-persistenceinfo', classesDir, classesDir, classesDir
+
+    args = [
+            '-persistenceinfo', persistenceInfo,
+            classesDir.absolutePath,
+            outputDir.absolutePath
+    ]
 }
 
-staticWeaveJpa.doLast {
-    delete "${sourceSets.main.output.classesDirs.asPath}/META-INF/persistence.xml"
+
+
+tasks.register("weavedJar", Jar) {
+    archiveClassifier.set("")
+    dependsOn staticWeaveJpa
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    from(layout.buildDirectory.dir("weaved-classes"))
+    exclude("META-INF/persistence.xml")
 }
 
-tasks.named('classes') {
-    finalizedBy staticWeaveJpa
+// Configure the default jar task to depend on weavedJar and use its output
+tasks.named('jar') {
+    dependsOn weavedJar
+    enabled = false  // Disable the default jar task
+    // The weavedJar will be used as the primary artifact
 }
 
-tasks.named('processResources') {
-    from('src/main/resources')
-    into sourceSets.main.java.classesDirectory
-    outputs.upToDateWhen { false }
+// Make sure the assemble task depends on weavedJar
+tasks.named('assemble') {
+    dependsOn weavedJar
 }
 
+
+
 configurations {
     providedRuntime // needed for Spring Boot executable WAR
     providedCompile
@@ -72,7 +90,7 @@ configurations {
 apply from: 'dependencies.gradle'
 
 compileJava {
-    dependsOn ':fineract-avro-schemas:compileJava', processResources
+    dependsOn ':fineract-avro-schemas:compileJava'
     options.compilerArgs += ['-parameters']
 }
 
@@ -101,3 +119,18 @@ if (!(project.hasProperty('env') && project.getProperty('env') == 'dev')) {
         }
     }
 }
+
+tasks.named("test") {
+    dependsOn staticWeaveJpa
+
+    def testClasses = layout.buildDirectory.dir("classes/java/test").get().asFile
+    def weavedClasses = layout.buildDirectory.dir("weaved-classes").get().asFile
+    def testResources = layout.buildDirectory.dir("resources/test").get().asFile
+
+    classpath = files(
+            weavedClasses,
+            testClasses,
+            testResources,
+            configurations.testRuntimeClasspath
+    )
+}