From be72a3cd156210d0e3f8fe3a0cd16993b32c248f Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dt5972@att.com>
Date: Fri, 15 Jun 2018 18:25:23 -0400
Subject: Update sli/adaptors to ODL Oxygen

Update sli/adaptors to compile against ODL Oxygen parent poms.

Change-Id: I112c5aa56dd985ad0e7e361d3839ec7069e5641c
Issue-ID: CCSDK-281
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
---
 sql-resource/features/ccsdk-sql-resource/pom.xml | 30 ++++++++++++++----------
 sql-resource/provider/pom.xml                    | 13 +---------
 2 files changed, 19 insertions(+), 24 deletions(-)

(limited to 'sql-resource')

diff --git a/sql-resource/features/ccsdk-sql-resource/pom.xml b/sql-resource/features/ccsdk-sql-resource/pom.xml
index fb01685c8..f96a7245d 100644
--- a/sql-resource/features/ccsdk-sql-resource/pom.xml
+++ b/sql-resource/features/ccsdk-sql-resource/pom.xml
@@ -16,14 +16,25 @@
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId}</name>
-
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.opendaylight.controller</groupId>
+				<artifactId>mdsal-artifacts</artifactId>
+				<version>${odl.mdsal.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.opendaylight.mdsal.model</groupId>
+				<artifactId>mdsal-model-artifacts</artifactId>
+				<version>${odl.mdsal.model.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
     <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-mdsal-broker</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
 
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
@@ -44,10 +55,5 @@
             <version>${project.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>equinoxSDK381</groupId>
-            <artifactId>org.eclipse.osgi</artifactId>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/sql-resource/provider/pom.xml b/sql-resource/provider/pom.xml
index 312cebc11..2e26088bc 100755
--- a/sql-resource/provider/pom.xml
+++ b/sql-resource/provider/pom.xml
@@ -26,7 +26,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -38,40 +37,30 @@
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-common</artifactId>
-            <version>${sdnctl.sli.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-provider</artifactId>
-            <version>${sdnctl.sli.version}</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>equinoxSDK381</groupId>
-            <artifactId>org.eclipse.osgi</artifactId>
-			<version>${equinox.osgi.version}</version>
-        </dependency>
+
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>${slf4j.version}</version>
         </dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jcl-over-slf4j</artifactId>
-			<version>${slf4j.version}</version>
 		</dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>${slf4j.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>dblib-provider</artifactId>
-            <version>${sdnctl.dblib.version}</version>
         </dependency>
 
     </dependencies>
-- 
cgit 1.2.3-korg