Bump models patch 2.2.4-SNAPSHOT

[policy/models.git] / models-interactions / model-impl / cds / pom.xml

diff --git a/models-interactions/model-impl/cds/pom.xml b/models-interactions/model-impl/cds/pom.xml
index 9e3b55b..1da64ed 100644 (file)
--- a/models-interactions/model-impl/cds/pom.xml
+++ b/models-interactions/model-impl/cds/pom.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ============LICENSE_START=======================================================
-  Copyright (C) 2019 Bell Canada.
+  Copyright (C) 2019-2020 Bell Canada.
+  Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -24,7 +25,7 @@
   <parent>
     <artifactId>model-impl</artifactId>
     <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>cds</artifactId>
@@ -34,8 +35,6 @@
   <properties>
     <grpc.version>1.17.1</grpc.version>
     <protobuf.version>3.6.1</protobuf.version>
-    <grpc.netty.version>4.1.30.Final</grpc.netty.version>
-    <ccsdk.version>0.4.4</ccsdk.version>
   </properties>
 
   <dependencies>
@@ -43,7 +42,6 @@
     <dependency>
       <groupId>org.onap.ccsdk.cds.components</groupId>
       <artifactId>proto-definition</artifactId>
-      <version>${ccsdk.version}</version>
     </dependency>
 
     <!-- protobuf dependencies -->
@@ -54,6 +52,16 @@
     </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>
@@ -74,6 +82,12 @@
       <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>
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
@@ -93,7 +107,6 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>2.13.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>