From a664e5fe931be1ea1bbd6aac8d2a29cdd05fc52f Mon Sep 17 00:00:00 2001
From: Venkata Harish K Kajur <vk250x@att.com>
Date: Thu, 18 May 2017 12:52:12 -0400
Subject: [PATCH] Update the pom to be able to properly deploy onap

Need to modify the pom to properly deploy jars in onap

Change-Id: I80ca1ccb6a2c9ee409adf269fd1585d13a1e90b0
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>
---
 aai-annotations/pom.xml |  9 ++++++---
 aai-core/pom.xml        | 14 ++++++++------
 aai-schema/pom.xml      | 14 ++++++++------
 pom.xml                 |  8 +++++++-
 readme.md               |  2 +-
 5 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/aai-annotations/pom.xml b/aai-annotations/pom.xml
index ad7fc156..e0c8e1b3 100644
--- a/aai-annotations/pom.xml
+++ b/aai-annotations/pom.xml
@@ -3,15 +3,18 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
 	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.openecomp.aai</groupId>
+  	<parent>
+  	  <groupId>org.openecomp.aai.aai-common</groupId>
+  	  <artifactId>aai-common</artifactId>
+  	  <version>1.1.0-SNAPSHOT</version>
+  	</parent>
 	<artifactId>aai-annotations</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
 	<name>aai-annotations</name>
 	<packaging>jar</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<nexusproxy>https://nexus.onap.org</nexusproxy>
-		<sitePath>/content/sites/site/${project.groupId}/aai-common/${project.artifactId}/${project.version}</sitePath>
+		<sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<maven.compiler.source>1.8</maven.compiler.source>
 	</properties>
diff --git a/aai-core/pom.xml b/aai-core/pom.xml
index d77596fe..1db3837e 100644
--- a/aai-core/pom.xml
+++ b/aai-core/pom.xml
@@ -3,17 +3,19 @@
 		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
 		xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.openecomp.aai</groupId>
+  	<parent>
+  	  <groupId>org.openecomp.aai.aai-common</groupId>
+  	  <artifactId>aai-common</artifactId>
+  	  <version>1.1.0-SNAPSHOT</version>
+  	</parent>
 	<artifactId>aai-core</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
 	<name>aai-core</name>
 	<packaging>jar</packaging>
 	<properties>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<maven.compiler.source>1.8</maven.compiler.source>
-		<aai-schema.version>1.1.0-SNAPSHOT</aai-schema.version>
 		<nexusproxy>https://nexus.onap.org</nexusproxy>
-		<sitePath>/content/sites/site/${project.groupId}/aai-common/${project.artifactId}/${project.version}</sitePath>
+		<sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
 		<sonar.language>java</sonar.language>
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
 		<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
@@ -23,9 +25,9 @@
 	</properties>
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.aai</groupId>
+			<groupId>org.openecomp.aai.aai-common</groupId>
 			<artifactId>aai-schema</artifactId>
-			<version>${aai-schema.version}</version>
+			<version>${aai.schema.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-lang</groupId>
diff --git a/aai-schema/pom.xml b/aai-schema/pom.xml
index 5aa58b0a..78f76fb1 100644
--- a/aai-schema/pom.xml
+++ b/aai-schema/pom.xml
@@ -3,21 +3,23 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
 	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.openecomp.aai</groupId>
+  <parent>
+    <groupId>org.openecomp.aai.aai-common</groupId>
+    <artifactId>aai-common</artifactId>
+    <version>1.1.0-SNAPSHOT</version>
+  </parent>
 	<artifactId>aai-schema</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
 	<name>aai-schema</name>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<aai.annotations.version>1.1.0-SNAPSHOT</aai.annotations.version>
 		<nexusproxy>https://nexus.onap.org</nexusproxy>
-		<sitePath>/content/sites/site/${project.groupId}/aai-common/${project.artifactId}/${project.version}</sitePath>
+		<sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<maven.compiler.source>1.8</maven.compiler.source>
 	</properties>
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.aai</groupId>
+			<groupId>org.openecomp.aai.aai-common</groupId>
 			<artifactId>aai-annotations</artifactId>
 			<version>${aai.annotations.version}</version>
 		</dependency>
@@ -83,7 +85,7 @@
 						<version>1.0.2</version>
 					</dependency>
 					<dependency>
-						<groupId>org.openecomp.aai</groupId>
+						<groupId>org.openecomp.aai.aai-common</groupId>
 						<artifactId>aai-annotations</artifactId>
 						<version>${aai.annotations.version}</version>
 					</dependency>
diff --git a/pom.xml b/pom.xml
index 64cc47b1..773d3fc8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <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">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.openecomp.aai</groupId>
+  <groupId>org.openecomp.aai.aai-common</groupId>
   <artifactId>aai-common</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
@@ -13,8 +13,14 @@
   </modules>
 
 	<properties>
+		<maven.compiler.target>1.8</maven.compiler.target>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<nexusproxy>https://nexus.onap.org</nexusproxy>
 		<sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
+		<aai.annotations.version>1.1.0-SNAPSHOT</aai.annotations.version>
+		<aai.schema.version>1.1.0-SNAPSHOT</aai.schema.version>
+		<aai.core.version>1.1.0-SNAPSHOT</aai.core.version>
 	</properties>
 
   <build>
diff --git a/readme.md b/readme.md
index fa630b6a..b1a44446 100644
--- a/readme.md
+++ b/readme.md
@@ -1,4 +1,4 @@
-# OpenECOMP AAI-Common Repo
+# OpenECOMP AAI-Common
 
 ---
 ---
-- 
2.16.6