From ee9f428f28206d5dd56d3c61c07aace6dad3c4e9 Mon Sep 17 00:00:00 2001
From: Aleksandar Vidakovic <aleks@apache.org>
Date: Wed, 14 Oct 2020 22:49:47 +0200
Subject: [PATCH] FINERACT-1203: Fix broken Executable WAR

---
 README.md                      |  2 +-
 fineract-provider/build.gradle | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index ff46aba82..3a3a0d39b 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,7 @@ The tenants database connection details are configured [via environment variable
 Instructions to build a WAR file
 ============
 1. Clone the repository or download and extract the archive file to your local directory.
-2. Run `./gradlew clean bootWar` to build a traditional WAR file which will be created at `build/libs` directory.
+2. Run `./gradlew clean war` to build a traditional WAR file which will be created at `build/libs` directory.
 3. Deploy this WAR to your Tomcat v9 Servlet Container.
 
 We recommend using the JAR instead of the WAR file deployment, because it's much easier.
diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle
index 7d3098f91..364ccce66 100644
--- a/fineract-provider/build.gradle
+++ b/fineract-provider/build.gradle
@@ -526,7 +526,7 @@ war {
         // notice the parens
         into "WEB-INF/" // no leading slash
     }
-    war.finalizedBy(bootWar)
+    enabled = true
 }
 
 // Configuration for Gradle license plug-in
@@ -599,8 +599,8 @@ cargo {
     }
 }
 
-cargoRunLocal.dependsOn bootWar
-cargoStartLocal.dependsOn bootWar
+cargoRunLocal.dependsOn war
+cargoStartLocal.dependsOn war
 cargoStartLocal.mustRunAfter "integrationTestClasses"
 cargoStartLocal.mustRunAfter "enhance"
 cargoStartLocal.mustRunAfter "resolve"
@@ -725,13 +725,12 @@ springBoot {
     mainClassName = 'org.apache.fineract.ServerApplication'
 }
 
-bootWar {
-    mainClassName = 'org.apache.fineract.ServerApplication'
+bootJar {
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 }
 
-bootJar {
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+bootWar {
+    enabled = false
 }
 
 tasks.withType(Tar) {
@@ -745,7 +744,7 @@ distributions {
         baseName "apache-fineract-$releaseVersion-binary"
         contents {
             from bootJar
-            from bootWar
+            from war
             from("$buildDir/swagger-code-fineract/build/libs/") {
                 include '**/*.jar'
                 rename 'client-(.+)\\.jar', 'fineract-client.jar'