fix more sdnr startup problems 84/122384/1
authorMichael DÜrre <michael.duerre@highstreet-technologies.com>
Thu, 1 Jul 2021 07:11:48 +0000 (09:11 +0200)
committerMichael DÜrre <michael.duerre@highstreet-technologies.com>
Thu, 1 Jul 2021 07:12:01 +0000 (09:12 +0200)
cleaned up devmgr and odlux bundles

Issue-ID: CCSDK-3362
Signed-off-by: Michael DÜrre <michael.duerre@highstreet-technologies.com>
Change-Id: Ic27852a7a66cef7fb6c5790a6f523240efe24a46
Signed-off-by: Michael DÜrre <michael.duerre@highstreet-technologies.com>
18 files changed:
sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/yang/nc-notifications@2008-07-14.yang [deleted file]
sdnr/wt/odlux/apps/apiDemo/pom.xml
sdnr/wt/odlux/apps/configurationApp/pom.xml
sdnr/wt/odlux/apps/connectApp/pom.xml
sdnr/wt/odlux/apps/demoApp/pom.xml
sdnr/wt/odlux/apps/eventLogApp/pom.xml
sdnr/wt/odlux/apps/faultApp/pom.xml
sdnr/wt/odlux/apps/helpApp/pom.xml
sdnr/wt/odlux/apps/inventoryApp/pom.xml
sdnr/wt/odlux/apps/linkCalculationApp/pom.xml
sdnr/wt/odlux/apps/maintenanceApp/pom.xml
sdnr/wt/odlux/apps/mediatorApp/pom.xml
sdnr/wt/odlux/apps/minimumApp/pom.xml
sdnr/wt/odlux/apps/networkMapApp/pom.xml
sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml
sdnr/wt/odlux/core/features/pom.xml
sdnr/wt/odlux/core/model/pom.xml
sdnr/wt/odlux/core/provider/pom.xml

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 (file)
index 9ef5ed0..0000000
+++ /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
index bc8027a..c66b116 100644 (file)
@@ -25,7 +25,7 @@
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent</artifactId>
+        <artifactId>binding-parent</artifactId>
         <version>2.2.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Import-Package>org.onap.ccsdk.features.sdnr.wt.odlux.model.*,com.opensymphony.*</Import-Package>
-                        <Private-Package/>
-                    </instructions>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
index d6a3609..bc6bb5d 100644 (file)
@@ -25,7 +25,7 @@
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent</artifactId>
+        <artifactId>binding-parent</artifactId>
         <version>2.2.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Import-Package>org.onap.ccsdk.features.sdnr.wt.odlux.model.*,com.opensymphony.*</Import-Package>
-                        <Private-Package/>
-                    </instructions>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
index 7cb3b90..e3ca9dd 100644 (file)
@@ -25,7 +25,7 @@
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent</artifactId>
+        <artifactId>binding-parent</artifactId>
         <version>2.2.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Import-Package>org.onap.ccsdk.features.sdnr.wt.odlux.model.*,com.opensymphony.*</Import-Package>
-                        <Private-Package/>
-                    </instructions>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
index 2f51bf1..dae67b1 100644 (file)
@@ -25,7 +25,7 @@
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent</artifactId>
+        <artifactId>binding-parent</artifactId>
         <version>2.2.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Import-Package>org.onap.ccsdk.features.sdnr.wt.odlux.model.*,com.opensymphony.*</Import-Package>
-                        <Private-Package/>
-                    </instructions>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
index e28072c..0b061a5 100644 (file)
@@ -25,7 +25,7 @@
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent</artifactId>
+        <artifactId>binding-parent</artifactId>
         <version>2.2.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Import-Package>org.onap.ccsdk.features.sdnr.wt.odlux.model.*,com.opensymphony.*</Import-Package>
-                        <Private-Package/>
-                    </instructions>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
index 31a745a..63236da 100644 (file)
@@ -25,7 +25,7 @@
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent</artifactId>
+        <artifactId>binding-parent</artifactId>
         <version>2.2.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Import-Package>org.onap.ccsdk.features.sdnr.wt.odlux.model.*,com.opensymphony.*</Import-Package>
