summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2019-03-22 07:45:06 -0400
committerTimoney, Dan (dt5972) <dtimoney@att.com>2019-03-22 07:45:06 -0400
commit1f3c718338364db35ef73f1dedbe5a1679172f78 (patch)
treecb6fd66204f745a5885f634739007438917a8b17
parente6b9133f88c3b8da88c125a5e63c2caad66a9fd7 (diff)
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>
-rw-r--r--features/ccsdk-sli-adaptors-all/pom.xml3
-rwxr-xr-xpom.xml6
2 files changed, 4 insertions, 5 deletions
diff --git a/features/ccsdk-sli-adaptors-all/pom.xml b/features/ccsdk-sli-adaptors-all/pom.xml
index cf7bae329..59966087a 100644
--- 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 fb0b72da7..da6283845 100755
--- 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>