Nitrogen port : sli/plugins 27/33227/3
authorDan Timoney <dtimoney@att.com>
Tue, 27 Feb 2018 18:34:16 +0000 (13:34 -0500)
committerTimoney, Dan (dt5972) <dt5972@att.com>
Tue, 27 Feb 2018 21:55:38 +0000 (16:55 -0500)
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>
19 files changed:
pom.xml
properties-node/features/ccsdk-properties-node/pom.xml [new file with mode: 0644]
properties-node/features/features-properties-node/pom.xml [new file with mode: 0644]
properties-node/features/pom.xml
properties-node/features/src/main/resources/features.xml [deleted file]
properties-node/installer/pom.xml
properties-node/installer/src/main/resources/scripts/install-feature.sh
properties-node/pom.xml
properties-node/provider/pom.xml
properties-node/provider/src/main/resources/META-INF/spring/properties-node-context.xml [deleted file]
properties-node/provider/src/main/resources/META-INF/spring/properties-node-osgi-context.xml [deleted file]
properties-node/provider/src/main/resources/org/opendaylight/blueprint/properties-node-blueprint.xml [new file with mode: 0755]
restapi-call-node/features/ccsdk-restapi-call-node/pom.xml [new file with mode: 0644]
restapi-call-node/features/features-restapi-call-node/pom.xml [new file with mode: 0644]
restapi-call-node/features/pom.xml
restapi-call-node/installer/pom.xml
restapi-call-node/installer/src/main/resources/scripts/install-feature.sh
restapi-call-node/pom.xml
restapi-call-node/provider/pom.xml

diff --git a/pom.xml b/pom.xml
index cf84ab7..0a01af4 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -1,27 +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/maven-v4_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.ccsdk.parent</groupId>
-        <artifactId>odlparent-carbon-sr1</artifactId>
-        <version>0.1.0</version>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>pom</packaging>
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
     <artifactId>ccsdk-sli-plugins</artifactId>
+    <version>0.2.1-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
     <name>ccsdk-sli-plugins</name>
-    <url>https://wiki.onap.org</url>
     <description>CCSDK Java Plugins</description>
+    <url>https://wiki.onap.org</url>
+    <organization>
+        <name>ONAP</name>
+    </organization>
 
