From bbcacd27a3fcaa2f26f741ab1c46c0c9cc8db8ee Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dtimoney@att.com>
Date: Tue, 18 Jun 2019 10:42:07 -0400
Subject: Add new BOM for odl-based projects

Refactor dependencyManagement section from odlparent poms into a new
BOM for ease of maintenance.

Change-Id: I4e31ccc2a3c5349b10777c14b9d5e7fd3e034c46
Issue-ID: CCSDK-1412
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
---
 springboot/springboot1/pom.xml |  9 ++++++++-
 springboot/springboot2/pom.xml | 35 +++++++++++++++++++++++++++++++++--
 2 files changed, 41 insertions(+), 3 deletions(-)

(limited to 'springboot')

diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml
index fc2ad065..d86bb535 100755
--- a/springboot/springboot1/pom.xml
+++ b/springboot/springboot1/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.20.RELEASE</version>
+		<version>1.5.21.RELEASE</version>
 		<relativePath/>
 	</parent>
 
@@ -362,6 +362,13 @@
 
 	<dependencyManagement>
 		<dependencies>
+			<dependency>
+				<groupId>org.onap.ccsdk.parent</groupId>
+				<artifactId>dependencies-bom</artifactId>
+				<version>1.3.0-SNAPSHOT</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
 			<dependency>
 				<groupId>org.onap.ccsdk.sli.core</groupId>
 				<artifactId>sli-common</artifactId>
diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml
index 8073ea7b..1bc6a497 100755
--- a/springboot/springboot2/pom.xml
+++ b/springboot/springboot2/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.4.RELEASE</version>
+		<version>2.1.6.RELEASE</version>
 		<relativePath/>
 	</parent>
 
@@ -93,6 +93,25 @@
 		<sdnctl.mdsal.resource.version>${ccsdk.sli.adaptors.version}</sdnctl.mdsal.resource.version>
 		<sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version>
 
+
+		<apache.httpcomponents.core.version>4.4.4</apache.httpcomponents.core.version>
+		<apache.httpcomponents.client.version>4.5.2</apache.httpcomponents.client.version>
+		<derby.version>10.14.2.0</derby.version>
+		<eelf.version>1.0.0</eelf.version>
+		<grpc.version>1.17.1</grpc.version>
+		<jackson.bom.version>2.8.11.20181123</jackson.bom.version>
+		<jersey.version>2.25.1</jersey.version>
+		<jettison.version>1.3.8</jettison.version>
+		<junit.version>4.12</junit.version>
+		<logback.version>1.2.3</logback.version>
+		<mariadb.connector.version>2.1.1</mariadb.connector.version>
+		<mariadb4j.version>2.2.3</mariadb4j.version>
+		<spring.version>4.3.18.RELEASE</spring.version>
+		<slf4j.version>1.7.25</slf4j.version>
+		<testng.version>6.11</testng.version>
+		<tomcat-jdbc.version>8.5.14</tomcat-jdbc.version>
+
+
 	</properties>
 
 
@@ -356,6 +375,13 @@
 
 	<dependencyManagement>
 		<dependencies>
+			<dependency>
+				<groupId>org.onap.ccsdk.parent</groupId>
+				<artifactId>dependencies-bom</artifactId>
+				<version>1.3.0-SNAPSHOT</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
 			<dependency>
 				<groupId>org.onap.ccsdk.sli.core</groupId>
 				<artifactId>sli-common</artifactId>
@@ -385,7 +411,12 @@
 				<artifactId>dblib-provider</artifactId>
 				<version>${sdnctl.dblib.version}</version>
 			</dependency>
-
+			<dependency>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<version>${junit.version}</version>
+				<scope>test</scope>
+			</dependency>
 		</dependencies>
 
 	</dependencyManagement>
-- 
cgit