From 6c877ba9d5e1dfde569593ed88652b93b10ba4a6 Mon Sep 17 00:00:00 2001
From: sourabh_sourabh <sourabh.sourabh@est.tech>
Date: Wed, 13 Nov 2024 16:48:46 +0000
Subject: Fix for cps-ncmp-dmi-plugin-maven-merge-master job

Issue-ID: CPS-2496
Change-Id: I66f3a215188eed6dd7c83a52ce831d97f9c0db46
Signed-off-by: sourabh_sourabh <sourabh.sourabh@est.tech>
---
 .gitignore                                         |  1 +
 dmi-service/pom.xml                                | 68 +-------------------
 dmi-stub/dmi-plugin-demo-and-csit-stub-app/pom.xml | 72 ----------------------
 .../dmi-plugin-demo-and-csit-stub-service/pom.xml  |  5 +-
 pom.xml                                            | 65 +++++++++++++++++++
 5 files changed, 70 insertions(+), 141 deletions(-)

diff --git a/.gitignore b/.gitignore
index c8f6e40b..a6e8081e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 *.war
 *.log
 *.log.zip
+*.*~
 
 target/
 log/
diff --git a/dmi-service/pom.xml b/dmi-service/pom.xml
index fccdfaad..306d6118 100644
--- a/dmi-service/pom.xml
+++ b/dmi-service/pom.xml
@@ -29,13 +29,9 @@
     <artifactId>dmi-service</artifactId>
 
     <properties>
-        <app>org.onap.cps.ncmp.dmi.Application</app>
-        <base.image>${docker.pull.registry}/onap/integration-java17:12.0.0</base.image>
-        <image.tag>${project.version}-${maven.build.timestamp}</image.tag>
         <jacoco.minimum.coverage>0.98</jacoco.minimum.coverage>
-        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
+
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -413,6 +409,7 @@
             <plugin>
                 <groupId>org.codehaus.gmavenplus</groupId>
                 <artifactId>gmavenplus-plugin</artifactId>
+                <version>4.0.1</version>
                 <executions>
                     <execution>
                         <goals>
@@ -533,66 +530,5 @@
                 </executions>
             </plugin>
         </plugins>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>com.google.cloud.tools</groupId>
-                    <artifactId>jib-maven-plugin</artifactId>
-                    <version>3.3.2</version>
-                    <configuration>
-                        <container>
-                            <mainClass>${app}</mainClass>
-                            <creationTime>USE_CURRENT_TIMESTAMP</creationTime>
-                        </container>
-                        <from>
-                            <image>${base.image}</image>
-                        </from>
-                        <to>
-                            <tags>
-                                <tag>latest</tag>
-                                <tag>${project.version}-latest</tag>
-                            </tags>
-                            <image>${docker.push.registry}/onap/${image.name}:${image.tag}</image>
-                        </to>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <phase>package</phase>
-                            <id>build</id>
-                            <goals>
-                                <goal>dockerBuild</goal>
-                            </goals>
-                        </execution>
-                        <execution>
-                            <phase>deploy</phase>
-                            <id>buildAndPush</id>
-                            <goals>
-                                <goal>build</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
     </build>
-    <profiles>
-        <profile>
-            <id>docker</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <image.name>ncmp-dmi-plugin</image.name>
-            </properties>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>com.google.cloud.tools</groupId>
-                        <artifactId>jib-maven-plugin</artifactId>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
 </project>
\ No newline at end of file
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 3d7ccf6b..4da597ba 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,76 +27,6 @@
 
     <artifactId>dmi-plugin-demo-and-csit-stub-app</artifactId>
 
-    <properties>
-        <app>org.onap.cps.ncmp.dmi.rest.stub.DmiDemoApplication</app>
-        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
-        <base.image>${docker.pull.registry}/onap/integration-java17:12.0.0</base.image>
-        <image.tag>${project.version}-${maven.build.timestamp}</image.tag>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>com.google.cloud.tools</groupId>
-                    <artifactId>jib-maven-plugin</artifactId>
-                    <configuration>
-                        <container>
-                            <mainClass>${app}</mainClass>
-                            <creationTime>USE_CURRENT_TIMESTAMP</creationTime>
-                        </container>
-                        <from>
-                            <image>${base.image}</image>
-                        </from>
-                        <to>
-                            <tags>
-                                <tag>latest</tag>
-                            </tags>
-                            <image>${docker.push.registry}/onap/${image.name}:${image.tag}</image>
-                        </to>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <phase>package</phase>
-                            <id>build</id>
-                            <goals>
-                                <goal>dockerBuild</goal>
-                            </goals>
-                        </execution>
-                        <execution>
-                            <phase>deploy</phase>
-                            <id>buildAndPush</id>
-                            <goals>
-                                <goal>build</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>docker</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <image.name>dmi-plugin-demo-and-csit-stub</image.name>
-            </properties>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>com.google.cloud.tools</groupId>
-                        <artifactId>jib-maven-plugin</artifactId>
-                        <version>3.3.2</version>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -127,7 +57,5 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
-
     </dependencies>
 </project>
\ No newline at end of file
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 3bb8324b..5e2886e5 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
@@ -24,9 +24,8 @@
         <artifactId>dmi-plugin-demo-and-csit-stub</artifactId>
         <version>1.6.0-SNAPSHOT</version>
     </parent>
-    <artifactId>dmi-plugin-demo-and-csit-stub-service</artifactId>
-
 
+    <artifactId>dmi-plugin-demo-and-csit-stub-service</artifactId>
 
     <dependencies>
         <dependency>
@@ -136,6 +135,7 @@
             <plugin>
                 <groupId>org.codehaus.gmavenplus</groupId>
                 <artifactId>gmavenplus-plugin</artifactId>
+                <version>4.0.1</version>
                 <executions>
                     <execution>
                         <goals>
@@ -160,5 +160,4 @@
         </plugins>
     </build>
 
-
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index f8d34c52..e89e1f8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,6 +47,12 @@
 
     <properties>
         <cps.version>3.5.2</cps.version>
+        <app>org.onap.cps.ncmp.dmi.Application</app>
+        <base.image>${docker.pull.registry}/onap/integration-java17:12.0.0</base.image>
+        <image.tag>${project.version}-${maven.build.timestamp}</image.tag>
+        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <image.name>ncmp-dmi-plugin</image.name>
     </properties>
 
     <build>
@@ -123,6 +129,65 @@
                 </dependencies>
             </plugin>
         </plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>com.google.cloud.tools</groupId>
+                    <artifactId>jib-maven-plugin</artifactId>
+                    <version>3.3.2</version>
+                    <configuration>
+                        <container>
+                            <mainClass>${app}</mainClass>
+                            <creationTime>USE_CURRENT_TIMESTAMP</creationTime>
+                        </container>
+                        <from>
+                            <image>${base.image}</image>
+                        </from>
+                        <to>
+                            <tags>
+                                <tag>latest</tag>
+                                <tag>${project.version}-latest</tag>
+                            </tags>
+                            <image>${docker.push.registry}/onap/${image.name}:${image.tag}</image>
+                        </to>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <phase>package</phase>
+                            <id>build</id>
+                            <goals>
+                                <goal>dockerBuild</goal>
+                            </goals>
+                        </execution>
+                        <execution>
+                            <phase>deploy</phase>
+                            <id>buildAndPush</id>
+                            <goals>
+                                <goal>build</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
     </build>
 
+    <profiles>
+        <profile>
+            <id>docker</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>com.google.cloud.tools</groupId>
+                        <artifactId>jib-maven-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+    </profiles>
+
 </project>
-- 
cgit 1.2.3-korg