war naming changed to default behaviour, added ability to modify by setting property

Author: kandula-aswin

Diff for: app-war/pom.xml

@@ -30,8 +30,8 @@
 							<Ignore-Scanning-Archives>asm-all-repackaged-2.5.0.jar</Ignore-Scanning-Archives>
 						</manifestEntries>
 					</archive>
-					<!-- warName becomes the context of the application, it avoids container specific configuration -->
-					<warName>${artifactId}</warName>
+					<!-- Generated warName defaults to ${project.build.finalName}, but can be modified by setting property -Dapp.warName=app-war -->
+					<warName>${app.warName}</warName>
 				</configuration>
 			</plugin>
 		</plugins>

Diff for: pom.xml

@@ -16,6 +16,8 @@
 		<failBuildOnCVSS>11</failBuildOnCVSS>
 		<!-- Update every 168 hours (7 days) -->
 		<cveValidForHours>168</cveValidForHours>
+		<app.warName>${project.build.finalName}</app.warName>
+		<web.warName>${project.build.finalName}</web.warName>
 	</properties>
 
 	<name>sample-app-parent</name>

Diff for: web-war/pom.xml

@@ -30,8 +30,8 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
 				<configuration>
-					<!-- warName becomes the context of the application, it avoids container specific configuration -->
-					<warName>${artifactId}</warName>
+					<!-- Generated warName defaults to ${project.build.finalName}, but can be modified by setting property -Dweb.warName=web-war -->
+					<warName>${web.warName}</warName>
 				</configuration>
 			</plugin>
 		</plugins>