From: sourabh_sourabh <sourabh.sourabh@est.tech>
Date: Wed, 13 Nov 2024 13:42:42 +0000 (+0000)
Subject: Fix for cps-master-merge-java job after removing oParent
X-Git-Tag: 3.5.5~30
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=00da0afbadf37d80b8e17a60880ec5f8d1756b74;p=cps.git

Fix for cps-master-merge-java job after removing oParent

- Added ecom repo. configuration into cps-aggregator
- Explicitly set onap.nexus.url

Issue-ID: CPS-2496
Change-Id: I010f97ea438bfbaa9cde81ef1a5cc9839b0d1121
Signed-off-by: sourabh_sourabh <sourabh.sourabh@est.tech>
---

diff --git a/checkstyle/pom.xml b/checkstyle/pom.xml
index 80ff13b08e..ca5068f0da 100644
--- a/checkstyle/pom.xml
+++ b/checkstyle/pom.xml
@@ -54,7 +54,7 @@
     </profiles>
 
     <properties>
-        <nexusproxy>https://nexus.onap.org</nexusproxy>
+        <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
         <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
         <sonar.skip>true</sonar.skip>
         <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
@@ -106,12 +106,12 @@
         <repository>
             <id>ecomp-releases</id>
             <name>ECOMP Release Repository</name>
-            <url>${nexusproxy}${releaseNexusPath}</url>
+            <url>${onap.nexus.url}${releaseNexusPath}</url>
         </repository>
         <snapshotRepository>
             <id>ecomp-snapshots</id>
             <name>ECOMP Snapshot Repository</name>
-            <url>${nexusproxy}${snapshotNexusPath}</url>
+            <url>${onap.nexus.url}${snapshotNexusPath}</url>
         </snapshotRepository>
     </distributionManagement>
 </project>
\ No newline at end of file
diff --git a/cps-bom/pom.xml b/cps-bom/pom.xml
index e02b2afcce..57de09b6f2 100644
--- a/cps-bom/pom.xml
+++ b/cps-bom/pom.xml
@@ -31,7 +31,7 @@
     <description>This artifact contains dependencyManagement declarations of all published CPS components.</description>
 
     <properties>
-        <nexusproxy>https://nexus.onap.org</nexusproxy>
+        <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
         <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
         <sonar.skip>true</sonar.skip>
         <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
@@ -53,12 +53,12 @@
         <repository>
             <id>ecomp-releases</id>
             <name>ECOMP Release Repository</name>
-            <url>${nexusproxy}${releaseNexusPath}</url>
+            <url>${onap.nexus.url}${releaseNexusPath}</url>
         </repository>
         <snapshotRepository>
             <id>ecomp-snapshots</id>
             <name>ECOMP Snapshot Repository</name>
-            <url>${nexusproxy}${snapshotNexusPath}</url>
+            <url>${onap.nexus.url}${snapshotNexusPath}</url>
         </snapshotRepository>
     </distributionManagement>
 
diff --git a/cps-dependencies/pom.xml b/cps-dependencies/pom.xml
index 92e5ec9017..ad1828ec5c 100644
--- a/cps-dependencies/pom.xml
+++ b/cps-dependencies/pom.xml
@@ -35,7 +35,7 @@
 
     <properties>
         <groovy.version>3.0.18</groovy.version>
-        <nexusproxy>https://nexus.onap.org</nexusproxy>
+        <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
         <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
         <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
         <sonar.skip>true</sonar.skip>
@@ -61,12 +61,12 @@
         <repository>
             <id>ecomp-releases</id>
             <name>ECOMP Release Repository</name>
-            <url>${nexusproxy}${releaseNexusPath}</url>
+            <url>${onap.nexus.url}${releaseNexusPath}</url>
         </repository>
         <snapshotRepository>
             <id>ecomp-snapshots</id>
             <name>ECOMP Snapshot Repository</name>
-            <url>${nexusproxy}${snapshotNexusPath}</url>
+            <url>${onap.nexus.url}${snapshotNexusPath}</url>
         </snapshotRepository>
     </distributionManagement>
 
diff --git a/cps-parent/pom.xml b/cps-parent/pom.xml
index ea59fe4d40..12103ed108 100644
--- a/cps-parent/pom.xml
+++ b/cps-parent/pom.xml
@@ -71,16 +71,23 @@
         <sonar.coverage.jacoco.xmlReportPaths>
             ../jacoco-report/target/site/jacoco-aggregate/jacoco.xml
         </sonar.coverage.jacoco.xmlReportPaths>
+
+        <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
+        <nexusproxy>https://nexus.onap.org</nexusproxy>
+        <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
+        <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
     </properties>
 
     <distributionManagement>
         <repository>
             <id>ecomp-releases</id>
-            <url>${onap.nexus.url}/content/repositories/releases</url>
+            <name>ECOMP Release Repository</name>
+            <url>${onap.nexus.url}${releaseNexusPath}</url>
         </repository>
         <snapshotRepository>
             <id>ecomp-snapshots</id>
-            <url>${onap.nexus.url}/content/repositories/snapshots</url>
+            <name>ECOMP Snapshot Repository</name>
+            <url>${onap.nexus.url}${snapshotNexusPath}</url>
         </snapshotRepository>
     </distributionManagement>
 
diff --git a/pom.xml b/pom.xml
index 27a9a216ae..f95573edc1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,6 +41,10 @@
     <properties>
         <maven.deploy.skip>false</maven.deploy.skip>
         <maven.install.skip>false</maven.install.skip>
+        <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
+        <nexusproxy>https://nexus.onap.org</nexusproxy>
+        <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
+        <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
     </properties>
 
     <modules>
@@ -64,6 +68,19 @@
         <module>policy-executor-stub</module>
     </modules>
 
+    <distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <name>ECOMP Release Repository</name>
+            <url>${onap.nexus.url}${releaseNexusPath}</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <name>ECOMP Snapshot Repository</name>
+            <url>${onap.nexus.url}${snapshotNexusPath}</url>
+        </snapshotRepository>
+    </distributionManagement>
+
     <build>
         <plugins>
             <plugin>
diff --git a/spotbugs/pom.xml b/spotbugs/pom.xml
index c05e946bf5..f2b4175f58 100644
--- a/spotbugs/pom.xml
+++ b/spotbugs/pom.xml
@@ -28,7 +28,7 @@
     <version>3.5.5-SNAPSHOT</version>
 
     <properties>
-        <nexusproxy>https://nexus.onap.org</nexusproxy>
+        <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
         <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
         <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
     </properties>
@@ -49,12 +49,12 @@
         <repository>
             <id>ecomp-releases</id>
             <name>ECOMP Release Repository</name>
-            <url>${nexusproxy}${releaseNexusPath}</url>
+            <url>${onap.nexus.url}${releaseNexusPath}</url>
         </repository>
         <snapshotRepository>
             <id>ecomp-snapshots</id>
             <name>ECOMP Snapshot Repository</name>
-            <url>${nexusproxy}${snapshotNexusPath}</url>
+            <url>${onap.nexus.url}${snapshotNexusPath}</url>
         </snapshotRepository>
     </distributionManagement>
 </project>
\ No newline at end of file