-                        <Private-Package/>
-                    </instructions>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
index c3d90cb..da49a78 100644 (file)
@@ -25,7 +25,7 @@
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent</artifactId>
+        <artifactId>binding-parent</artifactId>
         <version>2.2.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Import-Package>org.onap.ccsdk.features.sdnr.wt.odlux.model.*,com.opensymphony.*</Import-Package>
-                        <Private-Package/>
-                    </instructions>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
index 0189cce..2701e04 100644 (file)
@@ -25,7 +25,7 @@
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent</artifactId>
+        <artifactId>binding-parent</artifactId>
         <version>2.2.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Import-Package>org.onap.ccsdk.features.sdnr.wt.odlux.model.*,com.opensymphony.*</Import-Package>
-                        <Private-Package/>
-                    </instructions>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
index a11e767..5467c8b 100644 (file)
@@ -25,7 +25,7 @@
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent</artifactId>
+        <artifactId>binding-parent</artifactId>
         <version>2.2.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Import-Package>org.onap.ccsdk.features.sdnr.wt.odlux.model.*,com.opensymphony.*</Import-Package>
-                        <Private-Package/>
-                    </instructions>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
index 2644e07..29eec4b 100644 (file)
@@ -25,7 +25,7 @@
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent</artifactId>
+        <artifactId>binding-parent</artifactId>
         <version>2.2.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Import-Package>org.onap.ccsdk.features.sdnr.wt.odlux.model.*,com.opensymphony.*</Import-Package>
-                        <Private-Package/>
-                    </instructions>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
index 1bc29ad..9d593dc 100644 (file)
@@ -25,7 +25,7 @@
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent</artifactId>
+        <artifactId>binding-parent</artifactId>
         <version>2.2.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Import-Package>org.onap.ccsdk.features.sdnr.wt.odlux.model.*,com.opensymphony.*</Import-Package>
-                        <Private-Package/>
-                    </instructions>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
index 09131a6..dd9504b 100644 (file)
@@ -25,7 +25,7 @@
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent</artifactId>
+        <artifactId>binding-parent</artifactId>
         <version>2.2.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Import-Package>org.onap.ccsdk.features.sdnr.wt.odlux.model.*,com.opensymphony.*</Import-Package>
-                        <Private-Package/>
-                    </instructions>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
index 40263a8..8284149 100644 (file)
@@ -25,7 +25,7 @@
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent</artifactId>
+        <artifactId>binding-parent</artifactId>
         <version>2.2.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Import-Package>org.onap.ccsdk.features.sdnr.wt.odlux.model.*,com.opensymphony.*</Import-Package>
-                        <Private-Package/>
-                    </instructions>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
index 7f6c6cc..cb4cfef 100644 (file)
@@ -25,7 +25,7 @@
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent</artifactId>
+        <artifactId>binding-parent</artifactId>
         <version>2.2.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Import-Package>org.onap.ccsdk.features.sdnr.wt.odlux.model.*,com.opensymphony.*</Import-Package>
-                        <Private-Package/>
-                    </instructions>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
index 5d81f95..051de3d 100644 (file)
 
     <dependencies>
 
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-odlux-core-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>sdnr-wt-odlux-core-provider</artifactId>
index 5577db8..9ac9d27 100644 (file)
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
-
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Import-Package>*</Import-Package>
-                        <Export-Package>org.onap.ccsdk.features.sdnr.wt.odlux.*,com.opensymphony.*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>
index fc803df..3ad6488 100644 (file)
@@ -58,6 +58,7 @@
             <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
             <artifactId>sdnr-wt-odlux-core-model</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
                         </Import-Package>
                         <Embed-Dependency>sdnr-wt-odlux-framework;inline=true</Embed-Dependency>
                         <Embed-Transitive>true</Embed-Transitive>
-                        <Export-Package>${project.groupId}.*</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>