Remove unnecessary stuff from northbound directory of A1 controller 28/3428/5
authorRehanRaza <muhammad.rehan.raza@est.tech>
Thu, 23 Apr 2020 09:56:39 +0000 (11:56 +0200)
committerRehanRaza <muhammad.rehan.raza@est.tech>
Thu, 23 Apr 2020 14:05:57 +0000 (16:05 +0200)
Change-Id: I214723fc405bbf6aacb8cf60cc810f87beeeab77
Issue-ID: NONRTRIC-201
Signed-off-by: RehanRaza <muhammad.rehan.raza@est.tech>
sdnc-a1-controller/northbound/nonrt-ric-api/features/ccsdk-dblib/pom.xml [deleted file]
sdnc-a1-controller/northbound/nonrt-ric-api/features/ccsdk-dblib/src/main/feature/feature.xml [deleted file]
sdnc-a1-controller/northbound/nonrt-ric-api/features/ccsdk-sli/pom.xml [deleted file]
sdnc-a1-controller/northbound/nonrt-ric-api/features/pom.xml
sdnc-a1-controller/northbound/nonrt-ric-api/features/sdnc-nonrt-ric-api/pom.xml
sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/resources/NearRtRicList.properties [deleted file]
sdnc-a1-controller/northbound/pom.xml

diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/features/ccsdk-dblib/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/features/ccsdk-dblib/pom.xml
deleted file mode 100644 (file)
index 5c9ae5e..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-   Copyright (C) 2020 Nordix Foundation.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  SPDX-License-Identifier: Apache-2.0
-  ============LICENSE_END=========================================================
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-
-       <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>single-feature-parent</artifactId>
-               <version>1.4.3</version>
-               <relativePath/>
-       </parent>
-
-       <groupId>org.onap.ccsdk.sli.core</groupId>
-       <artifactId>ccsdk-dblib</artifactId>
-       <version>${ccsdk.sli.core.version}</version>
-       <packaging>feature</packaging>
-
-       <name>sdnc-northbound :: nonrt-ric-api :: ${project.artifactId}</name>
-
-       <dependencies>
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>dblib-provider</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.mariadb.jdbc</groupId>
-                       <artifactId>mariadb-java-client</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.tomcat</groupId>
-                       <artifactId>tomcat-jdbc</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.core</groupId>
-                       <artifactId>utils-provider</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.derby</groupId>
-                       <artifactId>derby</artifactId>
-               </dependency>
-       </dependencies>
-
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.karaf.tooling</groupId>
-                               <artifactId>karaf-maven-plugin</artifactId>
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <excludedArtifactIds>
-                                               <excludedArtifactId>slf4j-api</excludedArtifactId>
-                                               <excludedArtifactId>tomcat-jdbc</excludedArtifactId>
-                                               <excludedArtifactId>tomcat-juli</excludedArtifactId>
-                                       </excludedArtifactIds>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-</project>
\ No newline at end of file
diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/features/ccsdk-dblib/src/main/feature/feature.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/features/ccsdk-dblib/src/main/feature/feature.xml
deleted file mode 100644 (file)
index 771c374..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="ccsdk-dblib">
-
-    <feature name="ccsdk-dblib" description="ccsdk-sli-core :: dblib :: ccsdk-dblib" version="${project.version}">
-        <details>Root POM to be used in place of odlparent for CCSDK based projects</details>
-        <feature prerequisite="true" dependency="false">wrap</feature>
-        <bundle>mvn:org.onap.ccsdk.sli.core/dblib-provider/${project.version}</bundle>
-        <bundle>mvn:org.mariadb.jdbc/mariadb-java-client/${mariadb.connector.version}</bundle>
-        <bundle>wrap:mvn:org.apache.tomcat/tomcat-jdbc/${tomcat-jdbc.version}/$DynamicImport-Package=org.mariadb.*,org.apache.derby.*&amp;overwrite=merge</bundle>
-        <bundle>wrap:mvn:org.apache.tomcat/tomcat-juli/${tomcat-jdbc.version}/$DynamicImport-Package=org.mariadb.*,org.apache.derby.*&amp;overwrite=merge</bundle>
-        <bundle>mvn:org.onap.ccsdk.sli.core/utils-provider/${project.version}</bundle>
-    </feature>
-</features>
diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/features/ccsdk-sli/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/features/ccsdk-sli/pom.xml
deleted file mode 100644 (file)
index feacb4e..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-   Copyright (C) 2020 Nordix Foundation.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  SPDX-License-Identifier: Apache-2.0
-  ============LICENSE_END=========================================================
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-
-       <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>single-feature-parent</artifactId>
-               <version>1.4.3</version>
-               <relativePath/>
-       </parent>
-
-       <groupId>org.onap.ccsdk.sli.core</groupId>
-       <artifactId>ccsdk-sli</artifactId>
-       <version>${ccsdk.sli.core.version}</version>
-       <packaging>feature</packaging>
-
-       <name>sdnc-northbound :: nonrt-ric-api :: ${project.artifactId}</name>
-
-       <dependencies>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.core</groupId>
-                       <artifactId>sli-common</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.core</groupId>
-                       <artifactId>sli-provider</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.core</groupId>
-                       <artifactId>dblib-provider</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.mariadb.jdbc</groupId>
-                       <artifactId>mariadb-java-client</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.core</groupId>
-                       <artifactId>ccsdk-dblib</artifactId>
-                       <version>${project.version}</version>
-                       <type>xml</type>
-                       <classifier>features</classifier>
-               </dependency>
-       </dependencies>
-</project>
\ No newline at end of file
index c05b80e..6bc57cd 100644 (file)
@@ -38,7 +38,5 @@
     <modules>
         <module>sdnc-nonrt-ric-api</module>
         <module>features-nonrt-ric-api</module>