-
-    <issueManagement>
-        <system>JIRA</system>
-        <url>https://jira.onap.org/</url>
-    </issueManagement>
-
+    <modules>
+        <module>properties-node</module>
+        <module>restapi-call-node</module>
+    </modules>
 
     <scm>
         <connection>scm:git:ssh://git@${onap.git.host}/ccsdk/sli/plugins.git</connection>
         <url>${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/ccsdk/sli/plugins/browse</url>
         <tag>HEAD</tag>
     </scm>
-
+    <issueManagement>
+        <system>JIRA</system>
+        <url>https://jira.onap.org/</url>
+    </issueManagement>
     <ciManagement>
         <system>Jenkins</system>
         <url>https://jenkins.onap.org</url>
     </ciManagement>
-
-
     <distributionManagement>
         <site>
             <id>sdnc-javadoc</id>
         </site>
     </distributionManagement>
 
-    <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>
     <build>
         <plugins>
             <plugin>
                 </configuration>
             </plugin>
         </plugins>
-
     </build>
-    <modules>
-        <module>properties-node</module>
-        <module>restapi-call-node</module>
-  </modules>
-    <organization>
-        <name>AT&amp;T</name>
-    </organization>
-    <version>0.2.0-SNAPSHOT</version>
 
+    <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>
diff --git a/properties-node/features/ccsdk-properties-node/pom.xml b/properties-node/features/ccsdk-properties-node/pom.xml
new file mode 100644 (file)
index 0000000..992e109
--- /dev/null
@@ -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 (file)
index 0000000..b398262
--- /dev/null
@@ -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>
index 0f1e662..0d44765 100755 (executable)
 <?xml version="1.0" encoding="UTF-8"?>\r
 <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">\r
     <modelVersion>4.0.0</modelVersion>\r
+\r
     <parent>\r
-        <artifactId>properties-node</artifactId>\r
-        <groupId>org.onap.ccsdk.sli.plugins</groupId>\r
-        <version>0.2.0-SNAPSHOT</version>\r
+        <groupId>org.onap.ccsdk.parent</groupId>\r
+        <artifactId>odlparent-lite</artifactId>\r
+        <version>1.0.1-SNAPSHOT</version>\r
     </parent>\r
+\r
     <groupId>org.onap.ccsdk.sli.plugins</groupId>\r
-    <version>0.2.0-SNAPSHOT</version>\r
     <artifactId>properties-node-features</artifactId>\r
-    <name>Properties Node - Features</name>\r
-\r
-    <packaging>jar</packaging>\r
-\r
-    <dependencies>\r
-\r
-        <dependency>\r
-            <groupId>org.onap.ccsdk.sli.plugins</groupId>\r
-            <artifactId>properties-node-provider</artifactId>\r
-            <version>${project.version}</version>\r
-        </dependency>\r
-\r
-        <dependency>\r
-            <groupId>commons-lang</groupId>\r
-            <artifactId>commons-lang</artifactId>\r
-            <version>2.6</version>\r
-            <scope>compile</scope>\r
-        </dependency>\r
-\r
-        <dependency>\r
-            <groupId>org.opendaylight.mdsal</groupId>\r
-            <artifactId>features-mdsal</artifactId>\r
-            <version>${odl.mdsal.features.version}</version>\r
-            <classifier>features</classifier>\r
-            <type>xml</type>\r
-\r
-            <scope>runtime</scope>\r
-        </dependency>\r
-\r
-\r
-        <!-- dependency for opendaylight-karaf-empty for use by testing -->\r
-        <dependency>\r
-            <groupId>org.opendaylight.controller</groupId>\r
-            <artifactId>opendaylight-karaf-empty</artifactId>\r
-            <version>${odl.karaf.empty.distro.version}</version>\r
-            <type>zip</type>\r
-        </dependency>\r
-\r
-\r
-        <dependency>\r
-            <!-- Required for launching the feature tests -->\r
-            <groupId>org.opendaylight.odlparent</groupId>\r
-            <artifactId>features-test</artifactId>\r
-            <version>${odl.commons.opendaylight.version}</version>\r
-            <scope>test</scope>\r
-        </dependency>\r
-\r
-        <dependency>\r
-            <groupId>org.opendaylight.yangtools</groupId>\r
-            <artifactId>features-yangtools</artifactId>\r
-            <version>${odl.yangtools.version}</version>\r
-            <classifier>features</classifier>\r
-            <type>xml</type>\r
-            <scope>runtime</scope>\r
-        </dependency>\r
-    </dependencies>\r
+    <version>0.2.1-SNAPSHOT</version>\r
+    <packaging>pom</packaging>\r
 \r
-    <build>\r
-        <resources>\r
-            <resource>\r
-                <filtering>true</filtering>\r
-                <directory>src/main/resources</directory>\r
-            </resource>\r
-        </resources>\r
-        <plugins>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-resources-plugin</artifactId>\r
-                <executions>\r
-                    <execution>\r
-                        <id>filter</id>\r
-                        <goals>\r
-                            <goal>resources</goal>\r
-                        </goals>\r
-                        <phase>generate-resources</phase>\r
-                    </execution>\r
-                </executions>\r
-            </plugin>\r
-                    <!-- launches the feature test, which validates that your karaf feature\r
-                    can be installed inside of a karaf container. It doesn't validate that your\r
-                    functionality works correctly, just that you have all of the dependent bundles\r
-                    defined correctly.\r
-            <plugin>\r
+    <name>ccsdk-sli-plugins :: properties-node :: ${project.artifactId}</name>\r
 \r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-surefire-plugin</artifactId>\r
-                <version>2.16</version>\r
-                <configuration>\r
-                    <systemPropertyVariables>\r
-                        <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>\r
-                        <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>\r
-                        <karaf.distro.version>${odl.karaf.empty.distro.version}</karaf.distro.version>\r
-                    </systemPropertyVariables>\r
-                    <dependenciesToScan>\r
-                        <dependency>org.opendaylight.yangtools:features-test</dependency>\r
-                    </dependenciesToScan>\r
-                </configuration>\r
-            </plugin>\r
-            -->\r
-            <plugin>\r
-                <groupId>org.codehaus.mojo</groupId>\r
-                <artifactId>build-helper-maven-plugin</artifactId>\r
-                <executions>\r
-                    <execution>\r
-                        <id>attach-artifacts</id>\r
-                        <goals>\r
-                            <goal>attach-artifact</goal>\r
-                        </goals>\r
-                        <phase>package</phase>\r
-                        <configuration>\r
-                            <artifacts>\r
-                                <artifact>\r
-                                    <file>${project.build.directory}/classes/${features.file}</file>\r
-                                    <type>xml</type>\r
-                                    <classifier>features</classifier>\r
-                                </artifact>\r
-                            </artifacts>\r
-                        </configuration>\r
-                    </execution>\r
-                </executions>\r
-            </plugin>\r
-        </plugins>\r
-    </build>\r
+    <modules>\r
+        <module>ccsdk-properties-node</module>\r
+        <module>features-properties-node</module>\r
+    </modules>\r
 </project>\r
diff --git a/properties-node/features/src/main/resources/features.xml b/properties-node/features/src/main/resources/features.xml
deleted file mode 100644 (file)
index 9abacf0..0000000
+++ /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>
index 8a3330a..359c8fb 100755 (executable)
@@ -1,20 +1,24 @@
 <?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>
-        <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>
     <artifactId>properties-node-installer</artifactId>
-    <name>Properties node - Karaf  Installer</name>
+    <version>0.2.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
+    <name>ccsdk-sli-plugins :: properties-node :: ${project.artifactId}</name>
+
     <properties>
-        <application.name>sdnc-properties-node</application.name>
-        <features.boot>sdnc-properties-node</features.boot>
-        <features.repositories>mvn:org.onap.ccsdk.sli.plugins/properties-node-features/${project.version}/xml/features</features.repositories>
+        <application.name>ccsdk-properties-node</application.name>
+        <features.boot>${application.name}</features.boot>
+        <features.repositories>mvn:org.onap.ccsdk.sli.plugins/${features.boot}/${project.version}/xml/features</features.repositories>
         <include.transitive.dependencies>false</include.transitive.dependencies>
     </properties>
 
 
         <dependency>
             <groupId>org.onap.ccsdk.sli.plugins</groupId>
-            <artifactId>properties-node-features</artifactId>
+            <artifactId>${application.name}</artifactId>
             <version>${project.version}</version>
-            <classifier>features</classifier>
             <type>xml</type>
+            <classifier>features</classifier>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
                             <useRepositoryLayout>true</useRepositoryLayout>
                             <addParentPoms>false</addParentPoms>
                             <copyPom>false</copyPom>
-                            <includeGroupIds>org.onap.ccsdk.sli</includeGroupIds>
-                            <excludeArtifactIds>sli-common,sli-provider,dblib-provider</excludeArtifactIds>
+                            <includeGroupIds>org.onap.ccsdk.sli.plugins</includeGroupIds>
                             <scope>provided</scope>
                         </configuration>
                     </execution>
 
         </plugins>
     </build>
-
 </project>
index df03392..0eab001 100644 (file)
@@ -10,9 +10,9 @@
 # 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.
@@ -23,7 +23,6 @@
 
 ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
 ODL_KARAF_CLIENT=${ODL_KARAF_CLIENT:-${ODL_HOME}/bin/client}
-ODL_KARAF_CLIENT_OPTS=${ODL_KARAF_CLIENT_OPTS:-"-u karaf"}
 INSTALLERDIR=$(dirname $0)
 
 REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip
@@ -36,5 +35,5 @@ else
     exit 1
 fi
 
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories}
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot}
+${ODL_KARAF_CLIENT} feature:repo-add ${features.repositories}
+${ODL_KARAF_CLIENT} feature:install ${features.boot}
index ea03a64..8e99cf6 100755 (executable)
@@ -1,43 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<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/maven-v4_0_0.xsd">\r
+<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">\r
+    <modelVersion>4.0.0</modelVersion>\r
+\r
     <parent>\r
