From: liboNet <libo.zhu@intel.com>
Date: Wed, 3 Apr 2019 07:50:50 +0000 (+0800)
Subject: Fix the artifact parent issue
X-Git-Tag: 1.3.0~12
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=multicloud%2Fframework.git;a=commitdiff_plain;h=de2f1e42e37b975454af53aeb81a2ae2e7627e99

Fix the artifact parent issue

. the parent should point to org.onap.oparent:oparent:1.2.0
. the groupId for both should be set to org.onap.multicloud.framework

Change-Id: I5e821c8382b8f2297276a0ca508093fccd4c9620
Issue-ID: MULTICLOUD-514
Signed-off-by: liboNet <libo.zhu@intel.com>
---

diff --git a/artifactbroker/pom.xml b/artifactbroker/pom.xml
index 11d3903..1e0a1f7 100644
--- a/artifactbroker/pom.xml
+++ b/artifactbroker/pom.xml
@@ -15,12 +15,13 @@
 
 <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.multicloud.framework</groupId>
-        <artifactId>multicloud-framework</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
-        <relativePath />
+        <groupId>org.onap.oparent</groupId>
+        <artifactId>oparent</artifactId>
+        <version>1.2.0</version>
+        <relativePath>../oparent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
+    <groupId>org.onap.multicloud.framework</groupId>
     <artifactId>multicloud-framework-artifactbroker</artifactId>
     <version>1.3.0-SNAPSHOT</version>
     <packaging>pom</packaging>
diff --git a/multivimbroker/pom.xml b/multivimbroker/pom.xml
index 3f88a70..cd8fc00 100644
--- a/multivimbroker/pom.xml
+++ b/multivimbroker/pom.xml
@@ -16,12 +16,13 @@
     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.multicloud.framework</groupId>
-        <artifactId>multicloud-framework</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
+        <groupId>org.onap.oparent</groupId>
+        <artifactId>oparent</artifactId>
+        <version>1.2.0</version>
+        <relativePath>../oparent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.onap.multicloud.framework.broker</groupId>
+    <groupId>org.onap.multicloud.framework</groupId>
     <artifactId>multicloud-framework-broker</artifactId>
     <version>1.3.0-SNAPSHOT</version>
     <packaging>pom</packaging>