From efdaa0d840ed5289bda63ea15d76d8a5446c1746 Mon Sep 17 00:00:00 2001 From: liamfallon 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 --- .../org/onap/policy/apex/core/deployment/EngineServiceFacade.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/core-deployment/src/main') diff --git a/core/core-deployment/src/main/java/org/onap/policy/apex/core/deployment/EngineServiceFacade.java b/core/core-deployment/src/main/java/org/onap/policy/apex/core/deployment/EngineServiceFacade.java index 11e870c9c..f0616e20a 100644 --- a/core/core-deployment/src/main/java/org/onap/policy/apex/core/deployment/EngineServiceFacade.java +++ b/core/core-deployment/src/main/java/org/onap/policy/apex/core/deployment/EngineServiceFacade.java @@ -45,7 +45,7 @@ import org.onap.policy.apex.model.basicmodel.handling.ApexModelReader; import org.onap.policy.apex.model.basicmodel.handling.ApexModelWriter; import org.onap.policy.apex.model.enginemodel.concepts.AxEngineModel; import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel; -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; @@ -202,7 +202,7 @@ public class EngineServiceFacade { // Get the model file as a string URL apexModelURL = ResourceUtils.getLocalFile(modelFileName); if (apexModelURL == null) { - apexModelURL = ResourceUtils.getURLResource(modelFileName); + apexModelURL = ResourceUtils.getUrlResource(modelFileName); if (apexModelURL == null) { LOGGER.error("cound not create apex model, could not read from XML file {}", modelFileName); throw new ApexDeploymentException( -- cgit 1.2.3-korg