From 855212c7619de6146c27de98486b33388ab10625 Mon Sep 17 00:00:00 2001
From: cagache <claudia.agache@ness.com>
Date: Tue, 15 Oct 2019 08:17:48 +0300
Subject: [PATCH 1/2] Try to use docker build arguments

---
 pom.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pom.xml b/pom.xml
index 5b42e38c38..387b3940f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -253,6 +253,9 @@
       <!-- Profile used only to build docker images-->
       <profile>
          <id>buildDockerImage</id>
+         <properties>
+            <docker.buildArg.TOMCAT_DIR>/usr/local/tomcat</docker.buildArg.TOMCAT_DIR>
+         </properties>
          <build>
             <pluginManagement>
                <plugins>
@@ -289,6 +292,9 @@
       <!-- Profile used to build docker images with a specific tag and push them to the given image registry (quay.io)-->
       <profile>
          <id>internal</id>
+         <properties>
+            <docker.buildArg.TOMCAT_DIR>/usr/local/tomcat</docker.buildArg.TOMCAT_DIR>
+         </properties>
          <build>
             <pluginManagement>
                <plugins>
@@ -327,6 +333,9 @@
        hub.docker -->
       <profile>
          <id>master</id>
+         <properties>
+            <docker.buildArg.TOMCAT_DIR>/usr/local/tomcat</docker.buildArg.TOMCAT_DIR>
+         </properties>
          <build>
             <pluginManagement>
                <plugins>
@@ -371,6 +380,9 @@
       <!-- Profile used to build and push docker images with project.version tag to hub.docker when the enterprise deploy goal encounters-->
       <profile>
          <id>release-enterprise</id>
+         <properties>
+            <docker.buildArg.TOMCAT_DIR>/usr/local/tomcat</docker.buildArg.TOMCAT_DIR>
+         </properties>
          <build>
             <pluginManagement>
                <plugins>

From c95ea4c2193a6c59d5e0df5dcfe84d77fffe833d Mon Sep 17 00:00:00 2001
From: cagache <claudia.agache@ness.com>
Date: Tue, 15 Oct 2019 09:11:32 +0300
Subject: [PATCH 2/2] Revert "Try to use docker build arguments"

This reverts commit 855212c7
---
 pom.xml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 387b3940f1..5b42e38c38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -253,9 +253,6 @@
       <!-- Profile used only to build docker images-->
       <profile>
          <id>buildDockerImage</id>
-         <properties>
-            <docker.buildArg.TOMCAT_DIR>/usr/local/tomcat</docker.buildArg.TOMCAT_DIR>
-         </properties>
          <build>
             <pluginManagement>
                <plugins>
@@ -292,9 +289,6 @@
       <!-- Profile used to build docker images with a specific tag and push them to the given image registry (quay.io)-->
       <profile>
          <id>internal</id>
-         <properties>
-            <docker.buildArg.TOMCAT_DIR>/usr/local/tomcat</docker.buildArg.TOMCAT_DIR>
-         </properties>
          <build>
             <pluginManagement>
                <plugins>
@@ -333,9 +327,6 @@
        hub.docker -->
       <profile>
          <id>master</id>
-         <properties>
-            <docker.buildArg.TOMCAT_DIR>/usr/local/tomcat</docker.buildArg.TOMCAT_DIR>
-         </properties>
          <build>
             <pluginManagement>
                <plugins>
@@ -380,9 +371,6 @@
       <!-- Profile used to build and push docker images with project.version tag to hub.docker when the enterprise deploy goal encounters-->
       <profile>
          <id>release-enterprise</id>
-         <properties>
-            <docker.buildArg.TOMCAT_DIR>/usr/local/tomcat</docker.buildArg.TOMCAT_DIR>
-         </properties>
          <build>
             <pluginManagement>
                <plugins>