Nitrogen port : sli/plugins

Update properties-node and restapi-call-node to compile against
ODL Nitrogen

Change-Id: I21f06abb008562d6e351cb780302ed4375f5d3d2
Issue-ID: CCSDK-178
Signed-off-by: Dan Timoney <dtimoney@att.com>

4 files changed, 85 insertions, 164 deletions

diff --git a/properties-node/features/ccsdk-properties-node/pom.xml b/properties-node/features/ccsdk-properties-node/pom.xml
new file mode 100644
index 000000000..992e1099b
--- /dev/null
+++ b/properties-node/features/ccsdk-properties-node/pom.xml
@@ -0,0 +1,44 @@
+<?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.ccsdk.sli.plugins</groupId>
+    <artifactId>ccsdk-properties-node</artifactId>
+    <version>0.2.1-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>ccsdk-sli-plugins :: properties-node :: ${project.artifactId}</name>
+
+    <properties>
+        <skip.karaf.featureTest>true</skip.karaf.featureTest>
+    </properties>
+
+    <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>properties-node-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+    </dependencies>
+</project>
diff --git a/properties-node/features/features-properties-node/pom.xml b/properties-node/features/features-properties-node/pom.xml
new file mode 100644
index 000000000..b39826221
--- /dev/null
+++ b/properties-node/features/features-properties-node/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.ccsdk.sli.plugins</groupId>
+	<artifactId>features-properties-node</artifactId>
+	<version>0.2.1-SNAPSHOT</version>
+	<packaging>feature</packaging>
+
+	<name>ccsdk-sli-plugins :: properties-node :: ${project.artifactId}</name>
+
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>ccsdk-properties-node</artifactId>
+			<version>${project.version}</version>
+			<type>xml</type>
+			<classifier>features</classifier>
+		</dependency>
+
+	</dependencies>
+</project>
diff --git a/properties-node/features/pom.xml b/properties-node/features/pom.xml
index 0f1e662d9..0d4476585 100755
--- a/properties-node/features/pom.xml
+++ b/properties-node/features/pom.xml
@@ -1,135 +1,22 @@
 <?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>

-        <artifactId>properties-node</artifactId>

-        <groupId>org.onap.ccsdk.sli.plugins</groupId>

-        <version>0.2.0-SNAPSHOT</version>

+        <groupId>org.onap.ccsdk.parent</groupId>

+        <artifactId>odlparent-lite</artifactId>

+        <version>1.0.1-SNAPSHOT</version>

     </parent>

+

     <groupId>org.onap.ccsdk.sli.plugins</groupId>

-    <version>0.2.0-SNAPSHOT</version>

     <artifactId>properties-node-features</artifactId>

-    <name>Properties Node - Features</name>

-

-    <packaging>jar</packaging>

-

-    <dependencies>

-

-        <dependency>

-            <groupId>org.onap.ccsdk.sli.plugins</groupId>

-            <artifactId>properties-node-provider</artifactId>

-            <version>${project.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>commons-lang</groupId>

-            <artifactId>commons-lang</artifactId>

-            <version>2.6</version>

-            <scope>compile</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.opendaylight.mdsal</groupId>

-            <artifactId>features-mdsal</artifactId>

-            <version>${odl.mdsal.features.version}</version>

-            <classifier>features</classifier>

-            <type>xml</type>

-

-            <scope>runtime</scope>

-        </dependency>

-

-

-        <!-- dependency for opendaylight-karaf-empty for use by testing -->

-        <dependency>

-            <groupId>org.opendaylight.controller</groupId>

-            <artifactId>opendaylight-karaf-empty</artifactId>

-            <version>${odl.karaf.empty.distro.version}</version>

-            <type>zip</type>

-        </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>

-            <classifier>features</classifier>

-            <type>xml</type>

-            <scope>runtime</scope>

-        </dependency>

-    </dependencies>

+    <version>0.2.1-SNAPSHOT</version>

+    <packaging>pom</packaging>

 

-    <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>

-                    <!-- launches the feature test, which validates that your karaf feature

-                    can be installed inside of a karaf container. It doesn't validate that your

-                    functionality works correctly, just that you have all of the dependent bundles

-                    defined correctly.

-            <plugin>

+    <name>ccsdk-sli-plugins :: properties-node :: ${project.artifactId}</name>

 

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-surefire-plugin</artifactId>

-                <version>2.16</version>

-                <configuration>

-                    <systemPropertyVariables>

-                        <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>

-                        <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>

-                        <karaf.distro.version>${odl.karaf.empty.distro.version}</karaf.distro.version>

-                    </systemPropertyVariables>

-                    <dependenciesToScan>

-                        <dependency>org.opendaylight.yangtools:features-test</dependency>

-                    </dependenciesToScan>

-                </configuration>

-            </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>ccsdk-properties-node</module>

+        <module>features-properties-node</module>

+    </modules>

 </project>

diff --git a/properties-node/features/src/main/resources/features.xml b/properties-node/features/src/main/resources/features.xml
deleted file mode 100644
index 9abacf0b8..000000000
--- a/properties-node/features/src/main/resources/features.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  openECOMP : SDN-C
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights
-  			reserved.
-  ================================================================================
-  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=========================================================
-  -->
-
-
-<features name="sdnc-properties-node-${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">
-
-    <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository>
-
-    <feature name='sdnc-properties-node' description="sdnc-properties-node"
-        version='${project.version}'>
-        <feature>sdnc-sli</feature>
-        <feature>spring</feature>
-        <feature>spring-dm</feature>
-        <bundle>mvn:org.onap.ccsdk.sli.plugins/properties-node-provider/${project.version}
-        </bundle>
-    </feature>
-
-</features>