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 --- .../plugins-context-distribution-infinispan/pom.xml | 2 +- .../plugins-event-protocol/plugins-event-protocol-xml/pom.xml | 4 ++++ .../apex/plugins/event/protocol/xml/Apex2XMLEventConverter.java | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'plugins') diff --git a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/pom.xml b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/pom.xml index 96ed6e85e..e14106033 100644 --- a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/pom.xml +++ b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/pom.xml @@ -34,7 +34,7 @@ org.infinispan infinispan-core - 9.2.2.Final + 9.3.1.Final org.jboss.slf4j 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 @@ -35,6 +35,10 @@ + + org.onap.policy.common + utils + org.eclipse.persistence eclipselink 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); -- cgit 1.2.3-korg