From 68cfe9c75ccd61e154e84edece6fbcda534ba1b0 Mon Sep 17 00:00:00 2001 From: chasegawa Date: Tue, 28 Nov 2023 11:05:04 -0700 Subject: [PATCH] NOJIRA fixing duplicates in the WAR file issue --- backend/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/build.gradle b/backend/build.gradle index 71575911a..e2e080dbc 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -129,7 +129,7 @@ bootWar { } dependsOn 'copyApplicationYAML' archiveName = "${baseName}-${version}.war" - duplicatesStrategy(DuplicatesStrategy.INCLUDE) + duplicatesStrategy(DuplicatesStrategy.EXCLUDE) } springBoot { @@ -363,7 +363,7 @@ task enversTest(type: Test) { classpath = sourceSets.enversTest.runtimeClasspath systemProperties = System.properties systemProperties['user.dir'] = workingDir - processEnversTestResources.duplicatesStrategy(DuplicatesStrategy.INCLUDE) + processEnversTestResources.duplicatesStrategy(DuplicatesStrategy.EXCLUDE) useJUnitPlatform() } @@ -486,7 +486,7 @@ docker { files tasks.bootWar.outputs files 'src/main/docker-files/loader.properties' buildArgs(['JAR_FILE': "shibui-${version}.war"]) - copySpec.duplicatesStrategy(DuplicatesStrategy.INCLUDE) + copySpec.duplicatesStrategy(DuplicatesStrategy.EXCLUDE) } tasks.dockerRun.dependsOn tasks.docker