From efdaa0d840ed5289bda63ea15d76d8a5446c1746 Mon Sep 17 00:00:00 2001
From: liamfallon <liam.fallon@ericsson.com>
Date: Fri, 3 Aug 2018 16:12:01 +0100
Subject: Use common components in apex

Common ResourceUtil class replaces specific one in APEX
Managed dependency version clashes removed in POMs
Dependency versions with security vulnerabilities changed for
 zookeeper
 kafka
 infinispan

Change-Id: I3c4b367cb5556b2dc255ab62c84f85738165eb81
Issue-ID: POLICY-954
Signed-off-by: liamfallon <liam.fallon@ericsson.com>
---
 model/policy-model/pom.xml                                            | 4 ++++
 .../policy/apex/model/policymodel/handling/PolicyLogicReader.java     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'model/policy-model')

diff --git a/model/policy-model/pom.xml b/model/policy-model/pom.xml
index e29349959..97e4abcfc 100644
--- a/model/policy-model/pom.xml
+++ b/model/policy-model/pom.xml
@@ -31,6 +31,10 @@
     <description>Policy Models used in Apex</description>
 
     <dependencies>
+         <dependency>
+            <groupId>org.onap.policy.common</groupId>
+            <artifactId>utils</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.onap.policy.apex-pdp.model</groupId>
             <artifactId>context-model</artifactId>
diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java
index 3e5571242..822a803bf 100644
--- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java
+++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java
@@ -24,7 +24,7 @@ import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
 import org.onap.policy.apex.model.policymodel.concepts.AxLogic;
 import org.onap.policy.apex.model.policymodel.concepts.AxLogicReader;
 import org.onap.policy.apex.model.policymodel.concepts.PolicyRuntimeException;
-import org.onap.policy.apex.model.utilities.ResourceUtils;
+import org.onap.policy.common.utils.resources.ResourceUtils;
 import org.slf4j.ext.XLogger;
 import org.slf4j.ext.XLoggerFactory;
 
-- 
cgit 1.2.3-korg