From 617dd58d76d8182ed414659a3dca8609153ff3ee Mon Sep 17 00:00:00 2001
From: "Benjamin, Max (mb388a)" <mb388a@att.com>
Date: Fri, 29 May 2020 14:13:54 -0400
Subject: Override global maven configuration

Issue-ID: SO-2941

Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: I4402426f764ab2599fea0b7f35ce314b920a25ed
---
 packages/docker/pom.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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>
-- 
cgit 1.2.3-korg