Fixed an issue caused by the irs-demo project that would prevent builds from succeed.

Build command that would fail every time: “./gradlew clean build slowIntegrationTest”.

Notes:
The evaluationDependsOn lines inside the build.gradle file under the irs-demo folder where moved above the dependencies for best practices and to avoid weird errors.

The archiveClassifier added to the build.gradle file under irs-demo/web folder is the actual fix. The archive classifier accepts a string that is appended to the jar file. By changing the filename of the jar, Boot Spring is prevented from overwriting the jar and causing build issues.
This commit is contained in:
filipesoliveira 2020-08-20 16:46:41 +01:00
parent 5d24b70227
commit d8eb117104
2 changed files with 4 additions and 3 deletions

View File

@ -50,6 +50,9 @@ repositories {
} }
} }
evaluationDependsOn("cordapp")
evaluationDependsOn("web")
dependencies { dependencies {
compile "commons-io:commons-io:$commons_io_version" compile "commons-io:commons-io:$commons_io_version"
compile project(":samples:irs-demo:web") compile project(":samples:irs-demo:web")
@ -84,9 +87,6 @@ task slowIntegrationTest(type: Test, dependsOn: []) {
classpath = sourceSets.slowIntegrationTest.runtimeClasspath classpath = sourceSets.slowIntegrationTest.runtimeClasspath
} }
evaluationDependsOn("cordapp")
evaluationDependsOn("web")
task systemTest(type: Test, dependsOn: ["cordapp:prepareDockerNodes", "web:generateDockerCompose"]) { task systemTest(type: Test, dependsOn: ["cordapp:prepareDockerNodes", "web:generateDockerCompose"]) {
testClassesDirs = sourceSets.systemTest.output.classesDirs testClassesDirs = sourceSets.systemTest.output.classesDirs
classpath = sourceSets.systemTest.runtimeClasspath classpath = sourceSets.systemTest.runtimeClasspath

View File

@ -92,6 +92,7 @@ dependencies {
jar { jar {
from sourceSets.main.output from sourceSets.main.output
dependsOn clientInstall dependsOn clientInstall
archiveClassifier = 'thin'
} }
def docker_dir = file("$project.buildDir/docker") def docker_dir = file("$project.buildDir/docker")