From: Jimmy Forsyth <jf2512@att.com>
Date: Wed, 10 Jul 2019 15:35:35 +0000 (-0400)
Subject: Adjust parent pom on sds
X-Git-Tag: 1.5.0~1
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fsearch-data-service.git;a=commitdiff_plain;h=03c2309a310bd4d959f476736bd00c8422af4954

Adjust parent pom on sds

Issue-ID: AAI-2496
Change-Id: I82ec8dcee0c92c92d92069c8dd05d0e0a4c8e46c
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
---

diff --git a/elasticsearch-sg/pom.xml b/elasticsearch-sg/pom.xml
index 6bbed7e..ae92121 100644
--- a/elasticsearch-sg/pom.xml
+++ b/elasticsearch-sg/pom.xml
@@ -24,6 +24,13 @@
 	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>
 
+	<parent>
+		<artifactId>search-data-service</artifactId>
+		<groupId>org.onap.aai</groupId>
+		<version>1.5.0-SNAPSHOT</version>
+	</parent>
+
+
 	<groupId>org.onap.aai.search-data-service</groupId>
 	<artifactId>elasticsearch-sg</artifactId>
 	<name>ElasticSearch with SearchGuard</name>
diff --git a/search-data-service-app/pom.xml b/search-data-service-app/pom.xml
index 71fe188..ea768b8 100644
--- a/search-data-service-app/pom.xml
+++ b/search-data-service-app/pom.xml
@@ -25,9 +25,9 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<groupId>org.springframework.boot</groupId>
-		<version>1.5.19.RELEASE</version>
+		<artifactId>search-data-service</artifactId>
+		<groupId>org.onap.aai</groupId>
+		<version>1.5.0-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.onap.aai.search-data-service</groupId>
@@ -52,8 +52,21 @@
 		<sonar.jacoco.reportMissing.force.zero>false</sonar.jacoco.reportMissing.force.zero>
 		<sonar.projectVersion>${project.version}</sonar.projectVersion>
 		<jacoco.line.coverage.limit>0.58</jacoco.line.coverage.limit>
+		<spring.boot.version>1.5.19.RELEASE</spring.boot.version>
 	</properties>
-
+	
+	<dependencyManagement>
+          <dependencies>
+            <dependency>
+              <groupId>org.springframework.boot</groupId>
+              <artifactId>spring-boot-starter-parent</artifactId>
+              <version>${spring.boot.version}</version>
+              <type>pom</type>
+              <scope>import</scope>
+            </dependency>
+          </dependencies>
+	</dependencyManagement>
+	
 	<dependencies>
 
 		<dependency>