From 1bb3639f4ad0395fd941fc072154838f62bb8193 Mon Sep 17 00:00:00 2001
From: sourabh_sourabh <sourabh.sourabh@est.tech>
Date: Wed, 13 Nov 2024 12:54:17 +0000
Subject: [PATCH] Fix for cps-master-merge-java job after removing oParent

Issue-ID: CPS-2496
Change-Id: I94eef4006b8c96db2c9d350c3330edf98924099c
Signed-off-by: sourabh_sourabh <sourabh.sourabh@est.tech>
---
 .gitignore               |  1 +
 checkstyle/pom.xml       |  2 +-
 cps-bom/pom.xml          |  2 +-
 cps-dependencies/pom.xml |  2 +-
 cps-ncmp-rest/pom.xml    |  2 +-
 cps-parent/pom.xml       | 19 ++++++++++++++++++-
 cps-rest/pom.xml         |  5 +++++
 spotbugs/pom.xml         |  2 +-
 8 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5f77b3b0a6..a721cb4489 100755
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 *.war
 *.log
 *.log.zip
+*.*~
 
 cps-ncmp-rest-stub/dependency-reduced-pom.xml
 cps-application/archunit_store
diff --git a/checkstyle/pom.xml b/checkstyle/pom.xml
index 893af40162..80ff13b08e 100644
--- a/checkstyle/pom.xml
+++ b/checkstyle/pom.xml
@@ -66,7 +66,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-deploy-plugin</artifactId>
-                    <version>2.8.2</version>
+                    <version>3.1.2</version>
                 </plugin>
             </plugins>
         </pluginManagement>
diff --git a/cps-bom/pom.xml b/cps-bom/pom.xml
index 6521830f2a..e02b2afcce 100644
--- a/cps-bom/pom.xml
+++ b/cps-bom/pom.xml
@@ -43,7 +43,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-deploy-plugin</artifactId>
-                    <version>2.8.2</version>
+                    <version>3.1.2</version>
                 </plugin>
             </plugins>
         </pluginManagement>
diff --git a/cps-dependencies/pom.xml b/cps-dependencies/pom.xml
index a95e5f42b0..92e5ec9017 100644
--- a/cps-dependencies/pom.xml
+++ b/cps-dependencies/pom.xml
@@ -51,7 +51,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-deploy-plugin</artifactId>
-                    <version>2.8.2</version>
+                    <version>3.1.2</version>
                 </plugin>
             </plugins>
         </pluginManagement>
diff --git a/cps-ncmp-rest/pom.xml b/cps-ncmp-rest/pom.xml
index 681d1e52b4..a7b2b76cef 100644
--- a/cps-ncmp-rest/pom.xml
+++ b/cps-ncmp-rest/pom.xml
@@ -35,7 +35,7 @@
 
     <properties>
         <minimum-coverage>0.99</minimum-coverage>
-        <maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
+        <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
     </properties>
 
     <dependencies>
diff --git a/cps-parent/pom.xml b/cps-parent/pom.xml
index 6c4d1a3d62..ea59fe4d40 100644
--- a/cps-parent/pom.xml
+++ b/cps-parent/pom.xml
@@ -33,7 +33,7 @@
     <properties>
         <!-- Set UTF-8 encoding for consistent builds across platforms -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <!-- Application Configuration -->
         <app>org.onap.cps.Application</app>
 
@@ -73,6 +73,17 @@
         </sonar.coverage.jacoco.xmlReportPaths>
     </properties>
 
+    <distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <url>${onap.nexus.url}/content/repositories/releases</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <url>${onap.nexus.url}/content/repositories/snapshots</url>
+        </snapshotRepository>
+    </distributionManagement>
+
     <!-- Dependency Management, Profiles, Build, and Plugins -->
 
     <dependencyManagement>
@@ -476,6 +487,7 @@
                             <goal>report</goal>
                         </goals>
                         <configuration>
+                            <outputEncoding>${project.reporting.outputEncoding}</outputEncoding>
                             <!-- Sets the path to the file which contains the execution data. -->
                             <dataFile>${jacoco.execFile}</dataFile>
                             <!-- Sets the output directory for the code coverage report. -->
@@ -505,6 +517,11 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>3.1.2</version>
+            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/cps-rest/pom.xml b/cps-rest/pom.xml
index 71395c2f0d..f270a58f06 100644
--- a/cps-rest/pom.xml
+++ b/cps-rest/pom.xml
@@ -31,6 +31,10 @@
         <relativePath>../cps-parent/pom.xml</relativePath>
     </parent>
 
+    <properties>
+        <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
+    </properties>
+
     <artifactId>cps-rest</artifactId>
 
     <dependencies>
@@ -177,6 +181,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
+                <version>${maven-resources-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>copy-resources</id>
diff --git a/spotbugs/pom.xml b/spotbugs/pom.xml
index 293612e46b..c05e946bf5 100644
--- a/spotbugs/pom.xml
+++ b/spotbugs/pom.xml
@@ -39,7 +39,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-deploy-plugin</artifactId>
-                    <version>2.8.2</version>
+                    <version>3.1.2</version>
                 </plugin>
             </plugins>
         </pluginManagement>
-- 
2.16.6