Fix the parent pom tree strcuture

Change-Id: I370cc9962757a4f95af1d982c21eb41455136566
Jira:VNFSDK-34
Signed-off-by: Murali <murali.p@huawei.com>

diff --git a/pom.xml b/pom.xml
index 967b0ae..643906e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,8 @@
     <parent>
       <groupId>org.onap.oparent</groupId>
       <artifactId>oparent</artifactId>
-      <version>1.0.0-SNAPSHOT</version>     
+      <version>1.0.0-SNAPSHOT</version>
+      <relativePath>../oparent</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/vnfmarket-be/deployment/docker/pom.xml b/vnfmarket-be/deployment/docker/pom.xml
index cd31052..0caf55d 100644 (file)
--- a/vnfmarket-be/deployment/docker/pom.xml
+++ b/vnfmarket-be/deployment/docker/pom.xml
@@ -24,6 +24,7 @@
         <groupId>org.onap.vnfsdk.refrepo</groupId>
         <artifactId>vnf-sdk-marketplace-core-parent</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>vnfmarket-docker</artifactId>
@@ -31,7 +32,7 @@
     <packaging>pom</packaging>
 
   <properties>
-        <docker.image.name>onap/vnfmarket</docker.image.name>
+        <docker.image.name>onap/refrepo</docker.image.name>
         <maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
         <docker.push.registry></docker.push.registry>
         <skip.docker.build>true</skip.docker.build>

diff --git a/vnfmarket-be/deployment/zip/pom.xml b/vnfmarket-be/deployment/zip/pom.xml
index a36beba..bddd57c 100644 (file)
--- a/vnfmarket-be/deployment/zip/pom.xml
+++ b/vnfmarket-be/deployment/zip/pom.xml
@@ -20,6 +20,7 @@
         <groupId>org.onap.vnfsdk.refrepo</groupId>
         <artifactId>vnf-sdk-marketplace-core-parent</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>vnf-sdk-marketplace-deployment</artifactId>

diff --git a/vnfmarket-be/pom.xml b/vnfmarket-be/pom.xml
index 8cc4786..c3ce482 100644 (file)
--- a/vnfmarket-be/pom.xml
+++ b/vnfmarket-be/pom.xml
@@ -15,11 +15,12 @@
   limitations under the License.
 -->
 <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">
-   <parent>
-      <groupId>org.onap.oparent</groupId>
-      <artifactId>oparent</artifactId>
-      <version>1.0.0-SNAPSHOT</version>    
+    <parent>
+        <groupId>org.onap.vnfsdk.refrepo</groupId>
+        <artifactId>vnfmarket</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
+
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.vnfsdk.refrepo</groupId>
     <artifactId>vnf-sdk-marketplace-core-parent</artifactId>