From 5c7c489d38a20a274f9eb0e748ec359c7a8338e3 Mon Sep 17 00:00:00 2001
From: Bruno Sakoto <bruno.sakoto@bell.ca>
Date: Mon, 8 Feb 2021 21:51:05 -0500
Subject: [PATCH 1/1] Fix jenkins master merge job

Use port number 10003 to push to docker registry

Issue-ID: CPS-227
Signed-off-by: Bruno Sakoto <bruno.sakoto@bell.ca>
Change-Id: Idf6b448498908f6a3cbd7b235dee8d77a24280de
---
 cps-application/pom.xml | 23 +++++++++++++++++++++--
 cps-parent/pom.xml      | 22 +++++++++++++++++++++-
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/cps-application/pom.xml b/cps-application/pom.xml
index 744efb2d2..92cff35fe 100644
--- a/cps-application/pom.xml
+++ b/cps-application/pom.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  Copyright (c) 2021 Pantheon.tech.
+  Modifications Copyright (C) 2021 Bell Canada.
+  ================================================================================
+  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.
+  ============LICENSE_END=========================================================
+-->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -95,7 +114,7 @@
 
             <properties>
                 <app>org.onap.cps.Application</app>
-                <repository.name>nexus3.onap.org:10001/onap/cps-nf-proxy</repository.name>
+                <repository.name>${docker.pushRegistry}onap/cps-nf-proxy</repository.name>
             </properties>
 
             <dependencies>
@@ -113,7 +132,7 @@
 
             <properties>
                 <app>org.onap.cps.Application</app>
-                <repository.name>nexus3.onap.org:10001/onap/cps-and-nf-proxy</repository.name><!-- better naming? -->
+                <repository.name>${docker.pushRegistry}onap/cps-and-nf-proxy</repository.name><!-- better naming? -->
             </properties>
 
             <dependencies>
diff --git a/cps-parent/pom.xml b/cps-parent/pom.xml
index 36abc909c..00aa89e80 100755
--- a/cps-parent/pom.xml
+++ b/cps-parent/pom.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  Copyright (c) 2021 Pantheon.tech.
+  Modifications Copyright (C) 2021 Bell Canada.
+  ================================================================================
+  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.
+  ============LICENSE_END=========================================================
+-->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -25,7 +44,8 @@
         <oparent.version>3.1.0</oparent.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
-        <repository.name>nexus3.onap.org:10001/onap/cps-service</repository.name>
+        <docker.pushRegistry>nexus3.onap.org:10003/</docker.pushRegistry>
+        <repository.name>${docker.pushRegistry}onap/cps-service</repository.name>
         <spotbugs-maven-plugin.version>4.1.3</spotbugs-maven-plugin.version>
         <spring-boot-maven-plugin.version>2.3.3.RELEASE</spring-boot-maven-plugin.version>
         <spotbugs.slf4j.version>1.8.0-beta4</spotbugs.slf4j.version>
-- 
2.16.6