From a92a8387512bf559731a775fea3b3718c5ebb86d Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dtimoney@att.com>
Date: Tue, 2 Apr 2019 10:35:09 -0700
Subject: Restore ccsdk-sli-adaptors-all package

Restore ccsdk-sli-adaptors-all package, which had been removed while
debugging a conflict that prevented container from coming up.

Change-Id: If28fcae0c47e196daa4e3665acd46881b5ae78d7
Issue-ID: SDNC-712
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
---
 odlsli/odlsli-alpine/pom.xml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'odlsli/odlsli-alpine/pom.xml')

diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index 3700cfa5..cf793320 100644
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -33,11 +33,7 @@
 		<docker.verbose>true</docker.verbose>
 		<ansible.gpg.key>93C4A3FD7BB9C367</ansible.gpg.key>
 		<odl.features.extra>odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs, odl-daexim-all, odl-restconf-nb-rfc8040</odl.features.extra>
-	    <!-- 
 		<ccsdk.odl.features>ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all</ccsdk.odl.features>
-		-->
-		<ccsdk.adaptors.features>ccsdk-aai-service,ccsdk-ansible-adapter,ccsdk-grpc-client,ccsdk-netbox-client,csdk-mdsal-resource,ccsdk-resource-assignment,ccsdk-sql-resource</ccsdk.adaptors.features>
-		<ccsdk.odl.features>ccsdk-sli-core-all,${ccsdk.adaptors.features},ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all</ccsdk.odl.features>
 		<odl.boot.features.extra>${odl.features.extra},${ccsdk.odl.features}</odl.boot.features.extra>
 	</properties>
 	
@@ -162,13 +158,14 @@
 			<classifier>repo</classifier>
 			<type>zip</type>
 		</dependency>
-<!-- 		<dependency>
+		<dependency>
 			<groupId>org.onap.ccsdk.sli.adaptors</groupId>
 			<artifactId>sliadaptors-features-installer</artifactId>
 			<version>${ccsdk.sli.adaptors.version}</version>
 			<classifier>repo</classifier>
 			<type>zip</type>
-		</dependency> -->
+		</dependency>
+
 		<dependency>
 			<groupId>org.onap.ccsdk.sli.northbound</groupId>
 			<artifactId>asdcApi-installer</artifactId>
-- 
cgit 1.2.3-korg