Skip to content

Commit

Permalink
FINERACT-1203: Fix broken Executable WAR
Browse files Browse the repository at this point in the history
  • Loading branch information
vidakovic authored and ptuomola committed Oct 15, 2020
1 parent cd688a5 commit ee9f428
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
15 changes: 7 additions & 8 deletions fineract-provider/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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) {
Expand All @@ -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'
Expand Down

0 comments on commit ee9f428

Please sign in to comment.