From 0f33d4e846e8c5a772ece3f4d8eb286d50cfbb28 Mon Sep 17 00:00:00 2001
From: iaissaoui <aissaoui.iqbal@outlook.com>
Date: Tue, 11 Sep 2018 15:00:57 +0100
Subject: [PATCH 1/2] Update pom.xml

Getting rid of spring boot mvn plugin, multiple wars created/deployed issue solved
---
 pom.xml | 38 +++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index f9aeba6..eb3c86c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
@@ -39,20 +40,31 @@
 
 	<build>
 		<plugins>
+			<!-- OPTIONAL: Remove this plugin to reduce the WAR file size. It's not 
+				needed to deploy in an external application server. -->
+			<!-- <plugin> -->
+			<!-- <groupId>org.springframework.boot</groupId> -->
+			<!-- <artifactId>spring-boot-maven-plugin</artifactId> -->
+			<!-- <executions> -->
+			<!-- <execution> -->
+			<!-- <goals> -->
+			<!-- <goal>repackage</goal> -->
+			<!-- </goals> -->
+			<!-- </execution> -->
+			<!-- </executions> -->
+			<!-- </plugin> -->
 			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<configuration>
+					<failOnMissingWebXml>false</failOnMissingWebXml>
+					<!-- REMOVE: mvn:install with these tags enabled will create two war 
+						files! OpenShift container ends up deploying both and causes issues later 
+						(conflict between instances when registering dataSource bean for example) -->
+					<!-- <outputDirectory>target</outputDirectory> -->
+					<!-- <warName>ROOT</warName> -->
+				</configuration>
 			</plugin>
-			<plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>2.3</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                    <outputDirectory>target</outputDirectory>
-              		  <warName>ROOT</warName>
-                </configuration>
-            </plugin>
 		</plugins>
 	</build>
 

From 16342bf7f8c0ba86a2752a0b193df5a06d9cb8b6 Mon Sep 17 00:00:00 2001
From: iaissaoui <aissaoui.iqbal@outlook.com>
Date: Tue, 11 Sep 2018 22:16:59 +0100
Subject: [PATCH 2/2] Update pom.xml

warName & output dir enabled
---
 pom.xml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index eb3c86c..44ee084 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,12 +58,9 @@
 				<artifactId>maven-war-plugin</artifactId>
 				<configuration>
 					<failOnMissingWebXml>false</failOnMissingWebXml>
-					<!-- REMOVE: mvn:install with these tags enabled will create two war 
-						files! OpenShift container ends up deploying both and causes issues later 
-						(conflict between instances when registering dataSource bean for example) -->
-					<!-- <outputDirectory>target</outputDirectory> -->
-					<!-- <warName>ROOT</warName> -->
-				</configuration>
+					 <outputDirectory>target</outputDirectory>
+					<warName>ROOT</warName>
+			</configuration>
 			</plugin>
 		</plugins>
 	</build>