From: jimmy <jf2512@att.com>
Date: Fri, 28 Feb 2020 14:49:57 +0000 (-0500)
Subject: Allow projects that use parent to specify
X-Git-Tag: 1.6.10~6
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=b28dc297d5113d546fd4813d3124b3ee9a257383;p=aai%2Faai-common.git

Allow projects that use parent to specify

specific version of aai-common artifacts

Issue-ID: AAI-2811
Signed-off-by: jimmy <jf2512@att.com>
Change-Id: I38ab2dd0d4b1ce346c7e4acc815dedfb366c9838
---

diff --git a/aai-parent/pom.xml b/aai-parent/pom.xml
index bdc42563..fbc013fc 100644
--- a/aai-parent/pom.xml
+++ b/aai-parent/pom.xml
@@ -39,7 +39,7 @@ limitations under the License.
 
 	<properties>
 		<!-- update this just prior to release or figure out something with version.properties -->
-		<aai.release.version>${project.version}</aai.release.version>
+		<aai.release.version>${aai.common.version}</aai.release.version>
 		<aai.common.logging.version>1.5.1</aai.common.logging.version>
 		<aai.rest.client.version>1.5.1</aai.rest.client.version>
 		<aai.schema.service.version>1.6.0</aai.schema.service.version>
diff --git a/pom.xml b/pom.xml
index de2dd906..9b9a7b7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,6 +58,7 @@
     </profiles>
 
     <properties>
+        <aai.common.version>${project.version}</aai.common.version>
         <aai.generate.schema>true</aai.generate.schema>
         <sitePath>/content/sites/site/org/onap/aai/aai-common/${project.artifactId}/${project.version}</sitePath>
         <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>