-       <module>ccsdk-sli</module>
-       <module>ccsdk-dblib</module>
     </modules>
 </project>
index b58293d..d108043 100644 (file)
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
+    <repositories>
+       <repository>
+           <id>opendaylight-release</id>
+            <name>opendaylight-release</name>
+            <url>https://nexus.opendaylight.org/content/repositories/opendaylight.release/</url>
+       </repository>
+    </repositories>
+
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/resources/NearRtRicList.properties b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/resources/NearRtRicList.properties
deleted file mode 100644 (file)
index f5d3bf7..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-# ========================LICENSE_START=================================
-# O-RAN-SC
-# %%
-# Copyright (C) 2019 Nordix Foundation
-# %%
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ========================LICENSE_END===================================
-
-# Defines the list of Near-RT RICs that the SDNC can contact,
-# where key is nearRTRicId and value is domainname:port of a Near-RT Ric.
-
-NearRtRic1 = nearRtRic-sim1:8080
-NearRtRic2 = nearRtRic-sim2:8080
\ No newline at end of file
index b243d71..162a423 100644 (file)
                </plugins>
        </build>
 
-       <profiles>
-               <profile>
-                       <id>blackduck</id>
-                       <activation>
-                               <property>
-                                       <name>blackduck-scan</name>
-                               </property>
-                       </activation>
-                       <build>
-                                       <plugins>
-                                               <plugin>
-                                                       <groupId>com.blackducksoftware.integration</groupId>
-                                                       <artifactId>hub-maven-plugin</artifactId>
-                                                       <version>1.4.0</version>
-                                                       <inherited>false</inherited>
-                                                       <configuration>
-                                                               <hubProjectName>${project.name}</hubProjectName>
-                                                               <outputDirectory>${project.basedir}</outputDirectory>
-                                                       </configuration>
-                                                       <executions>
-                                                               <execution>
-                                                                       <id>create-bdio-file</id>
-                                                                       <phase>package</phase>
-                                                                       <goals>
-                                                                               <goal>createHubOutput</goal>
-                                                                       </goals>
-                                                               </execution>
-                                                       </executions>
-                                               </plugin>
-                                       </plugins>
-
-
-                       </build>
-
-               </profile>
-
-       </profiles>
 </project>