-        <groupId>org.onap.ccsdk.sli.plugins</groupId>\r
-        <artifactId>ccsdk-sli-plugins</artifactId>\r
-        <version>0.2.0-SNAPSHOT</version>\r
+        <groupId>org.onap.ccsdk.parent</groupId>\r
+        <artifactId>odlparent-lite</artifactId>\r
+        <version>1.0.1-SNAPSHOT</version>\r
     </parent>\r
 \r
-    <modelVersion>4.0.0</modelVersion>\r
-    <packaging>pom</packaging>\r
-\r
     <groupId>org.onap.ccsdk.sli.plugins</groupId>\r
     <artifactId>properties-node</artifactId>\r
-    <version>0.2.0-SNAPSHOT</version>\r
+    <version>0.2.1-SNAPSHOT</version>\r
+    <packaging>pom</packaging>\r
 \r
-    <name>Properties Node</name>\r
+    <name>ccsdk-sli-plugins :: properties-node</name>\r
     <description>This is an implementation of DG Execute Node that reads property file and\r
     puts the properties in the DG context</description>\r
 \r
-    <dependencyManagement>\r
-        <dependencies>\r
-            <dependency>\r
-                <groupId>org.onap.ccsdk.sli.plugins</groupId>\r
-                <artifactId>properties-node-features</artifactId>\r
-                <classifier>features</classifier>\r
-                <type>xml</type>\r
-                <version>${project.version}</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>org.onap.ccsdk.sli.plugins</groupId>\r
-                <artifactId>properties-node-provider</artifactId>\r
-                <version>${project.version}</version>\r
-            </dependency>\r
-        </dependencies>\r
-    </dependencyManagement>\r
-\r
     <modules>\r
         <module>provider</module>\r
         <module>features</module>\r
         <module>installer</module>\r
     </modules>\r
 </project>\r
