From: Michael DÜrre Date: Thu, 1 Jul 2021 07:11:48 +0000 (+0200) Subject: fix more sdnr startup problems X-Git-Tag: 1.2.0~33 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=6950b473ff100653cf726ce2c3f8fe54a8076cfa;p=ccsdk%2Ffeatures.git fix more sdnr startup problems cleaned up devmgr and odlux bundles Issue-ID: CCSDK-3362 Signed-off-by: Michael DÜrre Change-Id: Ic27852a7a66cef7fb6c5790a6f523240efe24a46 Signed-off-by: Michael DÜrre --- diff --git a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/yang/nc-notifications@2008-07-14.yang b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/yang/nc-notifications@2008-07-14.yang deleted file mode 100644 index 9ef5ed088..000000000 --- a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/yang/nc-notifications@2008-07-14.yang +++ /dev/null @@ -1,95 +0,0 @@ -module nc-notifications { - - namespace "urn:ietf:params:xml:ns:netmod:notification"; - prefix "manageEvent"; - - import ietf-yang-types{ prefix yang; } - import notifications { prefix ncEvent; } - - organization - "IETF NETCONF WG"; - - contact - "netconf@ietf.org"; - - description - "Conversion of the 'manageEvent' XSD in the NETCONF - Notifications RFC."; - - reference - "RFC 5277"; - - revision 2008-07-14 { - description "RFC 5277 version."; - } - - container netconf { - description "Top-level element in the notification namespace"; - - config false; - - container streams { - description - "The list of event streams supported by the system. When - a query is issued, the returned set of streams is - determined based on user privileges."; - - list stream { - description - "Stream name, description and other information."; - key name; - min-elements 1; - - leaf name { - description - "The name of the event stream. If this is the default - NETCONF stream, this must have the value 'NETCONF'."; - type ncEvent:streamNameType; - } - - leaf description { - description - "A description of the event stream, including such - information as the type of events that are sent over - this stream."; - type string; - mandatory true; - } - - leaf replaySupport { - description - "A description of the event stream, including such - information as the type of events that are sent over - this stream."; - type boolean; - mandatory true; - } - - leaf replayLogCreationTime { - description - "The timestamp of the creation of the log used to support - the replay function on this stream. Note that this might - be earlier then the earliest available notification in - the log. This object is updated if the log resets for - some reason. This object MUST be present if replay is - supported."; - type yang:date-and-time; // xsd:dateTime is wrong! - } - } - } - } - - notification replayComplete { - description - "This notification is sent to signal the end of a replay - portion of a subscription."; - } - - notification notificationComplete { - description - "This notification is sent to signal the end of a notification - subscription. It is sent in the case that stopTime was - specified during the creation of the subscription.."; - } - -} \ No newline at end of file diff --git a/sdnr/wt/odlux/apps/apiDemo/pom.xml b/sdnr/wt/odlux/apps/apiDemo/pom.xml index bc8027a02..c66b116e7 100644 --- a/sdnr/wt/odlux/apps/apiDemo/pom.xml +++ b/sdnr/wt/odlux/apps/apiDemo/pom.xml @@ -25,7 +25,7 @@ org.onap.ccsdk.parent - odlparent + binding-parent 2.2.0-SNAPSHOT @@ -163,21 +163,6 @@ - - org.apache.maven.plugins - maven-jar-plugin - - - org.apache.felix - maven-bundle-plugin - true - - - org.onap.ccsdk.features.sdnr.wt.odlux.model.*,com.opensymphony.* - - - - diff --git a/sdnr/wt/odlux/apps/configurationApp/pom.xml b/sdnr/wt/odlux/apps/configurationApp/pom.xml index d6a3609ad..bc6bb5da4 100644 --- a/sdnr/wt/odlux/apps/configurationApp/pom.xml +++ b/sdnr/wt/odlux/apps/configurationApp/pom.xml @@ -25,7 +25,7 @@ org.onap.ccsdk.parent - odlparent + binding-parent 2.2.0-SNAPSHOT @@ -155,21 +155,6 @@ - - org.apache.maven.plugins - maven-jar-plugin - - - org.apache.felix - maven-bundle-plugin - true - - - org.onap.ccsdk.features.sdnr.wt.odlux.model.*,com.opensymphony.* - - - - diff --git a/sdnr/wt/odlux/apps/connectApp/pom.xml b/sdnr/wt/odlux/apps/connectApp/pom.xml index 7cb3b90f1..e3ca9dd4d 100644 --- a/sdnr/wt/odlux/apps/connectApp/pom.xml +++ b/sdnr/wt/odlux/apps/connectApp/pom.xml @@ -25,7 +25,7 @@ org.onap.ccsdk.parent - odlparent + binding-parent 2.2.0-SNAPSHOT @@ -155,21 +155,6 @@ - - org.apache.maven.plugins - maven-jar-plugin - - - org.apache.felix - maven-bundle-plugin - true - - - org.onap.ccsdk.features.sdnr.wt.odlux.model.*,com.opensymphony.* - - - - diff --git a/sdnr/wt/odlux/apps/demoApp/pom.xml b/sdnr/wt/odlux/apps/demoApp/pom.xml index 2f51bf132..dae67b17b 100644 --- a/sdnr/wt/odlux/apps/demoApp/pom.xml +++ b/sdnr/wt/odlux/apps/demoApp/pom.xml @@ -25,7 +25,7 @@ org.onap.ccsdk.parent - odlparent + binding-parent 2.2.0-SNAPSHOT @@ -159,17 +159,6 @@ org.apache.maven.plugins maven-jar-plugin - - org.apache.felix - maven-bundle-plugin - true - - - org.onap.ccsdk.features.sdnr.wt.odlux.model.*,com.opensymphony.* - - - - diff --git a/sdnr/wt/odlux/apps/eventLogApp/pom.xml b/sdnr/wt/odlux/apps/eventLogApp/pom.xml index e28072ce8..0b061a5b9 100644 --- a/sdnr/wt/odlux/apps/eventLogApp/pom.xml +++ b/sdnr/wt/odlux/apps/eventLogApp/pom.xml @@ -25,7 +25,7 @@ org.onap.ccsdk.parent - odlparent + binding-parent 2.2.0-SNAPSHOT @@ -155,21 +155,6 @@ - - org.apache.maven.plugins - maven-jar-plugin - - - org.apache.felix - maven-bundle-plugin - true - - - org.onap.ccsdk.features.sdnr.wt.odlux.model.*,com.opensymphony.* - - - - diff --git a/sdnr/wt/odlux/apps/faultApp/pom.xml b/sdnr/wt/odlux/apps/faultApp/pom.xml index 31a745a2f..63236dab4 100644 --- a/sdnr/wt/odlux/apps/faultApp/pom.xml +++ b/sdnr/wt/odlux/apps/faultApp/pom.xml @@ -25,7 +25,7 @@ org.onap.ccsdk.parent - odlparent + binding-parent 2.2.0-SNAPSHOT @@ -155,21 +155,6 @@ - - org.apache.maven.plugins - maven-jar-plugin - - - org.apache.felix - maven-bundle-plugin - true - - - org.onap.ccsdk.features.sdnr.wt.odlux.model.*,com.opensymphony.* - - - - diff --git a/sdnr/wt/odlux/apps/helpApp/pom.xml b/sdnr/wt/odlux/apps/helpApp/pom.xml index c3d90cb2c..da49a7850 100644 --- a/sdnr/wt/odlux/apps/helpApp/pom.xml +++ b/sdnr/wt/odlux/apps/helpApp/pom.xml @@ -25,7 +25,7 @@ org.onap.ccsdk.parent - odlparent + binding-parent 2.2.0-SNAPSHOT @@ -155,21 +155,6 @@ - - org.apache.maven.plugins - maven-jar-plugin - - - org.apache.felix - maven-bundle-plugin - true - - - org.onap.ccsdk.features.sdnr.wt.odlux.model.*,com.opensymphony.* - - - - diff --git a/sdnr/wt/odlux/apps/inventoryApp/pom.xml b/sdnr/wt/odlux/apps/inventoryApp/pom.xml index 0189cceda..2701e04ed 100644 --- a/sdnr/wt/odlux/apps/inventoryApp/pom.xml +++ b/sdnr/wt/odlux/apps/inventoryApp/pom.xml @@ -25,7 +25,7 @@ org.onap.ccsdk.parent - odlparent + binding-parent 2.2.0-SNAPSHOT @@ -155,21 +155,6 @@ - - org.apache.maven.plugins - maven-jar-plugin - - - org.apache.felix - maven-bundle-plugin - true - - - org.onap.ccsdk.features.sdnr.wt.odlux.model.*,com.opensymphony.* - - - - diff --git a/sdnr/wt/odlux/apps/linkCalculationApp/pom.xml b/sdnr/wt/odlux/apps/linkCalculationApp/pom.xml index a11e76722..5467c8b5d 100644 --- a/sdnr/wt/odlux/apps/linkCalculationApp/pom.xml +++ b/sdnr/wt/odlux/apps/linkCalculationApp/pom.xml @@ -25,7 +25,7 @@ org.onap.ccsdk.parent - odlparent + binding-parent 2.2.0-SNAPSHOT @@ -155,21 +155,6 @@ - - org.apache.maven.plugins - maven-jar-plugin - - - org.apache.felix - maven-bundle-plugin - true - - - org.onap.ccsdk.features.sdnr.wt.odlux.model.*,com.opensymphony.* - - - - diff --git a/sdnr/wt/odlux/apps/maintenanceApp/pom.xml b/sdnr/wt/odlux/apps/maintenanceApp/pom.xml index 2644e07e9..29eec4bed 100644 --- a/sdnr/wt/odlux/apps/maintenanceApp/pom.xml +++ b/sdnr/wt/odlux/apps/maintenanceApp/pom.xml @@ -25,7 +25,7 @@ org.onap.ccsdk.parent - odlparent + binding-parent 2.2.0-SNAPSHOT @@ -155,21 +155,6 @@ - - org.apache.maven.plugins - maven-jar-plugin - - - org.apache.felix - maven-bundle-plugin - true - - - org.onap.ccsdk.features.sdnr.wt.odlux.model.*,com.opensymphony.* - - - - diff --git a/sdnr/wt/odlux/apps/mediatorApp/pom.xml b/sdnr/wt/odlux/apps/mediatorApp/pom.xml index 1bc29ad82..9d593dc90 100644 --- a/sdnr/wt/odlux/apps/mediatorApp/pom.xml +++ b/sdnr/wt/odlux/apps/mediatorApp/pom.xml @@ -25,7 +25,7 @@ org.onap.ccsdk.parent - odlparent + binding-parent 2.2.0-SNAPSHOT @@ -155,21 +155,6 @@ - - org.apache.maven.plugins - maven-jar-plugin - - - org.apache.felix - maven-bundle-plugin - true - - - org.onap.ccsdk.features.sdnr.wt.odlux.model.*,com.opensymphony.* - - - - diff --git a/sdnr/wt/odlux/apps/minimumApp/pom.xml b/sdnr/wt/odlux/apps/minimumApp/pom.xml index 09131a69e..dd9504be1 100644 --- a/sdnr/wt/odlux/apps/minimumApp/pom.xml +++ b/sdnr/wt/odlux/apps/minimumApp/pom.xml @@ -25,7 +25,7 @@ org.onap.ccsdk.parent - odlparent + binding-parent 2.2.0-SNAPSHOT @@ -155,21 +155,6 @@ - - org.apache.maven.plugins - maven-jar-plugin - - - org.apache.felix - maven-bundle-plugin - true - - - org.onap.ccsdk.features.sdnr.wt.odlux.model.*,com.opensymphony.* - - - - diff --git a/sdnr/wt/odlux/apps/networkMapApp/pom.xml b/sdnr/wt/odlux/apps/networkMapApp/pom.xml index 40263a8b8..8284149e0 100644 --- a/sdnr/wt/odlux/apps/networkMapApp/pom.xml +++ b/sdnr/wt/odlux/apps/networkMapApp/pom.xml @@ -25,7 +25,7 @@ org.onap.ccsdk.parent - odlparent + binding-parent 2.2.0-SNAPSHOT @@ -155,21 +155,6 @@ - - org.apache.maven.plugins - maven-jar-plugin - - - org.apache.felix - maven-bundle-plugin - true - - - org.onap.ccsdk.features.sdnr.wt.odlux.model.*,com.opensymphony.* - - - - diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml b/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml index 7f6c6cc65..cb4cfefde 100644 --- a/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml +++ b/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml @@ -25,7 +25,7 @@ org.onap.ccsdk.parent - odlparent + binding-parent 2.2.0-SNAPSHOT @@ -155,21 +155,6 @@ - - org.apache.maven.plugins - maven-jar-plugin - - - org.apache.felix - maven-bundle-plugin - true - - - org.onap.ccsdk.features.sdnr.wt.odlux.model.*,com.opensymphony.* - - - - diff --git a/sdnr/wt/odlux/core/features/pom.xml b/sdnr/wt/odlux/core/features/pom.xml index 5d81f954c..051de3d0a 100644 --- a/sdnr/wt/odlux/core/features/pom.xml +++ b/sdnr/wt/odlux/core/features/pom.xml @@ -48,6 +48,11 @@ + + ${project.groupId} + sdnr-wt-odlux-core-model + ${project.version} + ${project.groupId} sdnr-wt-odlux-core-provider diff --git a/sdnr/wt/odlux/core/model/pom.xml b/sdnr/wt/odlux/core/model/pom.xml index 5577db8c8..9ac9d270e 100644 --- a/sdnr/wt/odlux/core/model/pom.xml +++ b/sdnr/wt/odlux/core/model/pom.xml @@ -60,22 +60,5 @@ org.slf4j slf4j-api - - - - - - org.apache.felix - maven-bundle-plugin - true - - - * - org.onap.ccsdk.features.sdnr.wt.odlux.*,com.opensymphony.* - - - - - diff --git a/sdnr/wt/odlux/core/provider/pom.xml b/sdnr/wt/odlux/core/provider/pom.xml index fc803df96..3ad6488ea 100644 --- a/sdnr/wt/odlux/core/provider/pom.xml +++ b/sdnr/wt/odlux/core/provider/pom.xml @@ -58,6 +58,7 @@ org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-core-model ${project.version} + provided ${project.groupId} @@ -126,7 +127,6 @@ sdnr-wt-odlux-framework;inline=true true - ${project.groupId}.*