Upgrade CDS dependency

CDS client libraries are exposed by a different
maven module making is much more cleaner to use.
The only drawback is we need to go back to older
version of grpc-testing artifact due to conflicts.

Issue-ID: POLICY-3338
Signed-off-by: Rashmi Pujar <rashmi.pujar@bell.ca>
Change-Id: I98c79de7f12feefbae7c42c4c8f26357801b44f9
(cherry picked from commit d8b5454e5d389332f4f624c291fa46690cf177ef)
Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>

diff --git a/models-interactions/model-impl/cds/pom.xml b/models-interactions/model-impl/cds/pom.xml
index 57c289b..3d787e3 100644 (file)
--- a/models-interactions/model-impl/cds/pom.xml
+++ b/models-interactions/model-impl/cds/pom.xml
@@ -19,8 +19,8 @@
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>model-impl</artifactId>
@@ -33,61 +33,14 @@
   <description>gRPC client implementation to send process message to CDS blueprint processor gRPC endpoint.</description>
 
   <properties>
-    <grpc.version>1.35.0</grpc.version>
-    <protobuf.version>3.14.0</protobuf.version>
+    <grpc.version>1.25.0</grpc.version>
   </properties>
 
   <dependencies>
     <!-- CDS dependencies -->
     <dependency>
-      <groupId>org.onap.ccsdk.cds.components</groupId>
-      <artifactId>proto-definition</artifactId>
-    </dependency>
-
-    <!-- protobuf dependencies -->
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-      <version>${protobuf.version}</version>
-    </dependency>
-
-    <!-- gRPC dependencies -->
-    <!-- io.netty artifacts have security issues and are transitive dependencies from io.grpc:grpc-netty:1.17.1.
-    Override io.netty dependencies and add exclusions to io.grpc:grpc-netty where io.netty version is mandated. -->
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-codec-http2</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-handler-proxy</artifactId>
-    </dependency>
-    <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>
-      <exclusions>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-codec-http2</artifactId>
-        </exclusion>
-      </exclusions>
+      <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
+      <artifactId>blueprint-proto</artifactId>
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>

diff --git a/pom.xml b/pom.xml
index 5c62d65..13e6e67 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.policy.parent</groupId>
         <artifactId>integration</artifactId>
-        <version>3.3.0</version>
+        <version>3.3.1-SNAPSHOT</version>
         <relativePath />
     </parent>