-\r
index d622e59..c354dc1 100755 (executable)
@@ -1,89 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <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">\r
     <modelVersion>4.0.0</modelVersion>\r
+\r
     <parent>\r
-        <groupId>org.onap.ccsdk.sli.plugins</groupId>\r
-        <artifactId>properties-node</artifactId>\r
-        <version>0.2.0-SNAPSHOT</version>\r
+        <groupId>org.onap.ccsdk.parent</groupId>\r
+        <artifactId>binding-parent</artifactId>\r
+        <version>1.0.1-SNAPSHOT</version>\r
     </parent>\r
+\r
     <groupId>org.onap.ccsdk.sli.plugins</groupId>\r
-    <version>0.2.0-SNAPSHOT</version>\r
     <artifactId>properties-node-provider</artifactId>\r
+    <version>0.2.1-SNAPSHOT</version>\r
     <packaging>bundle</packaging>\r
-    <name>Properties Node - Provider</name>\r
+\r
+    <name>ccsdk-sli-plugins :: properties-node :: ${project.artifactId}</name>\r
     <url>http://maven.apache.org</url>\r
+\r
     <properties>\r
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
     </properties>\r
+\r
     <dependencies>\r
         <dependency>\r
             <groupId>junit</groupId>\r
             <artifactId>junit</artifactId>\r
             <scope>test</scope>\r
         </dependency>\r
