diff options
| author |   Bruno Sakoto <bruno.sakoto@bell.ca> | 2019-10-10 10:02:21 -0400 |
|---|---|---|
| committer | Bruno Sakoto <bruno.sakoto@bell.ca> | 2019-10-10 10:25:12 -0400 |
| commit | e9b60c3d6c9ae7b8fd4bf94a7897b2ea3dbfaeda (patch) | |
| tree | 8672e91ee143626ff63390afad96075b4a6f4da4 /policy-core | |
| parent | 464b0e5f62167900d6cf60f058628dc273cedbf0 (diff) | |
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
Diffstat (limited to 'policy-core')
| -rw-r--r-- | policy-core/pom.xml | 21 |
1 files changed, 21 insertions, 0 deletions
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 @@ -51,6 +56,12 @@ </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> <version>6.5.0.Final</version> @@ -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> |