summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToine Siebelink <toine.siebelink@est.tech>2021-02-09 09:02:16 +0000
committerGerrit Code Review <gerrit@onap.org>2021-02-09 09:02:16 +0000
commite5cf0fcacb7239cdd4a041769007715e1b8ffd9b (patch)
treef8c7260584ebdde540e05e1b28123ea3bd41acc5
parentd6a62cdfb1717318234cee63bc7c7297eac68007 (diff)
parent5c7c489d38a20a274f9eb0e748ec359c7a8338e3 (diff)
Merge "Fix jenkins master merge job"
-rw-r--r--cps-application/pom.xml23
-rwxr-xr-xcps-parent/pom.xml22
2 files changed, 42 insertions, 3 deletions
diff --git a/cps-application/pom.xml b/cps-application/pom.xml
index 744efb2d2f..92cff35fec 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 36abc909cc..00aa89e80e 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>