-        <dependency>\r
-            <groupId>org.springframework</groupId>\r
-            <artifactId>spring-test</artifactId>\r
-            <version>${spring.version}</version>\r
-            <scope>test</scope>\r
-        </dependency>\r
         <dependency>\r
             <groupId>org.onap.ccsdk.sli.core</groupId>\r
             <artifactId>sli-common</artifactId>\r
-            <version>${sdnctl.sli.version}</version>\r
-            <scope>compile</scope>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.onap.ccsdk.sli.core</groupId>\r
             <artifactId>sli-provider</artifactId>\r
-            <version>${sdnctl.sli.version}</version>\r
-            <scope>compile</scope>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.slf4j</groupId>\r
             <artifactId>slf4j-api</artifactId>\r
-            <version>${slf4j.version}</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.slf4j</groupId>\r
-            <artifactId>jcl-over-slf4j</artifactId>\r
-            <version>${slf4j.version}</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.springframework</groupId>\r
-            <artifactId>spring-beans</artifactId>\r
-            <version>${spring.version}</version>\r
         </dependency>\r
-        <dependency>\r
-            <groupId>org.springframework</groupId>\r
-            <artifactId>spring-context</artifactId>\r
-            <version>${spring.version}</version>\r
-        </dependency>\r
-    </dependencies>\r
-\r
-    <build>\r
-        <plugins>\r
-\r
-\r
-\r
-            <plugin>\r
-                <groupId>org.apache.felix</groupId>\r
-                <artifactId>maven-bundle-plugin</artifactId>\r
-                <extensions>true</extensions>\r
-                <configuration>\r
-                    <instructions>\r
-                        <Bundle-SymbolicName>org.onap.ccsdk.sli.prop</Bundle-SymbolicName>\r
-                        <Export-Package>org.onap.ccsdk.sli.prop</Export-Package>\r
-                        <Import-Package>*</Import-Package>\r
-                    </instructions>\r
 \r
-\r
-                </configuration>\r
-\r
-            </plugin>\r
-\r
-\r
-        </plugins>\r
-\r
-    </build>\r
+    </dependencies>\r
 </project>\r
diff --git a/properties-node/provider/src/main/resources/META-INF/spring/properties-node-context.xml b/properties-node/provider/src/main/resources/META-INF/spring/properties-node-context.xml
deleted file mode 100644 (file)
index 52d1cd9..0000000
+++ /dev/null
@@ -1,32 +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=========================================================
-  -->
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-    <bean id="propertiesNode" class="org.onap.ccsdk.sli.plugins.prop.PropertiesNode">
-    </bean>
-
-</beans>
diff --git a/properties-node/provider/src/main/resources/META-INF/spring/properties-node-osgi-context.xml b/properties-node/provider/src/main/resources/META-INF/spring/properties-node-osgi-context.xml
deleted file mode 100644 (file)
index a46e37c..0000000
+++ /dev/null
@@ -1,32 +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=========================================================
-  -->
-
-<beans:beans xmlns="http://www.springframework.org/schema/osgi"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
-             xsi:schemaLocation="http://www.springframework.org/schema/osgi
-       http://www.springframework.org/schema/osgi/spring-osgi.xsd
-       http://www.springframework.org/schema/beans
-       http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-    <service ref="propertiesNode" interface="org.onap.ccsdk.sli.plugins.prop.PropertiesNode" />
-
-</beans:beans>
diff --git a/properties-node/provider/src/main/resources/org/opendaylight/blueprint/properties-node-blueprint.xml b/properties-node/provider/src/main/resources/org/opendaylight/blueprint/properties-node-blueprint.xml
new file mode 100755 (executable)
index 0000000..6e1d48e
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
+           odl:use-default-for-reference-types="true">
+
+    <bean id="propNodeProvider" class="org.onap.ccsdk.sli.plugins.prop.PropertiesNode" />
+
+
+
+    <service ref="propNodeProvider">
+        <interfaces>
+            <value>org.onap.ccsdk.sli.plugins.prop.PropertiesNode</value>
+        </interfaces>
+    </service>
+
+</blueprint>
\ No newline at end of file
diff --git a/restapi-call-node/features/ccsdk-restapi-call-node/pom.xml b/restapi-call-node/features/ccsdk-restapi-call-node/pom.xml
new file mode 100644 (file)
index 0000000..aa54b4c
--- /dev/null
@@ -0,0 +1,53 @@
+<?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-restapi-call-node</artifactId>
+    <version>0.2.1-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>ccsdk-sli-plugins :: restapi-call-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>restapi-call-node-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jettison</groupId>
+            <artifactId>jettison</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/restapi-call-node/features/features-restapi-call-node/pom.xml b/restapi-call-node/features/features-restapi-call-node/pom.xml
new file mode 100644 (file)
index 0000000..3347502
--- /dev/null
@@ -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-restapi-call-node</artifactId>
+       <version>0.2.1-SNAPSHOT</version>
+       <packaging>feature</packaging>
+
+       <name>ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId}</name>
+
+       <dependencies>
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>ccsdk-restapi-call-node</artifactId>
+                       <version>${project.version}</version>
+                       <type>xml</type>
+                       <classifier>features</classifier>
+               </dependency>
+
+       </dependencies>
+</project>
index 41af125..9849408 100755 (executable)
 <?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>restapi-call-node</artifactId>
