Replaced nexusproxy property with onap.nexus.url

Also removed redefined redefined nexusproxy and distribution Management from poms
Update ReadMe accordingly

Issue-ID: CPS-435

Change-Id: I02831e737587a1a16e9743773f2840c209d1fffd
Signed-off-by: mkerrigan <michael.kerrigan@est.tech>
Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>

diff --git a/cps-application/pom.xml b/cps-application/pom.xml
index 8c79666..2ae4883 100755 (executable)
--- a/cps-application/pom.xml
+++ b/cps-application/pom.xml
@@ -38,7 +38,7 @@
         <jib-maven-plugin.version>2.8.0</jib-maven-plugin.version>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
         <minimum-coverage>0.7</minimum-coverage>
-        <base.image>${docker.repository.pull}onap/integration-java11:8.0.0</base.image>
+        <base.image>${docker.pull.registry}/onap/integration-java11:8.0.0</base.image>
         <image.tag>${project.version}-${maven.build.timestamp}</image.tag>
     </properties>
 
@@ -127,7 +127,7 @@
                             <tags>
                                 <tag>latest</tag>
                             </tags>
-                            <image>${docker.repository.push}onap/${image.name}:${image.tag}</image>
+                            <image>${docker.push.registry}/onap/${image.name}:${image.tag}</image>
                         </to>
                     </configuration>
                     <executions>

diff --git a/cps-parent/pom.xml b/cps-parent/pom.xml
index 78a89f0..a341ea9 100755 (executable)
--- a/cps-parent/pom.xml
+++ b/cps-parent/pom.xml
@@ -37,16 +37,10 @@
 
     <properties>
         <app>org.onap.cps.Application</app>
-        <docker.repository.push>nexus3.onap.org:10003/</docker.repository.push>
-        <docker.repository.pull>nexus3.onap.org:10001/</docker.repository.pull>
         <java.version>11</java.version>
         <jsonschema2pojo-maven-plugin.version>1.1.1</jsonschema2pojo-maven-plugin.version>
         <minimum-coverage>0.9</minimum-coverage>
-        <nexusproxy>https://nexus.onap.org</nexusproxy>
         <oparent.version>3.1.0</oparent.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
-        <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
         <spotbugs-maven-plugin.version>4.1.3</spotbugs-maven-plugin.version>
         <spotbugs.slf4j.version>1.8.0-beta4</spotbugs.slf4j.version>
         <spotbugs.bug-pattern.version>1.5.0</spotbugs.bug-pattern.version>
@@ -73,19 +67,6 @@
         </sonar.coverage.jacoco.xmlReportPaths>
     </properties>
 
-    <distributionManagement>
-        <repository>
-            <id>ecomp-releases</id>
-            <name>ECOMP Release Repository</name>
-            <url>${nexusproxy}${releaseNexusPath}</url>
-        </repository>
-        <snapshotRepository>
-            <id>ecomp-snapshots</id>
-            <name>ECOMP Snapshot Repository</name>
-            <url>${nexusproxy}${snapshotNexusPath}</url>
-        </snapshotRepository>
-    </distributionManagement>
-
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -346,7 +327,7 @@
                             see https://www.testcontainers.org/features/configuration/#disabling-ryuk
                          -->
                         <TESTCONTAINERS_RYUK_DISABLED>true</TESTCONTAINERS_RYUK_DISABLED>
-                        <TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX>${docker.repository.pull}library/</TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX>
+                        <TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX>${docker.pull.registry}/library/</TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX>
                     </environmentVariables>
                 </configuration>
             </plugin>

diff --git a/docker-compose/README.md b/docker-compose/README.md
index 6fa2229..c172276 100644 (file)
--- a/docker-compose/README.md
+++ b/docker-compose/README.md
@@ -1,9 +1,30 @@
+<!--
+  ============LICENSE_START=======================================================
+   Copyright (C) 2020 Pantheon.tech
+   Modifications (C) 2020-2021 Nordix Foundation.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+  SPDX-License-Identifier: Apache-2.0
+  ============LICENSE_END=========================================================
+-->
+
 # Building and running CPS locally
 
 ## Building Java Archive only
 
 Following command builds all Java components to `cps-application/target/cps-application-x.y.z-SNAPSHOT.jar` JAR file
-without generating any docker images:  
+without generating any docker images:
 
 ```bash
 mvn clean install -Pcps-docker -Pncmp-docker -Pcps-ncmp-docker -Djib.skip
@@ -14,14 +35,14 @@ mvn clean install -Pcps-docker -Pncmp-docker -Pcps-ncmp-docker -Djib.skip
 * Following command builds the JAR file and also generates the Docker image for all CPS components:
 
 ```bash
-mvn clean install -Pcps-docker -Pncmp-docker -Pcps-ncmp-docker -Ddocker.repository.push=
+mvn clean install -Pcps-docker -Pncmp-docker -Pcps-ncmp-docker
 ```
 
 * Following command builds the JAR file and generates the Docker image for specified CPS component:
   (with `<docker-profile>` being one of `cps-docker`, `ncmp-docker` or `cps-ncmp-docker`):
 
 ```bash
-mvn clean install -P<docker-profile> -Ddocker.repository.push=
+mvn clean install -P<docker-profile>
 ```
 
 ## Running Docker containers

diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index f01d12d..6267834 100755 (executable)
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -36,7 +36,7 @@ services:
 
   #ncmp-standalone:
   #  container_name: cps-ncmp
-  #  image: onap/cps-ncmp:${VERSION:-latest}
+  #  image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/cps-and-ncmp:${VERSION:-latest}
   #  ports:
   #    - "8882:8080"
   #  environment:
@@ -51,7 +51,7 @@ services:
 
   cps-and-ncmp:
     container_name: cps-and-ncmp
-    image: onap/cps-and-ncmp:${VERSION:-latest}
+    image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/cps-and-ncmp:${VERSION:-latest}
     ports:
       - "8883:8080"
     environment: