diff options
| author |   liamfallon <liam.fallon@ericsson.com> | 2018-08-03 16:12:01 +0100 |
|---|---|---|
| committer | liamfallon <liam.fallon@ericsson.com> | 2018-08-03 21:26:42 +0100 |
| commit | efdaa0d840ed5289bda63ea15d76d8a5446c1746 (patch) | |
| tree | 27bc3d9f8c21e8feb1710b8866833ea3e521539e /model/basic-model | |
| parent | 0f0f41071ae3c6c7896c7770b0139c9c40866330 (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/basic-model')
3 files changed, 7 insertions, 3 deletions
diff --git a/model/basic-model/pom.xml b/model/basic-model/pom.xml index 807389b53..66ed4c531 100644 --- a/model/basic-model/pom.xml +++ b/model/basic-model/pom.xml @@ -33,6 +33,10 @@ <description>Basic Models used and model handling 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>utilities</artifactId> diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelReader.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelReader.java index b19255a5b..6ca9c03d8 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelReader.java +++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelReader.java @@ -43,8 +43,8 @@ import org.eclipse.persistence.oxm.MediaType; import org.onap.policy.apex.model.basicmodel.concepts.AxConcept; import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult; 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; @@ -119,7 +119,7 @@ public class ApexModelReader<C extends AxConcept> { if (schemaFileName != null) { try { // Set the concept schema - final URL schemaURL = ResourceUtils.getURLResource(schemaFileName); + final URL schemaURL = ResourceUtils.getUrlResource(schemaFileName); final Schema apexConceptSchema = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI).newSchema(schemaURL); unmarshaller.setSchema(apexConceptSchema); } diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/test/TestApexModel.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/test/TestApexModel.java index 04b64207d..356afd723 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/test/TestApexModel.java +++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/test/TestApexModel.java @@ -34,7 +34,7 @@ import org.onap.policy.apex.model.basicmodel.dao.DAOParameters; import org.onap.policy.apex.model.basicmodel.handling.ApexModelFileWriter; import org.onap.policy.apex.model.basicmodel.handling.ApexModelReader; import org.onap.policy.apex.model.basicmodel.handling.ApexModelWriter; -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; |