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 /plugins/plugins-event | |
| 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 'plugins/plugins-event')
2 files changed, 6 insertions, 2 deletions
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/pom.xml b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/pom.xml index 00f2938e5..4a2323dbd 100644 --- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/pom.xml +++ b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/pom.xml @@ -36,6 +36,10 @@ <dependencies> <dependency> + <groupId>org.onap.policy.common</groupId> + <artifactId>utils</artifactId> + </dependency> + <dependency> <groupId>org.eclipse.persistence</groupId> <artifactId>eclipselink</artifactId> <version>${version.eclipselink}</version> diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/java/org/onap/policy/apex/plugins/event/protocol/xml/Apex2XMLEventConverter.java b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/java/org/onap/policy/apex/plugins/event/protocol/xml/Apex2XMLEventConverter.java index 01a57caf6..76bae6833 100644 --- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/java/org/onap/policy/apex/plugins/event/protocol/xml/Apex2XMLEventConverter.java +++ b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/java/org/onap/policy/apex/plugins/event/protocol/xml/Apex2XMLEventConverter.java @@ -37,7 +37,6 @@ import javax.xml.transform.stream.StreamSource; import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; -import org.onap.policy.apex.model.utilities.ResourceUtils; import org.onap.policy.apex.plugins.event.protocol.xml.jaxb.ObjectFactory; import org.onap.policy.apex.plugins.event.protocol.xml.jaxb.XMLApexEvent; import org.onap.policy.apex.plugins.event.protocol.xml.jaxb.XMLApexEventData; @@ -46,6 +45,7 @@ import org.onap.policy.apex.service.engine.event.ApexEventException; import org.onap.policy.apex.service.engine.event.ApexEventProtocolConverter; import org.onap.policy.apex.service.engine.event.ApexEventRuntimeException; import org.onap.policy.apex.service.parameters.eventprotocol.EventProtocolParameters; +import org.onap.policy.common.utils.resources.ResourceUtils; import org.slf4j.ext.XLogger; import org.slf4j.ext.XLoggerFactory; import org.xml.sax.SAXException; @@ -73,7 +73,7 @@ public final class Apex2XMLEventConverter implements ApexEventProtocolConverter */ public Apex2XMLEventConverter() throws ApexEventException { try { - final URL schemaURL = ResourceUtils.getURLResource(MODEL_SCHEMA_NAME); + final URL schemaURL = ResourceUtils.getUrlResource(MODEL_SCHEMA_NAME); final Schema apexEventSchema = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI).newSchema(schemaURL); |