This is an automated email from the ASF dual-hosted git repository.

lahirujayathilake pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-custos.git

commit 506a05e5226b6f5bc746e8dd19ff0273f298aa1d
Author: lahiruj <[email protected]>
AuthorDate: Tue Jan 16 19:24:19 2024 -0500

    changed the docker build library to io.fabric8:docker-maven-plugin
---
 custos-rest-proxy/pom.xml                          | 73 ++++++++++++----------
 .../custos-core-services-server/pom.xml            | 27 ++++----
 .../agent-profile-core-service/pom.xml             |  4 +-
 .../cluster-management-core-service/pom.xml        |  4 +-
 .../credential-store-core-service/pom.xml          |  4 +-
 .../custos-core-services/custos-logging/pom.xml    |  4 +-
 .../custos-messaging-core-service/pom.xml          |  4 +-
 .../federated-authentication-core-service/pom.xml  |  4 +-
 .../iam-admin-core-service/pom.xml                 |  4 +-
 .../identity-core-service/pom.xml                  |  4 +-
 .../resource-secret-core-service/pom.xml           |  4 +-
 .../sharing-core-service/pom.xml                   |  4 +-
 .../tenant-profile-core-service/pom.xml            |  4 +-
 .../user-profile-core-service/pom.xml              |  4 +-
 .../custos-grpc-web-proxy/pom.xml                  |  4 +-
 .../custos-keycloak/pom.xml                        |  4 +-
 .../custos-integration-services-server/pom.xml     | 27 ++++----
 .../agent-management-service/pom.xml               |  4 +-
 .../custos-integration-services-swagger/pom.xml    |  4 +-
 .../group-management-service/pom.xml               |  4 +-
 .../identity-management-service/pom.xml            |  4 +-
 .../log-management-service/pom.xml                 |  4 +-
 .../resource-secret-management-service/pom.xml     |  4 +-
 .../scim-service/pom.xml                           |  4 +-
 .../sharing-management-service/pom.xml             |  4 +-
 .../tenant-management-service/pom.xml              |  4 +-
 .../user-management-service/pom.xml                |  4 +-
 custos-utilities/ide-integration/pom.xml           | 27 ++++----
 pom.xml                                            | 11 +++-
 29 files changed, 145 insertions(+), 116 deletions(-)

diff --git a/custos-rest-proxy/pom.xml b/custos-rest-proxy/pom.xml
index 4af91e582..2db1982ec 100644
--- a/custos-rest-proxy/pom.xml
+++ b/custos-rest-proxy/pom.xml
@@ -37,42 +37,47 @@
 
     <build>
         <plugins>
