From: dfilppi <dewayne@cloudify.co>
Date: Fri, 9 Mar 2018 20:34:30 +0000 (+0000)
Subject: Pom parents fixed in aria build.
X-Git-Tag: v1.2.1~470^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F99%2F34999%2F1;p=so.git

Pom parents fixed in aria build.

Change-Id: Idaf76197b8542dcebb5b242204d076c55892228c
Issue-ID: SO-448
Signed-off-by: DeWayne Filppi <dewayne@cloudify.co>
---

diff --git a/aria/aria-rest-java-client/pom.xml b/aria/aria-rest-java-client/pom.xml
index f35403cf81..0af9923401 100755
--- a/aria/aria-rest-java-client/pom.xml
+++ b/aria/aria-rest-java-client/pom.xml
@@ -25,7 +25,14 @@
 
     <groupId>aria-client</groupId>
     <artifactId>aria-client</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
+
+    <parent>
+        <groupId>org.onap.so</groupId>
+	<artifactId>aria</artifactId>
+	<version>1.2.0-SNAPSHOT</version>
+	<relativePath>../pom.xml</relativePath>
+    </parent>
 
     <dependencies>
         <dependency>
diff --git a/aria/pom.xml b/aria/pom.xml
index 5f3f2070f6..95ef93b6c8 100644
--- a/aria/pom.xml
+++ b/aria/pom.xml
@@ -5,9 +5,12 @@
 		<groupId>org.onap.so</groupId>
 		<artifactId>so</artifactId>
 		<version>1.2.0-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<artifactId>aria</artifactId>
+	<version>1.2.0-SNAPSHOT</version>
+
 	<name>ARIA related artifacts</name>
 	<description>ARIA related artifacts</description>
 	<packaging>pom</packaging>
diff --git a/pom.xml b/pom.xml
index 33c4abca86..a1f9ca7ede 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
     <module>status-control</module>
     <module>bpmn</module>
     <module>packages</module>
-    <!--module>aria</module-->
+    <module>aria</module>
   </modules>
   <properties>
     <project.mso.base.folder>.</project.mso.base.folder>