Re-add grpc-client

Re-add grpc-client, which had been commented out due to circular
dependency between sli/adaptors and apps repositories.

Change-Id: Ife4c9c03f4f9f26993a3976ae12639b3c4964b80
Issue-ID: CCSDK-1156
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>

diff --git a/features/ccsdk-sli-adaptors-all/pom.xml b/features/ccsdk-sli-adaptors-all/pom.xml
index cf7bae3..5996608 100644 (file)
--- a/features/ccsdk-sli-adaptors-all/pom.xml
+++ b/features/ccsdk-sli-adaptors-all/pom.xml
@@ -43,6 +43,7 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        -->
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>ccsdk-grpc-client</artifactId>
@@ -50,7 +51,7 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        -->
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>ccsdk-netbox-client</artifactId>

diff --git a/pom.xml b/pom.xml
index fb0b72d..da62838 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -99,10 +99,8 @@
         <module>aai-service</module>
         <module>ansible-adapter</module>
         <module>saltstack-adapter</module>
-        <module>netbox-client</module>
-        <!-- 
-        <module>grpc-resource</module>
-        -->
+        <module>netbox-client</module>      
+        <module>grpc-resource</module>      
         <module>mdsal-resource</module>
         <module>resource-assignment</module>
         <module>sql-resource</module>