-                    <plugin>
-                        <groupId>org.springframework.boot</groupId>
-                        <artifactId>spring-boot-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <configuration>
-                                    
<mainClass>org.apache.custos.ide.integration.CustosServer</mainClass>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>com.spotify</groupId>
-                        <artifactId>dockerfile-maven-plugin</artifactId>
-                        <version>${docker.plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <id>container</id>
-                                <goals>
-                                    <goal>build</goal>
-                                    <goal>push</goal>
-                                </goals>
-                            </execution>
-                        </executions>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
                         <configuration>
-                            <noCache>true</noCache>
-                            <serverId>docker.io</serverId>
-                            
<repository>${docker.image.prefix}/custos-rest-proxy</repository>
-                            <tag>latest</tag>
-                            
<useMavenSettingsForAuth>true</useMavenSettingsForAuth>
-                            <buildArgs>
-                                
<JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
-                            </buildArgs>
-                            <skip>false</skip>
+                            
<mainClass>org.apache.custos.ide.integration.CustosServer</mainClass>
                         </configuration>
-                    </plugin>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>container</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>build</goal>
+                            <goal>push</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <images>
+                        <image>
+                            
<name>${docker.image.prefix}/custos-rest-proxy:latest</name>
+                            <build>
+                                
<dockerFileDir>${project.basedir}</dockerFileDir>
+                                <noCache>true</noCache>
+                                <args>
+                                    
<JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
+                                </args>
+                            </build>
+                        </image>
+                    </images>
+                    <registry>docker.io</registry>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
diff --git a/custos-services/custos-core-services-server/pom.xml 
b/custos-services/custos-core-services-server/pom.xml
index 5b9f29905..dfe72c601 100644
--- a/custos-services/custos-core-services-server/pom.xml
+++ b/custos-services/custos-core-services-server/pom.xml
@@ -232,12 +232,12 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <version>${docker.plugin.version}</version>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
                 <executions>
                     <execution>
                         <id>container</id>
+                        <phase>install</phase>
                         <goals>
                             <goal>build</goal>
                             <goal>push</goal>
@@ -245,14 +245,19 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <noCache>true</noCache>
-                    <serverId>docker.io</serverId>
-                    
<repository>${docker.image.prefix}/${project.artifactId}</repository>
-                    <tag>${project.version}</tag>
-                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
-                    <buildArgs>
-                        
<JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
-                    </buildArgs>
+                    <images>
+                        <image>
+                            
<name>${docker.image.prefix}/${project.artifactId}:${project.version}</name>
+                            <build>
+                                
<dockerFileDir>${project.basedir}</dockerFileDir>
+                                <noCache>true</noCache>
+                                <args>
+                                    
<JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
+                                </args>
+                            </build>
+                        </image>
+                    </images>
+                    <registry>docker.io</registry>
                     <skip>false</skip>
                 </configuration>
             </plugin>
diff --git 
a/custos-services/custos-core-services/agent-profile-core-service/pom.xml 
b/custos-services/custos-core-services/agent-profile-core-service/pom.xml
index e1a253e9e..3bf98aab9 100644
--- a/custos-services/custos-core-services/agent-profile-core-service/pom.xml
+++ b/custos-services/custos-core-services/agent-profile-core-service/pom.xml
@@ -128,8 +128,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
                 <configuration>
                     <skip>false</skip>
                 </configuration>
diff --git 
a/custos-services/custos-core-services/cluster-management-core-service/pom.xml 
b/custos-services/custos-core-services/cluster-management-core-service/pom.xml
index 123d1310b..8c509e7ca 100644
--- 
a/custos-services/custos-core-services/cluster-management-core-service/pom.xml
+++ 
b/custos-services/custos-core-services/cluster-management-core-service/pom.xml
@@ -131,8 +131,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
                 <configuration>
                     <skip>false</skip>
                 </configuration>
diff --git 
a/custos-services/custos-core-services/credential-store-core-service/pom.xml 
b/custos-services/custos-core-services/credential-store-core-service/pom.xml
index c008bba84..972083fa6 100644
--- a/custos-services/custos-core-services/credential-store-core-service/pom.xml
+++ b/custos-services/custos-core-services/credential-store-core-service/pom.xml
@@ -161,8 +161,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
                 <configuration>
                     <skip>false</skip>
                 </configuration>
diff --git a/custos-services/custos-core-services/custos-logging/pom.xml 
b/custos-services/custos-core-services/custos-logging/pom.xml
index 4bb435235..99b61d541 100644
--- a/custos-services/custos-core-services/custos-logging/pom.xml
+++ b/custos-services/custos-core-services/custos-logging/pom.xml
@@ -124,8 +124,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
                 <configuration>
                     <skip>false</skip>
                 </configuration>
diff --git 
a/custos-services/custos-core-services/custos-messaging-core-service/pom.xml 
b/custos-services/custos-core-services/custos-messaging-core-service/pom.xml
index 73e6b4136..be95e5ece 100644
--- a/custos-services/custos-core-services/custos-messaging-core-service/pom.xml
+++ b/custos-services/custos-core-services/custos-messaging-core-service/pom.xml
@@ -146,8 +146,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
                 <configuration>
                     <skip>false</skip>
                 </configuration>
diff --git 
a/custos-services/custos-core-services/federated-authentication-core-service/pom.xml
 
b/custos-services/custos-core-services/federated-authentication-core-service/pom.xml
index 4217e9e28..f84fa36ae 100644
--- 
a/custos-services/custos-core-services/federated-authentication-core-service/pom.xml
+++ 
b/custos-services/custos-core-services/federated-authentication-core-service/pom.xml
@@ -131,8 +131,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
                 <configuration>
                     <skip>false</skip>
                 </configuration>
diff --git 
a/custos-services/custos-core-services/iam-admin-core-service/pom.xml 
b/custos-services/custos-core-services/iam-admin-core-service/pom.xml
index b144bb119..0fc250246 100644
--- a/custos-services/custos-core-services/iam-admin-core-service/pom.xml
+++ b/custos-services/custos-core-services/iam-admin-core-service/pom.xml
@@ -125,8 +125,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
                 <configuration>
                     <skip>false</skip>
                 </configuration>
diff --git a/custos-services/custos-core-services/identity-core-service/pom.xml 
b/custos-services/custos-core-services/identity-core-service/pom.xml
index 548cda8e7..ef91e6087 100644
--- a/custos-services/custos-core-services/identity-core-service/pom.xml
+++ b/custos-services/custos-core-services/identity-core-service/pom.xml
@@ -122,8 +122,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
                 <configuration>
                     <skip>false</skip>
                 </configuration>
diff --git 
a/custos-services/custos-core-services/resource-secret-core-service/pom.xml 
b/custos-services/custos-core-services/resource-secret-core-service/pom.xml
index 3b989143b..38bf89470 100644
--- a/custos-services/custos-core-services/resource-secret-core-service/pom.xml
+++ b/custos-services/custos-core-services/resource-secret-core-service/pom.xml
@@ -178,8 +178,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
                 <configuration>
                     <skip>false</skip>
                 </configuration>
diff --git a/custos-services/custos-core-services/sharing-core-service/pom.xml 
b/custos-services/custos-core-services/sharing-core-service/pom.xml
index 509eee497..b232e0a2e 100644
--- a/custos-services/custos-core-services/sharing-core-service/pom.xml
+++ b/custos-services/custos-core-services/sharing-core-service/pom.xml
@@ -136,8 +136,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
                 <configuration>
                     <skip>false</skip>
                 </configuration>
diff --git 
a/custos-services/custos-core-services/tenant-profile-core-service/pom.xml 
b/custos-services/custos-core-services/tenant-profile-core-service/pom.xml
index e5cb2f4fb..6f9a1b7d5 100644
--- a/custos-services/custos-core-services/tenant-profile-core-service/pom.xml
+++ b/custos-services/custos-core-services/tenant-profile-core-service/pom.xml
@@ -141,8 +141,8 @@
     <build>
         <plugins>
             <plugin>
-               <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
                 <configuration>
                     <skip>false</skip>
                 </configuration>
diff --git 
a/custos-services/custos-core-services/user-profile-core-service/pom.xml 
b/custos-services/custos-core-services/user-profile-core-service/pom.xml
index c2d8f48d5..1d71d5480 100644
--- a/custos-services/custos-core-services/user-profile-core-service/pom.xml
+++ b/custos-services/custos-core-services/user-profile-core-service/pom.xml
@@ -113,8 +113,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
                 <configuration>
                     <skip>false</skip>
                 </configuration>
diff --git 
a/custos-services/custos-external-services-distributions/custos-grpc-web-proxy/pom.xml
 
b/custos-services/custos-external-services-distributions/custos-grpc-web-proxy/pom.xml
index 14107c689..6cea529a5 100644
--- 
a/custos-services/custos-external-services-distributions/custos-grpc-web-proxy/pom.xml
+++ 
b/custos-services/custos-external-services-distributions/custos-grpc-web-proxy/pom.xml
@@ -33,8 +33,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
                 <configuration>
                     <skip>false</skip>
                 </configuration>
diff --git 
a/custos-services/custos-external-services-distributions/custos-keycloak/pom.xml
 
b/custos-services/custos-external-services-distributions/custos-keycloak/pom.xml
index b2c8fd22e..5dd5ba968 100644
--- 
a/custos-services/custos-external-services-distributions/custos-keycloak/pom.xml
+++ 
b/custos-services/custos-external-services-distributions/custos-keycloak/pom.xml
@@ -14,8 +14,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
                 <configuration>
                     <skip>false</skip>
                 </configuration>
diff --git a/custos-services/custos-integration-services-server/pom.xml 
b/custos-services/custos-integration-services-server/pom.xml
index 76f6b0237..c31fa71e1 100644
--- a/custos-services/custos-integration-services-server/pom.xml
+++ b/custos-services/custos-integration-services-server/pom.xml
@@ -238,12 +238,12 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <version>${docker.plugin.version}</version>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
                 <executions>
                     <execution>
                         <id>container</id>
+                        <phase>install</phase>
                         <goals>
                             <goal>build</goal>
                             <goal>push</goal>
@@ -251,14 +251,19 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <noCache>true</noCache>
-                    <serverId>docker.io</serverId>
-                    
<repository>${docker.image.prefix}/${project.artifactId}</repository>
-                    <tag>${project.version}</tag>
-                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
-                    <buildArgs>
-                        
<JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
-                    </buildArgs>
+                    <images>
+                        <image>
+                            
<name>${docker.image.prefix}/${project.artifactId}:${project.version}</name>
+                            <build>
+                                
<dockerFileDir>${project.basedir}</dockerFileDir>
+                                <noCache>true</noCache>
+                                <args>
+                                    
<JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
+                                </args>
+                            </build>
+                        </image>
+                    </images>
+                    <registry>docker.io</registry>
                     <skip>false</skip>
                 </configuration>
             </plugin>
diff --git 
a/custos-services/custos-integration-services/agent-management-service/pom.xml 
b/custos-services/custos-integration-services/agent-management-service/pom.xml
index 620bcdb9d..62042c246 100644
--- 
a/custos-services/custos-integration-services/agent-management-service/pom.xml
+++ 
b/custos-services/custos-integration-services/agent-management-service/pom.xml
@@ -112,8 +112,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
                 <configuration>
                     <skip>false</skip>
                 </configuration>
diff --git 
a/custos-services/custos-integration-services/custos-integration-services-swagger/pom.xml
 
b/custos-services/custos-integration-services/custos-integration-services-swagger/pom.xml
index 26c99d390..e080f1e55 100644
--- 
a/custos-services/custos-integration-services/custos-integration-services-swagger/pom.xml
+++ 
b/custos-services/custos-integration-services/custos-integration-services-swagger/pom.xml
@@ -78,8 +78,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
                 <configuration>
                     <skip>false</skip>
                 </configuration>
diff --git 
a/custos-services/custos-integration-services/group-management-service/pom.xml 
b/custos-services/custos-integration-services/group-management-service/pom.xml
index bb4eafc1b..8dab8069a 100644
--- 
a/custos-services/custos-integration-services/group-management-service/pom.xml
+++ 
b/custos-services/custos-integration-services/group-management-service/pom.xml
@@ -113,8 +113,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
                 <configuration>
                     <skip>false</skip>
                 </configuration>
diff --git 
a/custos-services/custos-integration-services/identity-management-service/pom.xml
 
b/custos-services/custos-integration-services/identity-management-service/pom.xml
index 157d46f5d..93ad34b34 100644
--- 
a/custos-services/custos-integration-services/identity-management-service/pom.xml
+++ 
b/custos-services/custos-integration-services/identity-management-service/pom.xml
@@ -115,8 +115,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
                 <configuration>
                     <skip>false</skip>
                 </configuration>
diff --git 
a/custos-services/custos-integration-services/log-management-service/pom.xml 
b/custos-services/custos-integration-services/log-management-service/pom.xml
index bef0ab456..4d0ed2188 100644
--- a/custos-services/custos-integration-services/log-management-service/pom.xml
+++ b/custos-services/custos-integration-services/log-management-service/pom.xml
@@ -145,8 +145,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
                 <configuration>
                     <skip>false</skip>
                 </configuration>
diff --git 
a/custos-services/custos-integration-services/resource-secret-management-service/pom.xml
 
b/custos-services/custos-integration-services/resource-secret-management-service/pom.xml
index 627971dad..1ac6f440a 100644
--- 
a/custos-services/custos-integration-services/resource-secret-management-service/pom.xml
+++ 
b/custos-services/custos-integration-services/resource-secret-management-service/pom.xml
@@ -132,8 +132,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
                 <configuration>
                     <skip>false</skip>
                 </configuration>
diff --git a/custos-services/custos-integration-services/scim-service/pom.xml 
b/custos-services/custos-integration-services/scim-service/pom.xml
index 3409ef263..9829aa041 100644
--- a/custos-services/custos-integration-services/scim-service/pom.xml
+++ b/custos-services/custos-integration-services/scim-service/pom.xml
@@ -108,8 +108,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
                 <configuration>
                     <skip>false</skip>
                 </configuration>
diff --git 
a/custos-services/custos-integration-services/sharing-management-service/pom.xml
 
b/custos-services/custos-integration-services/sharing-management-service/pom.xml
index 984f727ab..9371d2688 100644
--- 
a/custos-services/custos-integration-services/sharing-management-service/pom.xml
+++ 
b/custos-services/custos-integration-services/sharing-management-service/pom.xml
@@ -123,8 +123,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
                 <configuration>
                     <skip>false</skip>
                 </configuration>
diff --git 
a/custos-services/custos-integration-services/tenant-management-service/pom.xml 
b/custos-services/custos-integration-services/tenant-management-service/pom.xml
index eae4e09a0..57474bbea 100644
--- 
a/custos-services/custos-integration-services/tenant-management-service/pom.xml
+++ 
b/custos-services/custos-integration-services/tenant-management-service/pom.xml
@@ -129,8 +129,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
                 <configuration>
                     <skip>false</skip>
                 </configuration>
diff --git 
a/custos-services/custos-integration-services/user-management-service/pom.xml 
b/custos-services/custos-integration-services/user-management-service/pom.xml
index 085a598c1..73136722d 100644
--- 
a/custos-services/custos-integration-services/user-management-service/pom.xml
+++ 
b/custos-services/custos-integration-services/user-management-service/pom.xml
@@ -112,8 +112,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
                 <configuration>
                     <skip>false</skip>
                 </configuration>
diff --git a/custos-utilities/ide-integration/pom.xml 
b/custos-utilities/ide-integration/pom.xml
index cf24c2dc3..f559e8c98 100644
--- a/custos-utilities/ide-integration/pom.xml
+++ b/custos-utilities/ide-integration/pom.xml
@@ -133,12 +133,12 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <version>${docker.plugin.version}</version>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
                 <executions>
                     <execution>
                         <id>container</id>
+                        <phase>install</phase>
                         <goals>
                             <goal>build</goal>
                             <goal>push</goal>
@@ -146,14 +146,19 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <noCache>true</noCache>
-                    <serverId>docker.io</serverId>
-                    
<repository>${docker.image.prefix}/keycloak-nginx</repository>
-                    <tag>latest</tag>
-                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
-                    <buildArgs>
-                        
<JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
-                    </buildArgs>
+                    <images>
+                        <image>
+                            
<name>${docker.image.prefix}/keycloak-nginx:latest</name>
+                            <build>
+                                
<dockerFileDir>${project.basedir}</dockerFileDir>
+                                <noCache>true</noCache>
+                                <args>
+                                    
<JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
+                                </args>
+                            </build>
+                        </image>
+                    </images>
+                    <registry>docker.io</registry>
                     <skip>false</skip>
                 </configuration>
             </plugin>
diff --git a/pom.xml b/pom.xml
index b5d1a3e87..c2b645e6e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -424,6 +424,15 @@
                 <version>${os.maven.plugin}</version>
             </extension>
         </extensions>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>io.fabric8</groupId>
+                    <artifactId>docker-maven-plugin</artifactId>
+                    <version>${docker.plugin.version}</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
 
     </build>
 
@@ -461,7 +470,7 @@
 
         <docker.image.prefix>apachecustos</docker.image.prefix>
         <docker.image.repo>custos</docker.image.repo>
-        <docker.plugin.version>1.4.13</docker.plugin.version>
+        <docker.plugin.version>0.43.4</docker.plugin.version>
 
         <helm.maven.plugin.version>2.8.0</helm.maven.plugin.version>
         <maven.assembly.plugin.version>3.2.0</maven.assembly.plugin.version>

Reply via email to