From a46382dd12b981220243bf11ab3fb115acfabfa0 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Tue, 18 Sep 2018 16:20:26 +0100 Subject: remove license issues Change the versions of some second order dependencies to mitigate license issues. Change-Id: I39745ec1eb7c72fb481a4adafc2805e4bbbd8386 Issue-ID: POLICY-1059 Signed-off-by: liamfallon --- .../plugins/event/carrier/jms/ApexJmsProducer.java | 13 ++++---- .../event/carrier/kafka/ApexKafkaConsumer.java | 2 +- .../plugins-executor-jruby/pom.xml | 24 ++++++++++++++ .../plugins-persistence-jpa-hibernate/pom.xml | 38 +++++++++++++++++----- pom.xml | 2 +- .../uservice/adapt/kafka/KafkaEventSubscriber.java | 2 +- 6 files changed, 64 insertions(+), 17 deletions(-) diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src/main/java/org/onap/policy/apex/plugins/event/carrier/jms/ApexJmsProducer.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src/main/java/org/onap/policy/apex/plugins/event/carrier/jms/ApexJmsProducer.java index 83321e432..4dcbf80c8 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src/main/java/org/onap/policy/apex/plugins/event/carrier/jms/ApexJmsProducer.java +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src/main/java/org/onap/policy/apex/plugins/event/carrier/jms/ApexJmsProducer.java @@ -103,8 +103,9 @@ public class ApexJmsProducer implements ApexEventProducer { // Check if we actually got a connection factory if (connectionFactory == null) { - throw new IllegalArgumentException("JMS context lookup of \"" + jmsProducerProperties.getConnectionFactory() - + "\" returned null for producer (" + this.name + ")"); + throw new IllegalArgumentException( + "JMS context lookup of \"" + jmsProducerProperties.getConnectionFactory() + + "\" returned null for producer (" + this.name + ")"); } } catch (final Exception e) { final String errorMessage = "lookup of JMS connection factory \"" @@ -231,8 +232,8 @@ public class ApexJmsProducer implements ApexEventProducer { try { jmsMessage = jmsSession.createObjectMessage((Serializable) eventObject); } catch (final Exception e) { - final String errorMessage = COULD_NOT_SEND_PREFIX + eventname + JMS_MESSAGE_PRODUCER_TAG - + this.name + ", could not create JMS Object Message for object \"" + eventObject; + final String errorMessage = COULD_NOT_SEND_PREFIX + eventname + JMS_MESSAGE_PRODUCER_TAG + this.name + + ", could not create JMS Object Message for object \"" + eventObject; LOGGER.warn(errorMessage, e); throw new ApexEventRuntimeException(errorMessage); } @@ -241,8 +242,8 @@ public class ApexJmsProducer implements ApexEventProducer { try { jmsMessage = jmsSession.createTextMessage(eventObject.toString()); } catch (final Exception e) { - final String errorMessage = COULD_NOT_SEND_PREFIX + eventname + JMS_MESSAGE_PRODUCER_TAG - + this.name + ", could not create JMS Text Message for object \"" + eventObject; + final String errorMessage = COULD_NOT_SEND_PREFIX + eventname + JMS_MESSAGE_PRODUCER_TAG + this.name + + ", could not create JMS Text Message for object \"" + eventObject; LOGGER.warn(errorMessage, e); throw new ApexEventRuntimeException(errorMessage); } diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/main/java/org/onap/policy/apex/plugins/event/carrier/kafka/ApexKafkaConsumer.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/main/java/org/onap/policy/apex/plugins/event/carrier/kafka/ApexKafkaConsumer.java index be1b943d4..94ac2bcca 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/main/java/org/onap/policy/apex/plugins/event/carrier/kafka/ApexKafkaConsumer.java +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/main/java/org/onap/policy/apex/plugins/event/carrier/kafka/ApexKafkaConsumer.java @@ -164,7 +164,7 @@ public class ApexKafkaConsumer implements ApexEventConsumer, Runnable { while (consumerThread.isAlive() && !stopOrderedFlag) { try { final ConsumerRecords records = - kafkaConsumer.poll(kafkaConsumerProperties.getConsumerPollDuration()); + kafkaConsumer.poll(kafkaConsumerProperties.getConsumerPollDuration().toMillis()); for (final ConsumerRecord record : records) { if (LOGGER.isTraceEnabled()) { LOGGER.trace("event received for {} for forwarding to Apex engine : {} {}", diff --git a/plugins/plugins-executor/plugins-executor-jruby/pom.xml b/plugins/plugins-executor/plugins-executor-jruby/pom.xml index 0620dae9b..5cf59e486 100644 --- a/plugins/plugins-executor/plugins-executor-jruby/pom.xml +++ b/plugins/plugins-executor/plugins-executor-jruby/pom.xml @@ -35,6 +35,30 @@ org.jruby jruby-core 9.2.0.0 + + + org.jruby.extras + bytelist + + + org.jruby + dirgra + + + com.github.jnr + jffi + + + + + org.jruby.extras + bytelist + 1.0.13 + + + com.github.jnr + jffi + 1.2.16 diff --git a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-hibernate/pom.xml b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-hibernate/pom.xml index 990bc8d61..7ed34ea79 100644 --- a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-hibernate/pom.xml +++ b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-hibernate/pom.xml @@ -37,16 +37,38 @@ ${version.hibernate} - dom4j - dom4j + xml-apis + xml-apis + + + net.bytebuddy + byte-buddy + + + org.javassist + javaassist + + + javax.activation + javax.activation-api - - dom4j - dom4j - 1.6.1 - + + xml-apis + xml-apis + 1.4.01 + + + net.bytebuddy + byte-buddy + 1.8.13 + + + org.javassist + javassist + 3.22.0-GA + org.hibernate hibernate-c3p0 @@ -70,4 +92,4 @@ - \ No newline at end of file + diff --git a/pom.xml b/pom.xml index cbe004414..18fce7126 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ UTF-8 10.13.1.1 1.4 - 2.0.0 + 1.1.1 2.26 2.6.5 5.3.6.Final diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/kafka/KafkaEventSubscriber.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/kafka/KafkaEventSubscriber.java index 1c33289b7..54ee9ba92 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/kafka/KafkaEventSubscriber.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/kafka/KafkaEventSubscriber.java @@ -84,7 +84,7 @@ public class KafkaEventSubscriber implements Runnable { while (subscriberThread.isAlive() && !subscriberThread.isInterrupted()) { try { - final ConsumerRecords records = consumer.poll(POLL_DURATION); + final ConsumerRecords records = consumer.poll(POLL_DURATION.toMillis()); for (final ConsumerRecord record : records) { eventsReceivedCount++; System.out.println("****** Received event No. " + eventsReceivedCount + " ******"); -- cgit 1.2.3-korg