From: Benjamin, Max (mb388a) <mb388a@att.com>
Date: Fri, 29 May 2020 18:13:54 +0000 (-0400)
Subject: Override global maven configuration
X-Git-Tag: 1.7.1~122^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F83%2F108583%2F1;p=so.git

Override global maven configuration

Issue-ID: SO-2941

Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: I4402426f764ab2599fea0b7f35ce314b920a25ed
---

diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index 217a5fdb5c..1862bd15ff 100644
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -65,13 +65,11 @@
         <groupId>io.fabric8</groupId>
         <artifactId>docker-maven-plugin</artifactId>
         <version>0.31.0</version>
-
-        <configuration>
+        <configuration combine.self="override">
           <verbose>true</verbose>
           <apiVersion>1.23</apiVersion>
           <pullRegistry>${docker.pull.registry}</pullRegistry>
           <pushRegistry>${docker.push.registry}</pushRegistry>
-
           <images>
             <image>
               <name>${docker.image.prefix}/base-image:1.0</name>