From 131f1fab6bea5eeb6467e8836ec00ef7c6bf5eac Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dt5972@att.com>
Date: Wed, 28 Feb 2018 21:13:09 -0500
Subject: Nitrogen port : sdnc-northbound

Update sdnc/northbound to OpenDaylight Nitrogen release.

Change-Id: I6e299418a7ab441899b78b5d3df5f8ee96829222
Issue-ID: SDNC-269
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
---
 .../features/features-generic-resource-api/pom.xml | 29 +++++++
 generic-resource-api/features/pom.xml              | 99 +++-------------------
 .../features/sdnc-generic-resource-api/pom.xml     | 45 ++++++++++
 .../features/src/main/resources/features.xml       | 17 ----
 4 files changed, 87 insertions(+), 103 deletions(-)
 create mode 100644 generic-resource-api/features/features-generic-resource-api/pom.xml
 create mode 100644 generic-resource-api/features/sdnc-generic-resource-api/pom.xml
 delete mode 100644 generic-resource-api/features/src/main/resources/features.xml

(limited to 'generic-resource-api/features')

diff --git a/generic-resource-api/features/features-generic-resource-api/pom.xml b/generic-resource-api/features/features-generic-resource-api/pom.xml
new file mode 100644
index 00000000..0275b59d
--- /dev/null
+++ b/generic-resource-api/features/features-generic-resource-api/pom.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>feature-repo-parent</artifactId>
+		<version>1.0.1-SNAPSHOT</version>
+		<relativePath/>
+	</parent>
+
+	<groupId>org.onap.sdnc.northbound</groupId>
+	<artifactId>features-generic-resource-api</artifactId>
+	<version>1.3.1-SNAPSHOT</version>
+	<packaging>feature</packaging>
+
+	<name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name>
+
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>sdnc-generic-resource-api</artifactId>
+			<version>${project.version}</version>
+			<type>xml</type>
+			<classifier>features</classifier>
+		</dependency>
+
+	</dependencies>
+</project>
diff --git a/generic-resource-api/features/pom.xml b/generic-resource-api/features/pom.xml
index 8b3e0e49..7c83e30c 100644
--- a/generic-resource-api/features/pom.xml
+++ b/generic-resource-api/features/pom.xml
@@ -1,96 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<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">
+<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.sdnc.northbound</groupId>
-        <artifactId>generic-resource-api</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+        <relativePath />
     </parent>
 
+    <groupId>org.onap.sdnc.northbound</groupId>
     <artifactId>generic-resource-api-features</artifactId>
-    <packaging>jar</packaging>
+    <version>1.3.1-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.onap.sdnc.northbound</groupId>
-            <artifactId>generic-resource-api-model</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.sdnc.northbound</groupId>
-            <artifactId>generic-resource-api-provider</artifactId>
-        </dependency>
+    <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name>
 
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>features-mdsal</artifactId>
-            <version>${odl.mdsal.features.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency><!-- Required for launching the feature tests -->
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>features-test</artifactId>
-            <version>${odl.commons.opendaylight.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>features-yangtools</artifactId>
-            <version>${odl.yangtools.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <resources>
-            <resource>
-                <filtering>true</filtering>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>filter</id>
-                        <goals>
-                            <goal>resources</goal>
-                        </goals>
-                        <phase>generate-resources</phase>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <phase>package</phase>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/classes/${features.file}</file>
-                                    <type>xml</type>
-                                    <classifier>features</classifier>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+    <modules>
+        <module>sdnc-generic-resource-api</module>
+        <module>features-generic-resource-api</module>
+    </modules>
 </project>
diff --git a/generic-resource-api/features/sdnc-generic-resource-api/pom.xml b/generic-resource-api/features/sdnc-generic-resource-api/pom.xml
new file mode 100644
index 00000000..817145d3
--- /dev/null
+++ b/generic-resource-api/features/sdnc-generic-resource-api/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.0.1-SNAPSHOT</version>
+        <relativePath />
+    </parent>
+
+    <groupId>org.onap.sdnc.northbound</groupId>
+    <artifactId>sdnc-generic-resource-api</artifactId>
+    <version>1.3.1-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-mdsal-broker</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>ccsdk-sli</artifactId>
+            <version>${ccsdk.sli.core.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>generic-resource-api-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>generic-resource-api-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+    </dependencies>
+</project>
diff --git a/generic-resource-api/features/src/main/resources/features.xml b/generic-resource-api/features/src/main/resources/features.xml
deleted file mode 100644
index 219c7215..00000000
--- a/generic-resource-api/features/src/main/resources/features.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<features name="generic-resource-api-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-
-    <feature name='sdnc-generic-resource-api' description="sdnc-generic-resource-api" version='${project.version}'>
-        <feature>odl-mdsal-broker</feature>
-        <feature>sdnc-sli</feature>
-        <!-- It is assumed that applications are installed on BVC, which installs bvc-core including MD-SAL etc.
-             Do not list those features out here as that will tie your implementation to a specific version
-             of MD-SAL / BVC and force updates to your application for every upgrade of BVC core platform.-->
-        <bundle>mvn:org.onap.sdnc.northbound/generic-resource-api-model/${project.version}</bundle>
-        <bundle>mvn:org.onap.sdnc.northbound/generic-resource-api-provider/${project.version}</bundle>
-    </feature>
-
-</features>
-- 
cgit