From 4b8e365a78261942cb7b8384d5138d9e5056898a Mon Sep 17 00:00:00 2001 From: Michael Dürre Date: Thu, 5 Sep 2019 11:18:41 +0200 Subject: Fix startup dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes dependencies and JarHell for startup Issue-ID: SDNC-901 Signed-off-by: Michael Dürre Change-Id: I48b968cc8e2876442fd7c3c800c161b65445b5e9 Signed-off-by: Michael Dürre --- sdnr/wt/devicemanager/feature/pom.xml | 7 +++-- sdnr/wt/devicemanager/provider/pom.xml | 36 ++++++++++++++-------- .../java/org/elasticsearch/bootstrap/JarHell.java | 10 ++++++ .../java/org/elasticsearch/bootstrap/JarHell.java | 10 ------ 4 files changed, 37 insertions(+), 26 deletions(-) create mode 100644 sdnr/wt/devicemanager/provider/src/main/java/org/elasticsearch/bootstrap/JarHell.java delete mode 100644 sdnr/wt/devicemanager/provider/src/test/java/org/elasticsearch/bootstrap/JarHell.java diff --git a/sdnr/wt/devicemanager/feature/pom.xml b/sdnr/wt/devicemanager/feature/pom.xml index 51bc21aad..bccd0ce30 100644 --- a/sdnr/wt/devicemanager/feature/pom.xml +++ b/sdnr/wt/devicemanager/feature/pom.xml @@ -21,7 +21,9 @@ * ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.ccsdk.features.sdnr.wt @@ -34,12 +36,11 @@ org.onap.ccsdk.parent single-feature-parent 1.4.1-SNAPSHOT - + - org.opendaylight.controller mdsal-artifacts diff --git a/sdnr/wt/devicemanager/provider/pom.xml b/sdnr/wt/devicemanager/provider/pom.xml index 3b9b058b4..c31d78a6f 100644 --- a/sdnr/wt/devicemanager/provider/pom.xml +++ b/sdnr/wt/devicemanager/provider/pom.xml @@ -48,6 +48,7 @@ org.mockito mockito-core + 2.23.0 test @@ -95,10 +96,18 @@ sal-netconf-connector provided + + org.opendaylight.mdsal.binding.model.ietf + rfc6991-ietf-yang-types + + + org.opendaylight.mdsal + yang-binding + org.opendaylight.mdsal mdsal-singleton-common-api - provided + provided org.json @@ -344,10 +353,10 @@ org.opendaylight.controller.md.sal.binding.api;version="[1.6,2)", org.opendaylight.controller.md.sal.common.api.data;version="[1.6,2)", org.opendaylight.controller.sal.binding.api;version="[1.6,2)", - org.opendaylight.mdsal.singleton.common.api;version="[2.0,3)", + org.opendaylight.mdsal.singleton.common.api;version="[2.0,3.0.8]", org.opendaylight.yangtools.concepts;version="[2.0,3)", - org.opendaylight.yangtools.yang.binding;version="[0.12,1)", org.opendaylight.yangtools.yang.common;version="[2.0,3)", + org.opendaylight.yangtools.yang.binding;version="[1.0.8,2)", org.osgi.framework, org.osgi.service.blueprint.container, org.slf4j;version="[1.7,2)", @@ -376,15 +385,15 @@ org.apache.log4j.helpers;resolution:=optional;version="[1.2,2)", org.noggit;resolution:=optional, - com.google.common.base;version="[23.6,24)", - com.google.common.cache;version="[23.6,24)", - com.google.common.collect;version="[23.6,24)", - com.google.common.hash;version="[23.6,24)", - com.google.common.io;version="[23.6,24)", - com.google.common.math;version="[23.6,24)", - com.google.common.net;version="[23.6,24)", - com.google.common.primitives;version="[23.6,24)", - com.google.common.util.concurrent;version="[23.6,24)", + com.google.common.base;version="[23.6,26)", + com.google.common.cache;version="[23.6,26)", + com.google.common.collect;version="[23.6,26)", + com.google.common.hash;version="[23.6,26)", + com.google.common.io;version="[23.6,26)", + com.google.common.math;version="[23.6,26)", + com.google.common.net;version="[23.6,26)", + com.google.common.primitives;version="[23.6,26)", + com.google.common.util.concurrent;version="[23.6,26)", org.jboss.netty.bootstrap;version="[3.10,4)", org.jboss.netty.buffer;version="[3.10,4)", @@ -401,7 +410,7 @@ org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.websocketmanager.rev150105, org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.notification._1._0.rev080714;version="[1.4,2)", org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ptp.dataset.rev170208;version="[0.3,1)", - org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715;version="[2013.7,2014)", + org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715;version="[1.2.8,2)", org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320;version="[0.3,1)", org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.equipment.g;version="[0.3,1)", org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.core.model.rev170320.extension.g;version="[0.3,1)", @@ -463,3 +472,4 @@ + diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/elasticsearch/bootstrap/JarHell.java b/sdnr/wt/devicemanager/provider/src/main/java/org/elasticsearch/bootstrap/JarHell.java new file mode 100644 index 000000000..4a6913efe --- /dev/null +++ b/sdnr/wt/devicemanager/provider/src/main/java/org/elasticsearch/bootstrap/JarHell.java @@ -0,0 +1,10 @@ +package org.elasticsearch.bootstrap; +import java.net.URL; +public class JarHell { + private JarHell() {} + public static void checkJarHell() throws Exception {} + public static void checkJarHell(URL urls[]) throws Exception {} + public static void checkVersionFormat(String targetVersion) {} + public static void checkJavaVersion(String resource, String targetVersion) {} + public static URL[] parseClassPath() {return new URL[]{};} +} diff --git a/sdnr/wt/devicemanager/provider/src/test/java/org/elasticsearch/bootstrap/JarHell.java b/sdnr/wt/devicemanager/provider/src/test/java/org/elasticsearch/bootstrap/JarHell.java deleted file mode 100644 index 4a6913efe..000000000 --- a/sdnr/wt/devicemanager/provider/src/test/java/org/elasticsearch/bootstrap/JarHell.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.elasticsearch.bootstrap; -import java.net.URL; -public class JarHell { - private JarHell() {} - public static void checkJarHell() throws Exception {} - public static void checkJarHell(URL urls[]) throws Exception {} - public static void checkVersionFormat(String targetVersion) {} - public static void checkJavaVersion(String resource, String targetVersion) {} - public static URL[] parseClassPath() {return new URL[]{};} -} -- cgit 1.2.3-korg