From b288b64a5684993492958c4f4ce9213d1bf4db21 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 29 Jan 2024 10:44:45 +0100
Subject: [PATCH] OZG-4792 Image password Login

---
 Jenkinsfile | 2 +-
 pom.xml     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index fbaeac0b..a286db1c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -78,7 +78,7 @@ pipeline {
                 
                 configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
                     withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) {
-                        sh 'mvn -s $MAVEN_SETTINGS spring-boot:build-image -DskipTests -Dmaven.wagon.http.retryHandler.count=3 $BUILD_PROFILE -Ddocker.publishRegistry.username=${USER} -Ddocker.publishRegistry.password=${PASSWORD}'
+                        sh 'mvn -s $MAVEN_SETTINGS spring-boot:build-image -DskipTests -Dmaven.wagon.http.retryHandler.count=3 $BUILD_PROFILE -Duser=${USER} -Dpassword=${PASSWORD}'
                     }
                 }
             }
diff --git a/pom.xml b/pom.xml
index bf0d99d3..d0274c73 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,8 +101,8 @@
 						<publish>true</publish>
 					</image>
                         <publishRegistry>
-                            <username>${docker.publishRegistry.username}</username>
-                            <password>${docker.publishRegistry.password}</password>
+							<username>${user}</username>
+							<password>${password}</password>
                         </publishRegistry>
 					<excludes>
 						<exclude>
-- 
GitLab