-               <groupId>org.onap.ccsdk.sli.plugins</groupId>
-               <version>0.2.0-SNAPSHOT</version>
-       </parent>
-       <groupId>org.onap.ccsdk.sli.plugins</groupId>
-       <version>0.2.0-SNAPSHOT</version>
-       <artifactId>restapi-call-node-features</artifactId>
-       <name>RESTAPI Call Node - Features</name>
+    <modelVersion>4.0.0</modelVersion>
 
-       <packaging>jar</packaging>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+    </parent>
 
-       <dependencies>
+    <groupId>org.onap.ccsdk.sli.plugins</groupId>
+    <artifactId>restapi-call-node-features</artifactId>
+    <version>0.2.1-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.plugins</groupId>
-                       <artifactId>restapi-call-node-provider</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
+    <name>ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId}</name>
 
-               <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>
-
-       <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>
-
-                               <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-restapi-call-node</module>
+        <module>features-restapi-call-node</module>
+    </modules>
 </project>
index aedb3b7..68fe477 100755 (executable)
@@ -1,20 +1,24 @@
 <?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>
-               <artifactId>restapi-call-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>
        <artifactId>restapi-call-node-installer</artifactId>
-       <name>Properties node - Karaf  Installer</name>
+       <version>0.2.1-SNAPSHOT</version>
        <packaging>pom</packaging>
 
+       <name>ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId}</name>
+
        <properties>
-               <application.name>sdnc-restapi-call-node</application.name>
-               <features.boot>sdnc-restapi-call-node</features.boot>
-               <features.repositories>mvn:org.onap.ccsdk.sli.plugins/restapi-call-node-features/${project.version}/xml/features</features.repositories>
+               <application.name>ccsdk-restapi-call-node</application.name>
+               <features.boot>${application.name}</features.boot>
+        <features.repositories>mvn:org.onap.ccsdk.sli.plugins/${features.boot}/${project.version}/xml/features</features.repositories>
                <include.transitive.dependencies>false</include.transitive.dependencies>
        </properties>
 
 
                <dependency>
                        <groupId>org.onap.ccsdk.sli.plugins</groupId>
-                       <artifactId>restapi-call-node-features</artifactId>
+                       <artifactId>${application.name}</artifactId>
                        <version>${project.version}</version>
-                       <classifier>features</classifier>
                        <type>xml</type>
+                       <classifier>features</classifier>
                        <exclusions>
                                <exclusion>
                                        <groupId>*</groupId>
                        <artifactId>restapi-call-node-provider</artifactId>
                        <version>${project.version}</version>
                </dependency>
