summaryrefslogtreecommitdiffstats
path: root/model/model-api
diff options
context:
space:
mode:
authorliamfallon <liam.fallon@ericsson.com>2018-08-03 16:12:01 +0100
committerliamfallon <liam.fallon@ericsson.com>2018-08-03 21:26:42 +0100
commitefdaa0d840ed5289bda63ea15d76d8a5446c1746 (patch)
tree27bc3d9f8c21e8feb1710b8866833ea3e521539e /model/model-api
parent0f0f41071ae3c6c7896c7770b0139c9c40866330 (diff)
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>
Diffstat (limited to 'model/model-api')
-rw-r--r--model/model-api/pom.xml4
-rw-r--r--model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelHandlerFacade.java2
2 files changed, 5 insertions, 1 deletions
diff --git a/model/model-api/pom.xml b/model/model-api/pom.xml
index 53ecd6524..0fe2b8434 100644
--- a/model/model-api/pom.xml
+++ b/model/model-api/pom.xml
@@ -32,6 +32,10 @@
<dependencies>
<dependency>
+ <groupId>org.onap.policy.common</groupId>
+ <artifactId>utils</artifactId>
+ </dependency>
+ <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>policy-model</artifactId>
<version>${project.version}</version>
diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelHandlerFacade.java b/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelHandlerFacade.java
index 89a656a40..b422d84d1 100644
--- a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelHandlerFacade.java
+++ b/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelHandlerFacade.java
@@ -55,8 +55,8 @@ import org.onap.policy.apex.model.policymodel.handling.PolicyModelComparer;
import org.onap.policy.apex.model.policymodel.handling.PolicyModelMerger;
import org.onap.policy.apex.model.policymodel.handling.PolicyModelSplitter;
import org.onap.policy.apex.model.utilities.Assertions;
-import org.onap.policy.apex.model.utilities.ResourceUtils;
import org.onap.policy.apex.model.utilities.TextFileUtils;
+import org.onap.policy.common.utils.resources.ResourceUtils;
import org.slf4j.ext.XLogger;
import org.slf4j.ext.XLoggerFactory;