From c74f6af8d7b72eeeee7ceedbf82fc8cecef1ae3d Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Thu, 11 Jul 2019 08:47:49 -0400 Subject: Update to Neon Apply code updates to port to Neon. Change-Id: I159309494ec64209d9fa23fc515643f1e31fe146 Issue-ID: CCSDK-1389 Signed-off-by: Timoney, Dan (dt5972) --- sdnr/northbound/energysavings/features/pom.xml | 10 +---- sdnr/northbound/energysavings/installer/pom.xml | 2 +- sdnr/northbound/energysavings/model/pom.xml | 2 +- sdnr/northbound/energysavings/pom.xml | 2 +- sdnr/northbound/energysavings/provider/pom.xml | 2 +- .../OSGI-INF/blueprint/impl-blueprint.xml | 40 +++++++++++++++++ .../ccsdk-features-sdnr-northbound-all/pom.xml | 4 +- sdnr/northbound/features/installer/pom.xml | 4 +- sdnr/northbound/features/pom.xml | 4 +- sdnr/northbound/oofpcipoc/consumer/pom.xml | 4 +- .../OSGI-INF/blueprint/impl-blueprint.xml | 29 ++++++++++++ sdnr/northbound/oofpcipoc/feature/pom.xml | 4 +- sdnr/northbound/oofpcipoc/installer/pom.xml | 4 +- sdnr/northbound/oofpcipoc/model/pom.xml | 16 +++---- sdnr/northbound/oofpcipoc/pom.xml | 4 +- sdnr/northbound/oofpcipoc/provider/pom.xml | 4 +- .../OSGI-INF/blueprint/impl-blueprint.xml | 34 ++++++++++++++ sdnr/northbound/pom.xml | 4 +- sdnr/wt/apigateway/feature/pom.xml | 12 ++--- sdnr/wt/apigateway/installer/pom.xml | 4 +- sdnr/wt/apigateway/pom.xml | 4 +- sdnr/wt/apigateway/provider/pom.xml | 4 +- sdnr/wt/devicemanager/feature/pom.xml | 16 ++----- sdnr/wt/devicemanager/installer/pom.xml | 4 +- sdnr/wt/devicemanager/model/pom.xml | 4 +- sdnr/wt/devicemanager/pom.xml | 4 +- sdnr/wt/devicemanager/provider/pom.xml | 5 +-- .../OSGI-INF/blueprint/impl-blueprint.xml | 52 ++++++++++++++++++++++ .../java/org/elasticsearch/bootstrap/JarHell.java | 10 +++++ sdnr/wt/devicemodel/feature/pom.xml | 12 ++--- sdnr/wt/devicemodel/installer/pom.xml | 4 +- sdnr/wt/devicemodel/model/pom.xml | 4 +- sdnr/wt/devicemodel/pom.xml | 4 +- sdnr/wt/featureaggregator/feature/pom.xml | 12 ++--- sdnr/wt/featureaggregator/installer/pom.xml | 4 +- sdnr/wt/featureaggregator/pom.xml | 4 +- sdnr/wt/helpserver/feature/pom.xml | 4 +- sdnr/wt/helpserver/installer/pom.xml | 4 +- sdnr/wt/helpserver/pom.xml | 4 +- sdnr/wt/helpserver/provider/pom.xml | 4 +- sdnr/wt/odlux/apps/apiDemo/pom.xml | 4 +- sdnr/wt/odlux/apps/app-feature/pom.xml | 4 +- sdnr/wt/odlux/apps/app-installer/pom.xml | 4 +- sdnr/wt/odlux/apps/configurationApp/pom.xml | 4 +- sdnr/wt/odlux/apps/connectApp/pom.xml | 4 +- sdnr/wt/odlux/apps/demoApp/pom.xml | 4 +- sdnr/wt/odlux/apps/faultApp/pom.xml | 4 +- sdnr/wt/odlux/apps/helpApp/pom.xml | 4 +- sdnr/wt/odlux/apps/inventoryApp/pom.xml | 4 +- sdnr/wt/odlux/apps/maintenanceApp/pom.xml | 4 +- sdnr/wt/odlux/apps/mediatorApp/pom.xml | 4 +- sdnr/wt/odlux/apps/minimumApp/pom.xml | 4 +- sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml | 4 +- sdnr/wt/odlux/core/features/pom.xml | 12 ++--- sdnr/wt/odlux/core/installer/pom.xml | 4 +- sdnr/wt/odlux/core/model/pom.xml | 4 +- sdnr/wt/odlux/core/pom.xml | 4 +- sdnr/wt/odlux/core/provider/pom.xml | 4 +- sdnr/wt/odlux/framework/pom.xml | 4 +- sdnr/wt/odlux/pom.xml | 4 +- sdnr/wt/pom.xml | 4 +- sdnr/wt/readthedocs/pom.xml | 7 ++- sdnr/wt/websocketmanager2/feature/pom.xml | 12 ++--- sdnr/wt/websocketmanager2/installer/pom.xml | 4 +- sdnr/wt/websocketmanager2/model/pom.xml | 4 +- sdnr/wt/websocketmanager2/pom.xml | 4 +- sdnr/wt/websocketmanager2/provider/pom.xml | 4 +- .../OSGI-INF/blueprint/impl-blueprint.xml | 33 ++++++++++++++ 68 files changed, 331 insertions(+), 181 deletions(-) create mode 100644 sdnr/northbound/energysavings/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml create mode 100644 sdnr/northbound/oofpcipoc/consumer/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml create mode 100644 sdnr/northbound/oofpcipoc/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml create mode 100644 sdnr/wt/devicemanager/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml create mode 100644 sdnr/wt/devicemanager/provider/src/test/java/org/elasticsearch/bootstrap/JarHell.java create mode 100644 sdnr/wt/websocketmanager2/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml (limited to 'sdnr') diff --git a/sdnr/northbound/energysavings/features/pom.xml b/sdnr/northbound/energysavings/features/pom.xml index 03150b184..37ceeb835 100644 --- a/sdnr/northbound/energysavings/features/pom.xml +++ b/sdnr/northbound/energysavings/features/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent feature-repo-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT @@ -16,13 +16,7 @@ - - org.opendaylight.mdsal.model - mdsal-model-artifacts - 0.11.1 - pom - import - + org.opendaylight.controller mdsal-artifacts diff --git a/sdnr/northbound/energysavings/installer/pom.xml b/sdnr/northbound/energysavings/installer/pom.xml index f689d90ad..48febff61 100755 --- a/sdnr/northbound/energysavings/installer/pom.xml +++ b/sdnr/northbound/energysavings/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/sdnr/northbound/energysavings/model/pom.xml b/sdnr/northbound/energysavings/model/pom.xml index 9afa4cc40..7eceab4bf 100644 --- a/sdnr/northbound/energysavings/model/pom.xml +++ b/sdnr/northbound/energysavings/model/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/sdnr/northbound/energysavings/pom.xml b/sdnr/northbound/energysavings/pom.xml index b4bff6065..8812c8f5f 100644 --- a/sdnr/northbound/energysavings/pom.xml +++ b/sdnr/northbound/energysavings/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/sdnr/northbound/energysavings/provider/pom.xml b/sdnr/northbound/energysavings/provider/pom.xml index 9c68876c1..3ce3ce545 100644 --- a/sdnr/northbound/energysavings/provider/pom.xml +++ b/sdnr/northbound/energysavings/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/sdnr/northbound/energysavings/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml b/sdnr/northbound/energysavings/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml new file mode 100644 index 000000000..7dfdc4d35 --- /dev/null +++ b/sdnr/northbound/energysavings/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml @@ -0,0 +1,40 @@ + + + + + + + + >>>>>> 4a0fb45... Rename package to new ccsdk/features repo + init-method="init" destroy-method="close"> + + + + diff --git a/sdnr/northbound/features/ccsdk-features-sdnr-northbound-all/pom.xml b/sdnr/northbound/features/ccsdk-features-sdnr-northbound-all/pom.xml index e06fd214d..c218dece9 100644 --- a/sdnr/northbound/features/ccsdk-features-sdnr-northbound-all/pom.xml +++ b/sdnr/northbound/features/ccsdk-features-sdnr-northbound-all/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent single-feature-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.features.sdnr.northbound sdnr-northbound-all - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT feature ccsdk-features-sdnr-northbound :: features :: ${project.artifactId} diff --git a/sdnr/northbound/features/installer/pom.xml b/sdnr/northbound/features/installer/pom.xml index 797bcee80..bfd10f751 100644 --- a/sdnr/northbound/features/installer/pom.xml +++ b/sdnr/northbound/features/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.features.sdnr.northbound sdnr-northbound-features-installer - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-features-sdnr-northbound :: features :: ${project.artifactId} diff --git a/sdnr/northbound/features/pom.xml b/sdnr/northbound/features/pom.xml index ce55dd9f5..fcb5eeb25 100644 --- a/sdnr/northbound/features/pom.xml +++ b/sdnr/northbound/features/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.features.sdnr.northbound sdnr-northbound-feature-aggregator - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-features-sdnr-northbound :: features diff --git a/sdnr/northbound/oofpcipoc/consumer/pom.xml b/sdnr/northbound/oofpcipoc/consumer/pom.xml index 437f98a06..2b4886283 100644 --- a/sdnr/northbound/oofpcipoc/consumer/pom.xml +++ b/sdnr/northbound/oofpcipoc/consumer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.features.sdnr.northbound oofpcipoc-consumer - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT bundle diff --git a/sdnr/northbound/oofpcipoc/consumer/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml b/sdnr/northbound/oofpcipoc/consumer/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml new file mode 100644 index 000000000..6bb5e3833 --- /dev/null +++ b/sdnr/northbound/oofpcipoc/consumer/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sdnr/northbound/oofpcipoc/feature/pom.xml b/sdnr/northbound/oofpcipoc/feature/pom.xml index 56c23d9a3..351267722 100644 --- a/sdnr/northbound/oofpcipoc/feature/pom.xml +++ b/sdnr/northbound/oofpcipoc/feature/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent single-feature-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.features.sdnr.northbound sdnr-oofpcipoc - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT feature ccsdk-features-sdnr-northbound :: oofpcipoc :: ${project.artifactId} diff --git a/sdnr/northbound/oofpcipoc/installer/pom.xml b/sdnr/northbound/oofpcipoc/installer/pom.xml index 382b6e1ff..eb2f774dd 100644 --- a/sdnr/northbound/oofpcipoc/installer/pom.xml +++ b/sdnr/northbound/oofpcipoc/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.features.sdnr.northbound oofpcipoc-installer - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-features-sdnr-northbound :: oofpcipoc :: ${project.artifactId} diff --git a/sdnr/northbound/oofpcipoc/model/pom.xml b/sdnr/northbound/oofpcipoc/model/pom.xml index 00820b7dd..84ea3130e 100644 --- a/sdnr/northbound/oofpcipoc/model/pom.xml +++ b/sdnr/northbound/oofpcipoc/model/pom.xml @@ -5,24 +5,22 @@ org.onap.ccsdk.parent binding-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.features.sdnr.northbound oofpcipoc-model - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT bundle - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 - - - org.opendaylight.mdsal.model - ietf-yang-types-20130715 - + org.opendaylight.mdsal.binding.model.ietf + rfc6991 + + + diff --git a/sdnr/northbound/oofpcipoc/pom.xml b/sdnr/northbound/oofpcipoc/pom.xml index 0c119c719..b0387f66f 100644 --- a/sdnr/northbound/oofpcipoc/pom.xml +++ b/sdnr/northbound/oofpcipoc/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.features.sdnr.northbound oofpcipoc - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-features-sdnr-northbound :: oofpcipoc diff --git a/sdnr/northbound/oofpcipoc/provider/pom.xml b/sdnr/northbound/oofpcipoc/provider/pom.xml index 34ef1e4d3..015b968a4 100644 --- a/sdnr/northbound/oofpcipoc/provider/pom.xml +++ b/sdnr/northbound/oofpcipoc/provider/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.features.sdnr.northbound oofpcipoc-provider - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT bundle diff --git a/sdnr/northbound/oofpcipoc/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml b/sdnr/northbound/oofpcipoc/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml new file mode 100644 index 000000000..72278ffa2 --- /dev/null +++ b/sdnr/northbound/oofpcipoc/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sdnr/northbound/pom.xml b/sdnr/northbound/pom.xml index cbbd31e34..0ae151aef 100644 --- a/sdnr/northbound/pom.xml +++ b/sdnr/northbound/pom.xml @@ -24,13 +24,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.features.sdnr.northbound sdnr-northbound - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-sdnr-northbound :: features SDN-R RAN and OOF PCI ANR POC diff --git a/sdnr/wt/apigateway/feature/pom.xml b/sdnr/wt/apigateway/feature/pom.xml index 68dbe5ffe..339de5ec4 100644 --- a/sdnr/wt/apigateway/feature/pom.xml +++ b/sdnr/wt/apigateway/feature/pom.xml @@ -26,26 +26,20 @@ org.onap.ccsdk.features.sdnr.wt sdnr-wt-apigateway-feature - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT feature ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature org.onap.ccsdk.parent single-feature-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT - - org.opendaylight.mdsal.model - mdsal-model-artifacts - ${odl.mdsal.model.version} - pom - import - + org.opendaylight.controller mdsal-artifacts diff --git a/sdnr/wt/apigateway/installer/pom.xml b/sdnr/wt/apigateway/installer/pom.xml index 40d5e7983..3c5397f24 100755 --- a/sdnr/wt/apigateway/installer/pom.xml +++ b/sdnr/wt/apigateway/installer/pom.xml @@ -4,14 +4,14 @@ org.onap.ccsdk.features.sdnr.wt sdnr-wt-apigateway-installer - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-features-sdnr-wt :: ${project.artifactId} org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/sdnr/wt/apigateway/pom.xml b/sdnr/wt/apigateway/pom.xml index 137422c0a..d2b3253f9 100755 --- a/sdnr/wt/apigateway/pom.xml +++ b/sdnr/wt/apigateway/pom.xml @@ -26,14 +26,14 @@ org.onap.ccsdk.features.sdnr.wt sdnr-wt-apigateway-top - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-features-sdnr-wt :: ${project.artifactId} org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/sdnr/wt/apigateway/provider/pom.xml b/sdnr/wt/apigateway/provider/pom.xml index 8886a69bc..3367ffd19 100644 --- a/sdnr/wt/apigateway/provider/pom.xml +++ b/sdnr/wt/apigateway/provider/pom.xml @@ -17,7 +17,7 @@ org.onap.ccsdk.features.sdnr.wt sdnr-wt-apigateway-provider - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT ccsdk-features-sdnr-wt :: ${project.artifactId} bundle @@ -26,7 +26,7 @@ org.onap.ccsdk.parent binding-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/sdnr/wt/devicemanager/feature/pom.xml b/sdnr/wt/devicemanager/feature/pom.xml index 8059223ed..266d934b7 100644 --- a/sdnr/wt/devicemanager/feature/pom.xml +++ b/sdnr/wt/devicemanager/feature/pom.xml @@ -21,33 +21,25 @@ * ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.ccsdk.features.sdnr.wt sdnr-wt-devicemanager-feature - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT feature ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature org.onap.ccsdk.parent single-feature-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT - - org.opendaylight.mdsal.model - mdsal-model-artifacts - ${odl.mdsal.model.version} - pom - import - + org.opendaylight.controller mdsal-artifacts diff --git a/sdnr/wt/devicemanager/installer/pom.xml b/sdnr/wt/devicemanager/installer/pom.xml index fb7917f69..873f331ec 100755 --- a/sdnr/wt/devicemanager/installer/pom.xml +++ b/sdnr/wt/devicemanager/installer/pom.xml @@ -27,13 +27,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.features.sdnr.wt sdnr-wt-devicemanager-installer - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-features-sdnr-wt :: ${project.artifactId} diff --git a/sdnr/wt/devicemanager/model/pom.xml b/sdnr/wt/devicemanager/model/pom.xml index 9df45e34d..d8364ec53 100644 --- a/sdnr/wt/devicemanager/model/pom.xml +++ b/sdnr/wt/devicemanager/model/pom.xml @@ -25,14 +25,14 @@ 4.0.0 org.onap.ccsdk.features.sdnr.wt sdnr-wt-devicemanager-model - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT ccsdk-features-sdnr-wt :: ${project.artifactId} bundle org.onap.ccsdk.parent binding-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/sdnr/wt/devicemanager/pom.xml b/sdnr/wt/devicemanager/pom.xml index ef76b1397..3195a79ce 100755 --- a/sdnr/wt/devicemanager/pom.xml +++ b/sdnr/wt/devicemanager/pom.xml @@ -26,14 +26,14 @@ org.onap.ccsdk.features.sdnr.wt sdnr-wt-devicemanager-top - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-features-sdnr-wt :: ${project.artifactId} org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/sdnr/wt/devicemanager/provider/pom.xml b/sdnr/wt/devicemanager/provider/pom.xml index 63dc690be..876e802da 100644 --- a/sdnr/wt/devicemanager/provider/pom.xml +++ b/sdnr/wt/devicemanager/provider/pom.xml @@ -20,14 +20,14 @@ org.onap.ccsdk.features.sdnr.wt sdnr-wt-devicemanager-provider - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT ccsdk-features-sdnr-wt :: ${project.artifactId} bundle org.onap.ccsdk.parent binding-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT @@ -463,4 +463,3 @@ - diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml b/sdnr/wt/devicemanager/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml new file mode 100644 index 000000000..b946e1035 --- /dev/null +++ b/sdnr/wt/devicemanager/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 000000000..4a6913efe --- /dev/null +++ b/sdnr/wt/devicemanager/provider/src/test/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/devicemodel/feature/pom.xml b/sdnr/wt/devicemodel/feature/pom.xml index 5508bd849..fbc0b9268 100644 --- a/sdnr/wt/devicemodel/feature/pom.xml +++ b/sdnr/wt/devicemodel/feature/pom.xml @@ -24,26 +24,20 @@ org.onap.ccsdk.features.sdnr.wt sdnr-wt-devicemodel-feature - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT feature ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature org.onap.ccsdk.parent single-feature-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT - - org.opendaylight.mdsal.model - mdsal-model-artifacts - ${odl.mdsal.model.version} - pom - import - + org.opendaylight.controller mdsal-artifacts diff --git a/sdnr/wt/devicemodel/installer/pom.xml b/sdnr/wt/devicemodel/installer/pom.xml index ccd5507e7..28f2c5484 100755 --- a/sdnr/wt/devicemodel/installer/pom.xml +++ b/sdnr/wt/devicemodel/installer/pom.xml @@ -26,14 +26,14 @@ org.onap.ccsdk.features.sdnr.wt sdnr-wt-devicemodel-installer - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-features-sdnr-wt :: ${project.artifactId} org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/sdnr/wt/devicemodel/model/pom.xml b/sdnr/wt/devicemodel/model/pom.xml index a3a7c0d86..c7d7f19f7 100644 --- a/sdnr/wt/devicemodel/model/pom.xml +++ b/sdnr/wt/devicemodel/model/pom.xml @@ -26,14 +26,14 @@ org.onap.ccsdk.features.sdnr.wt sdnr-wt-devicemodel-model - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT ccsdk-features-sdnr-wt :: ${project.artifactId} bundle org.onap.ccsdk.parent binding-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/sdnr/wt/devicemodel/pom.xml b/sdnr/wt/devicemodel/pom.xml index 2a2b0443f..6048e3519 100755 --- a/sdnr/wt/devicemodel/pom.xml +++ b/sdnr/wt/devicemodel/pom.xml @@ -26,14 +26,14 @@ org.onap.ccsdk.features.sdnr.wt sdnr-wt-devicemodel-top - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-features-sdnr-wt :: ${project.artifactId} org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/sdnr/wt/featureaggregator/feature/pom.xml b/sdnr/wt/featureaggregator/feature/pom.xml index 7f6c0aec8..8b70e8832 100644 --- a/sdnr/wt/featureaggregator/feature/pom.xml +++ b/sdnr/wt/featureaggregator/feature/pom.xml @@ -24,26 +24,20 @@ org.onap.ccsdk.features.sdnr.wt sdnr-wt-feature-aggregator - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT feature ccsdk-features-sdnr-wt :: ${project.artifactId} org.onap.ccsdk.parent single-feature-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT - - org.opendaylight.mdsal.model - mdsal-model-artifacts - ${odl.mdsal.model.version} - pom - import - + org.opendaylight.controller mdsal-artifacts diff --git a/sdnr/wt/featureaggregator/installer/pom.xml b/sdnr/wt/featureaggregator/installer/pom.xml index 0f2644eca..4d4a3830a 100755 --- a/sdnr/wt/featureaggregator/installer/pom.xml +++ b/sdnr/wt/featureaggregator/installer/pom.xml @@ -24,14 +24,14 @@ org.onap.ccsdk.features.sdnr.wt sdnr-wt-feature-aggregator-installer - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-features-sdnr-wt :: ${project.artifactId} org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/sdnr/wt/featureaggregator/pom.xml b/sdnr/wt/featureaggregator/pom.xml index aeebf98ff..9ec6fe0ab 100755 --- a/sdnr/wt/featureaggregator/pom.xml +++ b/sdnr/wt/featureaggregator/pom.xml @@ -24,14 +24,14 @@ org.onap.ccsdk.features.sdnr.wt sdnr-wt-feature-aggregator-top - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-features-sdnr-wt :: ${project.artifactId} org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/sdnr/wt/helpserver/feature/pom.xml b/sdnr/wt/helpserver/feature/pom.xml index 5654c5ba3..6af6838ad 100644 --- a/sdnr/wt/helpserver/feature/pom.xml +++ b/sdnr/wt/helpserver/feature/pom.xml @@ -26,14 +26,14 @@ org.onap.ccsdk.features.sdnr.wt sdnr-wt-helpserver-feature - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT feature ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature org.onap.ccsdk.parent single-feature-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/sdnr/wt/helpserver/installer/pom.xml b/sdnr/wt/helpserver/installer/pom.xml index cdfab667e..8cf3f058c 100755 --- a/sdnr/wt/helpserver/installer/pom.xml +++ b/sdnr/wt/helpserver/installer/pom.xml @@ -4,14 +4,14 @@ org.onap.ccsdk.features.sdnr.wt sdnr-wt-helpserver-installer - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-features-sdnr-wt :: ${project.artifactId} org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/sdnr/wt/helpserver/pom.xml b/sdnr/wt/helpserver/pom.xml index cbdde0c15..76fe13e16 100755 --- a/sdnr/wt/helpserver/pom.xml +++ b/sdnr/wt/helpserver/pom.xml @@ -26,14 +26,14 @@ org.onap.ccsdk.features.sdnr.wt sdnr-wt-helpserver-top - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-features-sdnr-wt :: ${project.artifactId} org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/sdnr/wt/helpserver/provider/pom.xml b/sdnr/wt/helpserver/provider/pom.xml index 4722b834d..9f68028e3 100644 --- a/sdnr/wt/helpserver/provider/pom.xml +++ b/sdnr/wt/helpserver/provider/pom.xml @@ -17,7 +17,7 @@ org.onap.ccsdk.features.sdnr.wt sdnr-wt-helpserver-provider - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT ccsdk-features-sdnr-wt :: ${project.artifactId} bundle @@ -26,7 +26,7 @@ org.onap.ccsdk.parent binding-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/sdnr/wt/odlux/apps/apiDemo/pom.xml b/sdnr/wt/odlux/apps/apiDemo/pom.xml index 3fcb3b728..9e99a4103 100644 --- a/sdnr/wt/odlux/apps/apiDemo/pom.xml +++ b/sdnr/wt/odlux/apps/apiDemo/pom.xml @@ -4,13 +4,13 @@ org.onap.ccsdk.parent odlparent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT 4.0.0 org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-apiDemo - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT bundle sdnr-wt-odlux-app-apiDemo diff --git a/sdnr/wt/odlux/apps/app-feature/pom.xml b/sdnr/wt/odlux/apps/app-feature/pom.xml index 0baee6595..6d865ebd3 100644 --- a/sdnr/wt/odlux/apps/app-feature/pom.xml +++ b/sdnr/wt/odlux/apps/app-feature/pom.xml @@ -16,14 +16,14 @@ org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-apps-feature - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT feature ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature org.onap.ccsdk.parent single-feature-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/sdnr/wt/odlux/apps/app-installer/pom.xml b/sdnr/wt/odlux/apps/app-installer/pom.xml index 1994619ab..ede8c85e2 100755 --- a/sdnr/wt/odlux/apps/app-installer/pom.xml +++ b/sdnr/wt/odlux/apps/app-installer/pom.xml @@ -4,14 +4,14 @@ org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-apps-installer - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-features-sdnr-wt :: ${project.artifactId} org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/sdnr/wt/odlux/apps/configurationApp/pom.xml b/sdnr/wt/odlux/apps/configurationApp/pom.xml index ec010e79a..3bd2c10d2 100644 --- a/sdnr/wt/odlux/apps/configurationApp/pom.xml +++ b/sdnr/wt/odlux/apps/configurationApp/pom.xml @@ -4,13 +4,13 @@ org.onap.ccsdk.parent odlparent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT 4.0.0 org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-configurationApp - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT bundle sdnr-wt-odlux-app-configurationApp diff --git a/sdnr/wt/odlux/apps/connectApp/pom.xml b/sdnr/wt/odlux/apps/connectApp/pom.xml index 4b0c7c362..829c968b0 100644 --- a/sdnr/wt/odlux/apps/connectApp/pom.xml +++ b/sdnr/wt/odlux/apps/connectApp/pom.xml @@ -4,13 +4,13 @@ org.onap.ccsdk.parent odlparent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT 4.0.0 org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-connectApp - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT bundle sdnr-wt-odlux-app-connectApp diff --git a/sdnr/wt/odlux/apps/demoApp/pom.xml b/sdnr/wt/odlux/apps/demoApp/pom.xml index fc338c158..de2fbfc90 100644 --- a/sdnr/wt/odlux/apps/demoApp/pom.xml +++ b/sdnr/wt/odlux/apps/demoApp/pom.xml @@ -4,13 +4,13 @@ org.onap.ccsdk.parent odlparent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT 4.0.0 org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-demoApp - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT bundle sdnr-wt-odlux-app-demoApp diff --git a/sdnr/wt/odlux/apps/faultApp/pom.xml b/sdnr/wt/odlux/apps/faultApp/pom.xml index 436b2cf4f..c9a9d5328 100644 --- a/sdnr/wt/odlux/apps/faultApp/pom.xml +++ b/sdnr/wt/odlux/apps/faultApp/pom.xml @@ -4,14 +4,14 @@ org.onap.ccsdk.parent odlparent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT 4.0.0 org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-faultApp - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT bundle sdnr-wt-odlux-app-faultApp diff --git a/sdnr/wt/odlux/apps/helpApp/pom.xml b/sdnr/wt/odlux/apps/helpApp/pom.xml index bc2b5c87b..2ec7e1883 100644 --- a/sdnr/wt/odlux/apps/helpApp/pom.xml +++ b/sdnr/wt/odlux/apps/helpApp/pom.xml @@ -4,13 +4,13 @@ org.onap.ccsdk.parent odlparent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT 4.0.0 org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-helpApp - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT bundle sdnr-wt-odlux-app-helpApp diff --git a/sdnr/wt/odlux/apps/inventoryApp/pom.xml b/sdnr/wt/odlux/apps/inventoryApp/pom.xml index d5072497b..1184196c2 100644 --- a/sdnr/wt/odlux/apps/inventoryApp/pom.xml +++ b/sdnr/wt/odlux/apps/inventoryApp/pom.xml @@ -4,13 +4,13 @@ org.onap.ccsdk.parent odlparent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT 4.0.0 org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-inventoryApp - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT bundle sdnr-wt-odlux-app-inventoryApp diff --git a/sdnr/wt/odlux/apps/maintenanceApp/pom.xml b/sdnr/wt/odlux/apps/maintenanceApp/pom.xml index 1b72de5ad..160ebb54b 100644 --- a/sdnr/wt/odlux/apps/maintenanceApp/pom.xml +++ b/sdnr/wt/odlux/apps/maintenanceApp/pom.xml @@ -4,13 +4,13 @@ org.onap.ccsdk.parent odlparent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT 4.0.0 org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-maintenanceApp - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT bundle sdnr-wt-odlux-app-maintenanceApp diff --git a/sdnr/wt/odlux/apps/mediatorApp/pom.xml b/sdnr/wt/odlux/apps/mediatorApp/pom.xml index 96c9ef5cf..4c48ce0dc 100644 --- a/sdnr/wt/odlux/apps/mediatorApp/pom.xml +++ b/sdnr/wt/odlux/apps/mediatorApp/pom.xml @@ -4,14 +4,14 @@ org.onap.ccsdk.parent odlparent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT 4.0.0 org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-mediatorApp - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT bundle sdnr-wt-odlux-app-mediatorApp diff --git a/sdnr/wt/odlux/apps/minimumApp/pom.xml b/sdnr/wt/odlux/apps/minimumApp/pom.xml index c55ccfc24..fb4d81e7d 100644 --- a/sdnr/wt/odlux/apps/minimumApp/pom.xml +++ b/sdnr/wt/odlux/apps/minimumApp/pom.xml @@ -4,13 +4,13 @@ org.onap.ccsdk.parent odlparent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT 4.0.0 org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-minimumApp - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT bundle sdnr-wt-odlux-app-minimumApp diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml b/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml index 45d76796d..942fd9451 100644 --- a/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml +++ b/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml @@ -4,13 +4,13 @@ org.onap.ccsdk.parent odlparent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT 4.0.0 org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-app-performanceHistoryApp - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT bundle sdnr-wt-odlux-app-performanceHistoryApp diff --git a/sdnr/wt/odlux/core/features/pom.xml b/sdnr/wt/odlux/core/features/pom.xml index b24c6dec4..083c03cb9 100644 --- a/sdnr/wt/odlux/core/features/pom.xml +++ b/sdnr/wt/odlux/core/features/pom.xml @@ -16,14 +16,14 @@ org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-core-feature - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT feature ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature org.onap.ccsdk.parent single-feature-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT @@ -35,13 +35,7 @@ - - org.opendaylight.mdsal.model - mdsal-model-artifacts - ${odl.mdsal.model.version} - pom - import - + org.opendaylight.controller mdsal-artifacts diff --git a/sdnr/wt/odlux/core/installer/pom.xml b/sdnr/wt/odlux/core/installer/pom.xml index f3c9ab637..422a121c6 100755 --- a/sdnr/wt/odlux/core/installer/pom.xml +++ b/sdnr/wt/odlux/core/installer/pom.xml @@ -4,14 +4,14 @@ org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-core-installer - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-features-sdnr-wt :: ${project.artifactId} org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/sdnr/wt/odlux/core/model/pom.xml b/sdnr/wt/odlux/core/model/pom.xml index af41a421a..919915281 100644 --- a/sdnr/wt/odlux/core/model/pom.xml +++ b/sdnr/wt/odlux/core/model/pom.xml @@ -4,14 +4,14 @@ org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-core-model - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT ccsdk-features-sdnr-wt :: ${project.artifactId} bundle org.onap.ccsdk.parent binding-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/sdnr/wt/odlux/core/pom.xml b/sdnr/wt/odlux/core/pom.xml index e56ec82de..63c136d46 100644 --- a/sdnr/wt/odlux/core/pom.xml +++ b/sdnr/wt/odlux/core/pom.xml @@ -4,7 +4,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT @@ -12,7 +12,7 @@ 4.0.0 org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-core-top - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom odlux-core diff --git a/sdnr/wt/odlux/core/provider/pom.xml b/sdnr/wt/odlux/core/provider/pom.xml index ea8e3eb29..0e1fe9ac7 100644 --- a/sdnr/wt/odlux/core/provider/pom.xml +++ b/sdnr/wt/odlux/core/provider/pom.xml @@ -4,14 +4,14 @@ org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-core-provider - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT ccsdk-features-sdnr-wt :: ${project.artifactId} bundle org.onap.ccsdk.parent binding-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/sdnr/wt/odlux/framework/pom.xml b/sdnr/wt/odlux/framework/pom.xml index da369e018..c19eba7bb 100644 --- a/sdnr/wt/odlux/framework/pom.xml +++ b/sdnr/wt/odlux/framework/pom.xml @@ -4,13 +4,13 @@ org.onap.ccsdk.parent odlparent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT 4.0.0 org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-framework - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT jar sdnr-wt-odlux-framework diff --git a/sdnr/wt/odlux/pom.xml b/sdnr/wt/odlux/pom.xml index fec9f6ab8..e4af48516 100644 --- a/sdnr/wt/odlux/pom.xml +++ b/sdnr/wt/odlux/pom.xml @@ -4,7 +4,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT @@ -12,7 +12,7 @@ 4.0.0 org.onap.ccsdk.features.sdnr.wt odlux-top - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom odlux diff --git a/sdnr/wt/pom.xml b/sdnr/wt/pom.xml index 9d6389723..314d39c4c 100644 --- a/sdnr/wt/pom.xml +++ b/sdnr/wt/pom.xml @@ -24,13 +24,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.features.sdnr.wt sdnr-wt - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-sdnr-wireless transport :: micro-services SDN-R wireless transport micro-services diff --git a/sdnr/wt/readthedocs/pom.xml b/sdnr/wt/readthedocs/pom.xml index 9450cd800..856b58628 100644 --- a/sdnr/wt/readthedocs/pom.xml +++ b/sdnr/wt/readthedocs/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.onap.ccsdk.features.sdnr.wt @@ -12,8 +11,8 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.2 - + 1.4.0-SNAPSHOT + diff --git a/sdnr/wt/websocketmanager2/feature/pom.xml b/sdnr/wt/websocketmanager2/feature/pom.xml index fb7f62289..a31e1e809 100644 --- a/sdnr/wt/websocketmanager2/feature/pom.xml +++ b/sdnr/wt/websocketmanager2/feature/pom.xml @@ -26,26 +26,20 @@ org.onap.ccsdk.features.sdnr.wt sdnr-wt-websocketmanager2-feature - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT feature ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature org.onap.ccsdk.parent single-feature-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT - - org.opendaylight.mdsal.model - mdsal-model-artifacts - ${odl.mdsal.model.version} - pom - import - + org.opendaylight.controller mdsal-artifacts diff --git a/sdnr/wt/websocketmanager2/installer/pom.xml b/sdnr/wt/websocketmanager2/installer/pom.xml index 75fd80b89..c15e26241 100755 --- a/sdnr/wt/websocketmanager2/installer/pom.xml +++ b/sdnr/wt/websocketmanager2/installer/pom.xml @@ -26,14 +26,14 @@ org.onap.ccsdk.features.sdnr.wt sdnr-wt-websocketmanager2-installer - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-features-sdnr-wt :: ${project.artifactId} org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/sdnr/wt/websocketmanager2/model/pom.xml b/sdnr/wt/websocketmanager2/model/pom.xml index 8161374a2..e5bdfab58 100644 --- a/sdnr/wt/websocketmanager2/model/pom.xml +++ b/sdnr/wt/websocketmanager2/model/pom.xml @@ -25,13 +25,13 @@ 4.0.0 org.onap.ccsdk.features.sdnr.wt sdnr-wt-websocketmanager2-model - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT bundle ccsdk-features-sdnr-wt :: ${project.artifactId} org.onap.ccsdk.parent binding-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/sdnr/wt/websocketmanager2/pom.xml b/sdnr/wt/websocketmanager2/pom.xml index 3581a41c5..9974bf562 100755 --- a/sdnr/wt/websocketmanager2/pom.xml +++ b/sdnr/wt/websocketmanager2/pom.xml @@ -26,14 +26,14 @@ org.onap.ccsdk.features.sdnr.wt sdnr-wt-websocketmanager2-top - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-features-sdnr-wt :: ${project.artifactId} org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/sdnr/wt/websocketmanager2/provider/pom.xml b/sdnr/wt/websocketmanager2/provider/pom.xml index a454245d0..ecf36e33a 100644 --- a/sdnr/wt/websocketmanager2/provider/pom.xml +++ b/sdnr/wt/websocketmanager2/provider/pom.xml @@ -14,13 +14,13 @@ 4.0.0 org.onap.ccsdk.features.sdnr.wt sdnr-wt-websocketmanager2-provider - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT ccsdk-features-sdnr-wt :: ${project.artifactId} bundle org.onap.ccsdk.parent binding-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/sdnr/wt/websocketmanager2/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml b/sdnr/wt/websocketmanager2/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml new file mode 100644 index 000000000..5e95b7b74 --- /dev/null +++ b/sdnr/wt/websocketmanager2/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + -- cgit 1.2.3-korg