From d7ed9f097252d2dcdcf504fd45bc1e7280b61d4c Mon Sep 17 00:00:00 2001
From: sourabh_sourabh <sourabh.sourabh@est.tech>
Date: Mon, 18 Nov 2024 13:22:35 +0000
Subject: Fix for DMI Merge job to address HTTP 403 issue while uploading dmi
 jar to nexus3.onap.org

Issue-ID: CPS-2499
Change-Id: I18929479c73218d59296dcee8e28c50ff2da3a00
Signed-off-by: sourabh_sourabh <sourabh.sourabh@est.tech>
---
 dmi-service/pom.xml                                    | 2 ++
 dmi-stub/dmi-plugin-demo-and-csit-stub-app/pom.xml     | 1 +
 dmi-stub/dmi-plugin-demo-and-csit-stub-service/pom.xml | 1 +
 pom.xml                                                | 4 ++--
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dmi-service/pom.xml b/dmi-service/pom.xml
index 6e740e8d..6aa2e835 100644
--- a/dmi-service/pom.xml
+++ b/dmi-service/pom.xml
@@ -28,6 +28,7 @@
     </parent>
 
     <artifactId>dmi-service</artifactId>
+    <packaging>jar</packaging>
 
     <properties>
         <!-- Application Configuration -->
@@ -619,6 +620,7 @@
                     <plugin>
                         <groupId>com.google.cloud.tools</groupId>
                         <artifactId>jib-maven-plugin</artifactId>
+                        <version>3.3.2</version>
                     </plugin>
                 </plugins>
             </build>
diff --git a/dmi-stub/dmi-plugin-demo-and-csit-stub-app/pom.xml b/dmi-stub/dmi-plugin-demo-and-csit-stub-app/pom.xml
index 830736b3..ca214065 100644
--- a/dmi-stub/dmi-plugin-demo-and-csit-stub-app/pom.xml
+++ b/dmi-stub/dmi-plugin-demo-and-csit-stub-app/pom.xml
@@ -27,6 +27,7 @@
     </parent>
 
     <artifactId>dmi-plugin-demo-and-csit-stub-app</artifactId>
+    <packaging>jar</packaging>
 
     <properties>
         <app>org.onap.cps.ncmp.dmi.rest.stub.DmiDemoApplication</app>
diff --git a/dmi-stub/dmi-plugin-demo-and-csit-stub-service/pom.xml b/dmi-stub/dmi-plugin-demo-and-csit-stub-service/pom.xml
index 82ebd24f..b0441151 100644
--- a/dmi-stub/dmi-plugin-demo-and-csit-stub-service/pom.xml
+++ b/dmi-stub/dmi-plugin-demo-and-csit-stub-service/pom.xml
@@ -27,6 +27,7 @@
     </parent>
 
     <artifactId>dmi-plugin-demo-and-csit-stub-service</artifactId>
+    <packaging>jar</packaging>
 
     <properties>
         <gmavenplus.plugin.version>4.0.1</gmavenplus.plugin.version>
diff --git a/pom.xml b/pom.xml
index 7669a92d..feddfa78 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,6 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <packaging>pom</packaging>
     <organization>
         <name>ONAP - CPS</name>
         <url>http://www.onap.org/</url>
@@ -35,18 +34,19 @@
         <module>dmi-service</module>
         <module>dmi-stub</module>
     </modules>
+
     <groupId>org.onap.cps</groupId>
     <artifactId>ncmp-dmi-plugin</artifactId>
     <version>1.6.0-SNAPSHOT</version>
     <name>ncmp-dmi-plugin</name>
     <description>DMI Plugin Service</description>
+    <packaging>pom</packaging>
 
     <properties>
         <!-- Set UTF-8 encoding for consistent builds across platforms -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- Application and Docker Configuration -->
-        <app>org.onap.cps.ncmp.dmi.Application</app>
         <base.image>${docker.pull.registry}/onap/integration-java17:12.0.0</base.image>
         <image.name>ncmp-dmi-plugin</image.name>
         <image.tag>${project.version}-${maven.build.timestamp}</image.tag>
-- 
cgit 1.2.3-korg