From afde732d7244f4016248cc080e63fe4e29465396 Mon Sep 17 00:00:00 2001
From: Alexis de Talhouët <adetalhouet89@gmail.com>
Date: Fri, 18 Jan 2019 15:14:23 -0500
Subject: Client for BluePrintProcessingServiceGrpc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I32d3bd80b9004d98c3c34f73081c156192fb4432
Issue-ID: CCSDK-947
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
---
 grpc-resource/provider/pom.xml | 56 +++++++++++++++++++++++++++++++++---------
 1 file changed, 44 insertions(+), 12 deletions(-)

(limited to 'grpc-resource/provider/pom.xml')

diff --git a/grpc-resource/provider/pom.xml b/grpc-resource/provider/pom.xml
index 20f83c1e..9c0a4a0d 100644
--- a/grpc-resource/provider/pom.xml
+++ b/grpc-resource/provider/pom.xml
@@ -33,8 +33,9 @@
     <name>ccsdk-sli-adaptors :: grpc-client :: ${project.artifactId}</name>
 
     <properties>
-        <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version>
-        <grpc.version>1.16.1</grpc.version>
+        <grpc.version>1.17.1</grpc.version>
+        <protobuf.version>3.6.1</protobuf.version>
+        <grpc.netty.version>4.1.30.Final</grpc.netty.version>
     </properties>
 
     <dependencyManagement>
@@ -50,35 +51,62 @@
     </dependencyManagement>
 
     <dependencies>
+
+        <!-- SLI dependencies -->
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sliPluginUtils-provider</artifactId>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- GRPC Dependencies -->
+        <!-- CDS dependencies -->
         <dependency>
-            <groupId>io.grpc</groupId>
-            <artifactId>grpc-core</artifactId>
-            <version>${grpc.version}</version>
+            <groupId>org.onap.ccsdk.apps.components</groupId>
+            <artifactId>proto-definition</artifactId>
+            <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.code.findbugs</groupId>
+                    <artifactId>jsr305</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.protobuf</groupId>
+                    <artifactId>protobuf-java-util</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
+
+        <!-- protobuf dependencies -->
         <dependency>
-            <groupId>io.grpc</groupId>
-            <artifactId>grpc-netty</artifactId>
-            <version>${grpc.version}</version>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java</artifactId>
+            <version>${protobuf.version}</version>
         </dependency>
+
+        <!-- gRPC dependencies -->
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-protobuf</artifactId>
             <version>${grpc.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.code.findbugs</groupId>
+                    <artifactId>jsr305</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-stub</artifactId>
             <version>${grpc.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-netty</artifactId>
+            <version>${grpc.version}</version>
+        </dependency>
 
-        <!--Testing-->
+        <!-- Testing -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -102,8 +130,12 @@
                 <configuration>
                     <instructions>
                         <Export-Package>
-                            org.onap.ccsdk.sli.adaptors.grpc
+                            io.grpc,
+                            io.grpc.inprocess,
+                            io.grpc.internal,
+                            io.grpc.util
                         </Export-Package>
+                        <Import-Package>!com.google.errorprone.annotations,*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
-- 
cgit 1.2.3-korg