From e9b60c3d6c9ae7b8fd4bf94a7897b2ea3dbfaeda Mon Sep 17 00:00:00 2001
From: Bruno Sakoto <bruno.sakoto@bell.ca>
Date: Thu, 10 Oct 2019 10:02:21 -0400
Subject: Replace protobuf-java 2.6.0 dependency with 3.6.1

This change fixes protobuf-java library conflict when running policy
because of presence of 2.6.0 and 3.6.1 librairies in pdp docker
container.

Issue-ID: POLICY-2088
Signed-off-by: Bruno Sakoto <bruno.sakoto@bell.ca>
Change-Id: Ifcebf2207dc54543083d080151e0685d51792be5
---
 policy-core/pom.xml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/policy-core/pom.xml b/policy-core/pom.xml
index abe1e56a..7497a34c 100644
--- a/policy-core/pom.xml
+++ b/policy-core/pom.xml
@@ -4,6 +4,7 @@
   ONAP Policy Engine - Drools PDP
   ================================================================================
   Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+  Modifications Copyright (C) 2019 Bell Canada.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -29,6 +30,10 @@
         <version>1.6.0-SNAPSHOT</version>
     </parent>
 
+    <properties>
+        <protobuf.version>3.6.1</protobuf.version>
+    </properties>
+
     <dependencies>
     <!--
     Issue: 1 of 2
@@ -50,6 +55,12 @@
             <artifactId>guava</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java</artifactId>
+            <version>${protobuf.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.kie</groupId>
             <artifactId>kie-api</artifactId>
@@ -78,6 +89,10 @@
                     <groupId>com.google.guava</groupId>
                     <artifactId>guava</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.google.protobuf</groupId>
+                    <artifactId>protobuf-java</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -89,6 +104,12 @@
             <groupId>org.drools</groupId>
             <artifactId>drools-persistence-jpa</artifactId>
             <version>6.5.0.Final</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.protobuf</groupId>
+                    <artifactId>protobuf-java</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.onap.policy.common</groupId>
-- 
cgit 1.2.3-korg