FINERACT-1203: Fix broken Executable WAR

This commit is contained in:
Aleksandar Vidakovic
2020-10-15 12:42:05 +03:00
committed by Petri Tuomola
parent cd688a5ce1
commit ee9f428f28
2 changed files with 8 additions and 9 deletions
+1 -1
View File
@@ -59,7 +59,7 @@ The tenants database connection details are configured [via environment variable
Instructions to build a WAR file Instructions to build a WAR file
============ ============
1. Clone the repository or download and extract the archive file to your local directory. 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. 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. We recommend using the JAR instead of the WAR file deployment, because it's much easier.
+7 -8
View File
@@ -526,7 +526,7 @@ war {
// notice the parens // notice the parens
into "WEB-INF/" // no leading slash into "WEB-INF/" // no leading slash
} }
war.finalizedBy(bootWar) enabled = true
} }
// Configuration for Gradle license plug-in // Configuration for Gradle license plug-in
@@ -599,8 +599,8 @@ cargo {
} }
} }
cargoRunLocal.dependsOn bootWar cargoRunLocal.dependsOn war
cargoStartLocal.dependsOn bootWar cargoStartLocal.dependsOn war
cargoStartLocal.mustRunAfter "integrationTestClasses" cargoStartLocal.mustRunAfter "integrationTestClasses"
cargoStartLocal.mustRunAfter "enhance" cargoStartLocal.mustRunAfter "enhance"
cargoStartLocal.mustRunAfter "resolve" cargoStartLocal.mustRunAfter "resolve"
@@ -725,13 +725,12 @@ springBoot {
mainClassName = 'org.apache.fineract.ServerApplication' mainClassName = 'org.apache.fineract.ServerApplication'
} }
bootWar { bootJar {
mainClassName = 'org.apache.fineract.ServerApplication'
duplicatesStrategy = DuplicatesStrategy.EXCLUDE duplicatesStrategy = DuplicatesStrategy.EXCLUDE
} }
bootJar { bootWar {
duplicatesStrategy = DuplicatesStrategy.EXCLUDE enabled = false
} }
tasks.withType(Tar) { tasks.withType(Tar) {
@@ -745,7 +744,7 @@ distributions {
baseName "apache-fineract-$releaseVersion-binary" baseName "apache-fineract-$releaseVersion-binary"
contents { contents {
from bootJar from bootJar
from bootWar from war
from("$buildDir/swagger-code-fineract/build/libs/") { from("$buildDir/swagger-code-fineract/build/libs/") {
include '**/*.jar' include '**/*.jar'
rename 'client-(.+)\\.jar', 'fineract-client.jar' rename 'client-(.+)\\.jar', 'fineract-client.jar'