-
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
        </dependencies>
 
        <build>
                                                        <useRepositoryLayout>true</useRepositoryLayout>
                                                        <addParentPoms>false</addParentPoms>
                                                        <copyPom>false</copyPom>
-                                                       <includeGroupIds>org.onap.ccsdk.sli</includeGroupIds>
-                                                       <excludeArtifactIds>sli-common,sli-provider,dblib-provider</excludeArtifactIds>
+                                                       <excludeGroupIds>org.onap.ccsdk.sli.core</excludeGroupIds>
                                                        <scope>provided</scope>
                                                </configuration>
                                        </execution>
 
                </plugins>
        </build>
-
 </project>
index e986764..cee4a49 100644 (file)
@@ -10,9 +10,9 @@
 # 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.
@@ -23,7 +23,6 @@
 
 ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
 ODL_KARAF_CLIENT=${ODL_KARAF_CLIENT:-${ODL_HOME}/bin/client}
-ODL_KARAF_CLIENT_OPTS=${ODL_KARAF_CLIENT_OPTS:-"-u karaf"}
 INSTALLERDIR=$(dirname $0)
 
 REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip
@@ -36,5 +35,5 @@ else
        exit 1
 fi
 
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories}
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot}
+${ODL_KARAF_CLIENT} feature:repo-add ${features.repositories}
+${ODL_KARAF_CLIENT} feature:install ${features.boot}
index d48253e..e55fd29 100755 (executable)
@@ -1,42 +1,24 @@
 <?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/maven-v4_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.ccsdk.sli.plugins</groupId>
-        <artifactId>ccsdk-sli-plugins</artifactId>
-        <version>0.2.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>pom</packaging>
-
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
     <artifactId>restapi-call-node</artifactId>
-    <version>0.2.0-SNAPSHOT</version>
+    <version>0.2.1-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-    <name>RESTAPI Call Node</name>
+    <name>ccsdk-sli-plugins :: restapi-call-node</name>
     <description>This is an implementation of DG Execute Node that makes a call to an external REST API</description>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.onap.ccsdk.sli.plugins</groupId>
-                <artifactId>restapi-call-node-features</artifactId>
-                <classifier>features</classifier>
-                <type>xml</type>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.onap.ccsdk.sli.plugins</groupId>
-                <artifactId>restapi-call-node-provider</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <modules>
         <module>provider</module>
         <module>features</module>
         <module>installer</module>
     </modules>
 </project>
-
index 0d6b3fb..aae29ea 100755 (executable)
@@ -1,20 +1,25 @@
 <?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.sli.plugins</groupId>
-        <artifactId>restapi-call-node</artifactId>
-        <version>0.2.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
     </parent>
+
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
     <artifactId>restapi-call-node-provider</artifactId>
-    <version>0.2.0-SNAPSHOT</version>
+    <version>0.2.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>RESTAPI Call Node - Provider</name>
+
+    <name>ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId}</name>
     <url>http://maven.apache.org</url>
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
+
     <dependencies>
         <dependency>
             <groupId>junit</groupId>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <version>${spring.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-common</artifactId>
-            <version>${sdnctl.sli.version}</version>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-provider</artifactId>
-            <version>${sdnctl.sli.version}</version>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>${slf4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-            <version>${slf4j.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
-            <version>${spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>${spring.version}</version>
         </dependency>
         <dependency>
             <groupId>com.sun.jersey</groupId>
             <artifactId>jersey-client</artifactId>
-            <version>${jersey.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.codehaus.jettison</groupId>
             <artifactId>jettison</artifactId>
-            <version>${jettison.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-
-
-
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>org.onap.ccsdk.sli.restapicall</Bundle-SymbolicName>
-                        <Export-Package>org.onap.ccsdk.sli.plugins.restapicall</Export-Package>
-                        <Import-Package>*</Import-Package>
-                    </instructions>
-
-
-                </configuration>
-
-            </plugin>
-
-
-        </plugins>
-
-    </build>
 </project>