commit a92a8387512bf559731a775fea3b3718c5ebb86d
author Timoney, Dan (dt5972) <dtimoney@att.com> Tue Apr 02 10:35:09 2019 -0700
committer Timoney, Dan (dt5972) <dtimoney@att.com> Tue Apr 02 10:37:30 2019 -0700
tree 6653ef041b0dc4f5ca70f955512c6cf5f8f3be36
parent 1f8c95ab7ae772e2f6945f05ac19006ffb892e22

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

diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index 3700cfa..cf79332 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>

odlsli/odlsli-alpine/src/main/docker/Dockerfile

diff --git a/odlsli/odlsli-alpine/src/main/docker/Dockerfile b/odlsli/odlsli-alpine/src/main/docker/Dockerfile
index 2719102..87972eb 100644
--- a/odlsli/odlsli-alpine/src/main/docker/Dockerfile
+++ b/odlsli/odlsli-alpine/src/main/docker/Dockerfile
@@ -10,6 +10,7 @@
 ENV CCSDK_FEATURES_SDNR_WT_REPO mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator/${ccsdk.features.version}/xml/features
 ENV CCSDK_SLI_NORTHBOUND_REPO mvn:org.onap.ccsdk.sli.northbound/ccsdk-sli-northbound-all/${ccsdk.sli.northbound.version}/xml/features
 ENV CCSDK_SLI_PLUGINS_REPO mvn:org.onap.ccsdk.sli.plugins/ccsdk-sli-plugins-all/${ccsdk.sli.plugins.version}/xml/features
+
 ENV ANSIBLE_GPG_KEY ${ansible.gpg.key}
 ENV ODL_BOOT_FEATURES_EXTRA ${odl.boot.features.extra}
 
@@ -23,6 +24,7 @@
 
 # Add CCSDK repositories to boot repositories
 RUN cp $ODL_HOME/etc/org.apache.karaf.features.cfg $ODL_HOME/etc/org.apache.karaf.features.cfg.orig
+<<<<<<< HEAD
 #RUN sed -i -e "\|featuresRepositories|s|$|, ${CCSDK_SLI_CORE_REPO}, ${CCSDK_SLI_ADAPTORS_REPO}, ${CCSDK_SLI_NORTHBOUND_REPO}, ${CCSDK_SLI_PLUGINS_REPO}, ${CCSDK_FEATURES_REPO}|"  $ODL_HOME/etc/org.apache.karaf.features.cfg
 RUN sed -i -e "\|featuresRepositories|s|$|, ${CCSDK_SLI_CORE_REPO}, ${CCSDK_SLI_NORTHBOUND_REPO}, ${CCSDK_SLI_PLUGINS_REPO}, ${CCSDK_FEATURES_REPO}, ${CCSDK_FEATURES_SDNR_WT_REPO}|"  $ODL_HOME/etc/org.apache.karaf.features.cfg
 RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,${ODL_BOOT_FEATURES_EXTRA}|"  $ODL_HOME/etc/org.apache.karaf.features.cfg