Merge "Update .gitreview with onap URL"

diff --git a/deliveries/os_docker_push.sh b/deliveries/os_docker_push.sh
index fe422f3..04e245c 100644 (file)
--- a/deliveries/os_docker_push.sh
+++ b/deliveries/os_docker_push.sh
@@ -2,7 +2,7 @@
 
 ./run.sh
 
-REPO="nexus3.openecomp.org:10003"
+REPO="nexus3.onap.org:10003"
 
 TIMESTAMP=$(date +%C%y%m%dT%H%M%S)
 VERSION="1.1.0-SNAPSHOT-${TIMESTAMP}"
@@ -24,4 +24,4 @@ docker tag ecompdb:portal ${DB_LATEST}
 docker push ${APPS_VERSION}
 docker push ${DB_VERSION}
 docker push ${APPS_LATEST}
-docker push ${DB_LATEST}
\ No newline at end of file
+docker push ${DB_LATEST}

diff --git a/deliveries/os_docker_release.sh b/deliveries/os_docker_release.sh
index fc721c2..35ae22b 100644 (file)
--- a/deliveries/os_docker_release.sh
+++ b/deliveries/os_docker_release.sh
@@ -2,7 +2,7 @@
 
 ./run.sh
 
-REPO="nexus3.openecomp.org:10003"
+REPO="nexus3.onap.org:10003"
 
 TIMESTAMP=$(date +%C%y%m%dT%H%M%S)
 VERSION="1.1.0-STAGING-${TIMESTAMP}"
@@ -24,4 +24,4 @@ docker tag ecompdb:portal ${DB_LATEST}
 docker push ${APPS_VERSION}
 docker push ${DB_VERSION}
 docker push ${APPS_LATEST}
-docker push ${DB_LATEST}
\ No newline at end of file
+docker push ${DB_LATEST}

diff --git a/ecomp-portal-BE/pom.xml b/ecomp-portal-BE/pom.xml
index 8b38964..a39d44d 100644 (file)
--- a/ecomp-portal-BE/pom.xml
+++ b/ecomp-portal-BE/pom.xml
@@ -15,6 +15,10 @@
                <!-- Tests usually require some setup that maven cannot do, so skip. -->
                <skiptests>false</skiptests>
                <sonar.exclusions>**.js</sonar.exclusions>
+               <nexusproxy>https://nexus.onap.org</nexusproxy>
+               <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
+               <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
+               <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
        </properties>
        
        <reporting>
@@ -48,19 +52,19 @@
                        <!-- Releases repository has ECOMP release artifacts -->
                        <id>ecomp-releases</id>
                        <name>OpenECOMP - Release Repository</name>
-                       <url>https://nexus.openecomp.org/content/repositories/releases/</url>
+                       <url>${nexusproxy}/${releaseNexusPath}</url>
                </repository>
                <repository>
                        <!-- Snapshots repository has ECOMP snapshot artifacts -->
                        <id>ecomp-snapshots</id>
                        <name>OpenECOMP - Snapshot Repository</name>
-                       <url>https://nexus.openecomp.org/content/repositories/snapshots/</url>
+                       <url>${nexusproxy}/${snapshotNexusPath}</url>
                </repository>
                <repository>
                        <!-- Staging repository has ECOMP staging artifacts -->
                        <id>ecomp-staging</id>
                        <name>OpenECOMP - Staging Repository</name>
-                       <url>https://nexus.openecomp.org/content/repositories/staging/</url>
+                       <url>${nexusproxy}/${stagingNexusPath}</url>
                </repository>
                <repository>
                        <!-- Snapshots repository has ECOMP snapshot artifacts -->

diff --git a/pom.xml b/pom.xml
index 6bba9e4..255d29d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -17,6 +17,14 @@
                <module>ecomp-portal-FE</module>
                <module>ecomp-portal-BE</module>
        </modules>
+
+       <properties>
+               <nexusproxy>https://nexus.onap.org</nexusproxy>
+               <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
+               <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
+               <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
+       </properties>
+
        <build>
                <plugins>
                        <plugin>
@@ -25,7 +33,7 @@
                                <version>1.6.7</version>
                                <extensions>true</extensions>
                                <configuration>
-                                       <nexusUrl>https://nexus.openecomp.org/</nexusUrl>
+                                       <nexusUrl>${nexusproxy}</nexusUrl>
                                        <stagingProfileId>176c31dfe190a</stagingProfileId>
                                        <serverId>ecomp-staging</serverId>
                                </configuration>
@@ -40,12 +48,12 @@
                <repository>
                        <id>ecomp-releases</id>
                        <name>OpenECOMP - Release Repository</name>
-                       <url>https://nexus.openecomp.org/content/repositories/releases/</url>
+                       <url>${nexusproxy}/${releaseNexusPath}</url>
                </repository>
                <snapshotRepository>
                        <id>ecomp-snapshots</id>
                        <name>OpenECOMP - Snapshot Repository</name>
-                       <url>https://nexus.openecomp.org/content/repositories/snapshots/</url>
+                       <url>${nexusproxy}/${snapshotNexusPath}</url>
                </snapshotRepository>
        </distributionManagement>
 </project>