Nitrogen port: sli/northbound 43/32643/2
authorDan Timoney <dtimoney@att.com>
Thu, 22 Feb 2018 23:22:31 +0000 (17:22 -0600)
committerDan Timoney <dtimoney@att.com>
Mon, 26 Feb 2018 16:28:52 +0000 (11:28 -0500)
Update sli/northbound to compile for ODL Nitrogen

Change-Id: Ib14fea5dd3922175bd183afb9f3c85edaa7a2f0c
Issue-ID: CCSDK-177
Signed-off-by: Dan Timoney <dtimoney@att.com>
24 files changed:
asdcApi/features/ccsdk-asdcApi/pom.xml [new file with mode: 0644]
asdcApi/features/features-asdcApi/pom.xml [new file with mode: 0644]
asdcApi/features/pom.xml
asdcApi/features/src/main/resources/features.xml [deleted file]
asdcApi/installer/pom.xml
asdcApi/installer/src/main/resources/scripts/install-feature.sh
asdcApi/model/pom.xml
asdcApi/pom.xml
asdcApi/provider/pom.xml
asdcApi/provider/src/test/java/org/onap/ccsdk/sli/northbound/asdcapi/TestAsdcApiApi.java
dataChange/features/ccsdk-dataChange/pom.xml [new file with mode: 0644]
dataChange/features/features-dataChange/pom.xml [new file with mode: 0644]
dataChange/features/pom.xml
dataChange/features/src/main/resources/features.xml [deleted file]
dataChange/installer/pom.xml
dataChange/installer/src/main/resources/scripts/install-feature.sh
dataChange/model/pom.xml
dataChange/pom.xml
dataChange/provider/pom.xml
dataChange/provider/src/main/yang/DataChange-provider-impl.yang [deleted file]
dmaap-listener/pom.xml
pom.xml
ueb-listener/pom.xml
version.properties

diff --git a/asdcApi/features/ccsdk-asdcApi/pom.xml b/asdcApi/features/ccsdk-asdcApi/pom.xml
new file mode 100644 (file)
index 0000000..061e5ed
--- /dev/null
@@ -0,0 +1,47 @@
+<?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.northbound</groupId>
+    <artifactId>ccsdk-asdcApi</artifactId>
+    <version>0.2.1-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>ccsdk-sli-northbound :: asdcApi :: ${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>asdcApi-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>asdcApi-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+    </dependencies>
+</project>
diff --git a/asdcApi/features/features-asdcApi/pom.xml b/asdcApi/features/features-asdcApi/pom.xml
new file mode 100644 (file)
index 0000000..2ac8f59
--- /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.northbound</groupId>
+       <artifactId>features-asdcApi</artifactId>
+       <version>0.2.1-SNAPSHOT</version>
+       <packaging>feature</packaging>
+
+       <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name>
+
+       <dependencies>
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>ccsdk-asdcApi</artifactId>
+                       <version>${project.version}</version>
+                       <type>xml</type>
+                       <classifier>features</classifier>
+               </dependency>
+
+       </dependencies>
+</project>
index 73cc0dd..5b94002 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>asdcApi</artifactId>
-               <groupId>org.onap.ccsdk.sli.northbound</groupId>
-               <version>0.2.0-SNAPSHOT</version>
-       </parent>
-       <artifactId>asdcApi-features</artifactId>
-
-       <packaging>jar</packaging>
-
-       <dependencies>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.northbound</groupId>
-                       <artifactId>asdcApi-model</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.northbound</groupId>
-                       <artifactId>asdcApi-provider</artifactId>
-                       <version>${project.version}</version>
-               </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>
-                       <scope>test</scope>
-                       <version>${odl.commons.opendaylight.version}</version>
-               </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>
+<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-lite</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.onap.ccsdk.sli.northbound</groupId>
+    <artifactId>asdcApi-features</artifactId>
+    <version>0.2.1-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name>
+
+    <modules>
+        <module>ccsdk-asdcApi</module>
+        <module>features-asdcApi</module>
+    </modules>
 </project>
diff --git a/asdcApi/features/src/main/resources/features.xml b/asdcApi/features/src/main/resources/features.xml
deleted file mode 100644 (file)
index 0f7fe3b..0000000
+++ /dev/null
@@ -1,38 +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-asdcApi-${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-asdcApi' description="sdnc-asdcApi" version='${project.version}'>
-        <!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
-        <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
-
-        <bundle>mvn:org.onap.ccsdk.sli.northbound/asdcApi-model/${project.version}</bundle>
-        <bundle>mvn:org.onap.ccsdk.sli.northbound/asdcApi-provider/${project.version}</bundle>
-
-        <feature>sdnc-sli</feature>
-    </feature>
-
-</features>
index 1b76669..aac236b 100755 (executable)
@@ -1,19 +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>
-               <artifactId>asdcApi</artifactId>
-               <groupId>org.onap.ccsdk.sli.northbound</groupId>
-               <version>0.2.0-SNAPSHOT</version>
+               <groupId>org.onap.ccsdk.parent</groupId>
+               <artifactId>odlparent-lite</artifactId>
+               <version>1.0.1-SNAPSHOT</version>
+        <relativePath/>
        </parent>
+
+    <groupId>org.onap.ccsdk.sli.northbound</groupId>
        <artifactId>asdcApi-installer</artifactId>
-       <name>asdcApi  - Karaf  Installer</name>
+    <version>0.2.1-SNAPSHOT</version>
        <packaging>pom</packaging>
 
+       <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name>
+
        <properties>
-               <application.name>sdnc-asdcApi</application.name>
-               <features.boot>sdnc-asdcApi</features.boot>
-               <features.repositories>mvn:org.onap.ccsdk.sli.northbound/asdcApi-features/${project.version}/xml/features</features.repositories>
+               <application.name>ccsdk-asdcApi</application.name>
+               <features.boot>${application.name}</features.boot>
+        <features.repositories>mvn:org.onap.ccsdk.sli.northbound/${features.boot}/${project.version}/xml/features</features.repositories>
                <include.transitive.dependencies>false</include.transitive.dependencies>
        </properties>
 
 
                <dependency>
                        <groupId>org.onap.ccsdk.sli.northbound</groupId>
-                       <artifactId>asdcApi-features</artifactId>
+                       <artifactId>${application.name}</artifactId>
                        <version>${project.version}</version>
-                       <classifier>features</classifier>
                        <type>xml</type>
+                       <classifier>features</classifier>
                        <exclusions>
                                <exclusion>
                                        <groupId>*</groupId>
                                </exclusion>
                        </exclusions>
                </dependency>
-
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.northbound</groupId>
+            <artifactId>asdcApi-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
                <dependency>
                        <groupId>org.onap.ccsdk.sli.northbound</groupId>
                        <artifactId>asdcApi-provider</artifactId>
                                                        <addParentPoms>false</addParentPoms>
                                                        <copyPom>false</copyPom>
                                                        <includeGroupIds>org.onap.ccsdk.sli.northbound</includeGroupIds>
-                                                       <excludeArtifactIds>sli-common,sli-provider,dblib-provider</excludeArtifactIds>
                                                        <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 a3b94f5..27e5905 100755 (executable)
@@ -1,92 +1,32 @@
 <?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>asdcApi</artifactId>
-        <groupId>org.onap.ccsdk.sli.northbound</groupId>
-        <version>0.2.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+        <relativePath/>
     </parent>
+
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>asdcApi-model</artifactId>
-    <version>0.2.0-SNAPSHOT</version>
+    <version>0.2.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
-    <build>
+    <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name>
 
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Import-Package>*</Import-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
-                <version>${odl.yangtools.yang.maven.plugin.version}</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.mdsal</groupId>
-                        <artifactId>maven-sal-api-gen-plugin</artifactId>
-                        <version>${odl.sal.api.gen.plugin.version}</version>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.opendaylight.netconf</groupId>
-                        <artifactId>sal-rest-docgen-maven</artifactId>
-                        <version>${odl.restconf.version}</version>
-                        <type>jar</type>
-                    </dependency>
-                </dependencies>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate-sources</goal>
-                        </goals>
-                        <configuration>
-                            <yangFilesRootDir>${yang.file.directory}</yangFilesRootDir>
-                            <codeGenerators>
-                                <generator>
-                                    <codeGeneratorClass>org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
-                                    <outputBaseDir>${salGeneratorPath}</outputBaseDir>
-                                </generator>
-                                <generator>
-                                    <codeGeneratorClass>org.opendaylight.netconf.sal.rest.doc.maven.StaticDocGenerator</codeGeneratorClass>
-                                    <outputBaseDir>target/swagger</outputBaseDir>
-                                </generator>
-                            </codeGenerators>
-                            <inspectDependencies>true</inspectDependencies>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
     <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>yang-binding</artifactId>
-            <version>${odl.mdsal.yang.binding.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-common</artifactId>
-            <version>${odl.yangtools.version}</version>
-        </dependency>
+
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
-            <version>${odl.ietf-inet-types.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-yang-types</artifactId>
-            <version>${odl.ietf-yang-types.version}</version>
         </dependency>
     </dependencies>
+
+
 </project>
index 932569b..78c2fcb 100755 (executable)
@@ -1,51 +1,20 @@
 <?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.northbound</groupId>
-               <artifactId>ccsdk-sli-northbound</artifactId>
-               <version>0.2.0-SNAPSHOT</version>
+               <groupId>org.onap.ccsdk.parent</groupId>
+               <artifactId>odlparent-lite</artifactId>
+               <version>1.0.1-SNAPSHOT</version>
+        <relativePath/>
        </parent>
 
-       <packaging>pom</packaging>
        <groupId>org.onap.ccsdk.sli.northbound</groupId>
        <artifactId>asdcApi</artifactId>
-       <version>0.2.0-SNAPSHOT</version>
-
-       <properties>
-               <feature-name>asdcApi</feature-name>
-       </properties>
-
-       <dependencyManagement>
-
-               <dependencies>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.northbound</groupId>
-                               <artifactId>asdcApi-features</artifactId>
-                               <classifier>features</classifier>
-                               <type>xml</type>
-                               <version>${project.version}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.northbound</groupId>
-                               <artifactId>asdcApi-model</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.northbound</groupId>
-                               <artifactId>asdcApi-provider</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-               </dependencies>
-
-
-       </dependencyManagement>
-
-
+       <version>0.2.1-SNAPSHOT</version>
+       <packaging>pom</packaging>
 
+    <name>ccsdk-sli-northbound :: asdcApi</name>
 
        <modules>
                <module>model</module>
@@ -54,4 +23,5 @@
                <module>installer</module>
        </modules>
 
+
 </project>
index 9382b9d..3f33af0 100755 (executable)
@@ -1,23 +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">
+<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>asdcApi</artifactId>
-        <groupId>org.onap.ccsdk.sli.northbound</groupId>
-        <version>0.2.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+        <relativePath />
     </parent>
+
+    <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>asdcApi-provider</artifactId>
+    <version>0.2.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
+    <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name>
+
 
     <dependencies>
         <dependency>
             <artifactId>asdcApi-model</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-            <version>${odl.controller.config.api.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-config</artifactId>
-            <version>${odl.mdsal.version}</version>
         </dependency>
+
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-api</artifactId>
-            <version>${odl.mdsal.version}</version>
         </dependency>
+
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-common-util</artifactId>
-            <version>${odl.mdsal.version}</version>
         </dependency>
+
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-common</artifactId>
-            <version>${sdnctl.sli.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-provider</artifactId>
-            <version>${sdnctl.sli.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-test-model</artifactId>
-            <version>${odl.mdsal.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>sal-rest-connector</artifactId>
-            <version>${odl.mdsal.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-broker-impl</artifactId>
-            <version>${odl.mdsal.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-broker-impl</artifactId>
-            <version>${odl.mdsal.version}</version>
             <type>test-jar</type>
             <classifier>tests</classifier>
             <scope>test</scope>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>6.11</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>${mockito.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
 
+
 </project>
index f65bbc0..6ad9a82 100644 (file)
 
 package org.onap.ccsdk.sli.northbound.asdcapi;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.ccsdk.sli.northbound.asdcapi.AsdcApiProvider;
-import org.onap.ccsdk.sli.northbound.asdcapi.AsdcApiSliClient;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
 import org.opendaylight.controller.md.sal.binding.test.AbstractConcurrentDataBrokerTest;
@@ -35,9 +37,6 @@ import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.mock;
-
 public class TestAsdcApiApi extends AbstractConcurrentDataBrokerTest {
 
     private AsdcApiProvider asdcApiProvider;
diff --git a/dataChange/features/ccsdk-dataChange/pom.xml b/dataChange/features/ccsdk-dataChange/pom.xml
new file mode 100644 (file)
index 0000000..5d38e33
--- /dev/null
@@ -0,0 +1,47 @@
+<?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.northbound</groupId>
+    <artifactId>ccsdk-dataChange</artifactId>
+    <version>0.2.1-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>ccsdk-sli-northbound :: dataChange :: ${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>dataChange-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>dataChange-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+    </dependencies>
+</project>
diff --git a/dataChange/features/features-dataChange/pom.xml b/dataChange/features/features-dataChange/pom.xml
new file mode 100644 (file)
index 0000000..470f95b
--- /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.northbound</groupId>
+       <artifactId>features-dataChange</artifactId>
+       <version>0.2.1-SNAPSHOT</version>
+       <packaging>feature</packaging>
+
+       <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name>
+
+       <dependencies>
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>ccsdk-dataChange</artifactId>
+                       <version>${project.version}</version>
+                       <type>xml</type>
+                       <classifier>features</classifier>
+               </dependency>
+
+       </dependencies>
+</project>
index 93dbd05..c32e72c 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>dataChange</artifactId>
-               <groupId>org.onap.ccsdk.sli.northbound</groupId>
-               <version>0.2.0-SNAPSHOT</version>
-       </parent>
-       <groupId>org.onap.ccsdk.sli.northbound</groupId>
-       <artifactId>dataChange-features</artifactId>
-       <version>0.2.0-SNAPSHOT</version>
-
-       <packaging>jar</packaging>
-
-       <dependencies>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.northbound</groupId>
-                       <artifactId>dataChange-model</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.northbound</groupId>
-                       <artifactId>dataChange-provider</artifactId>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.opendaylight.mdsal</groupId>
-                       <artifactId>features-mdsal</artifactId>
-                       <classifier>features</classifier>
-                       <version>${odl.mdsal.features.version}</version>
-                       <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>
-                       <scope>test</scope>
-                       <version>${odl.commons.opendaylight.version}</version>
-               </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>
-                        <!--
-                       <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.
-                               <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>
+<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-lite</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.sli.northbound</groupId>
+    <artifactId>dataChange-features</artifactId>
+    <version>0.2.1-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name>
+
+    <modules>
+        <module>ccsdk-dataChange</module>
+        <module>features-dataChange</module>
+    </modules>
 </project>
diff --git a/dataChange/features/src/main/resources/features.xml b/dataChange/features/src/main/resources/features.xml
deleted file mode 100644 (file)
index bd090f1..0000000
+++ /dev/null
@@ -1,36 +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-dataChange-${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-dataChange' description="sdnc-dataChange" version='${project.version}'>
-        <!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
-        <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
-        <feature>sdnc-sli</feature>
-        <bundle>mvn:org.onap.ccsdk.sli.northbound/dataChange-model/${project.version}</bundle>
-        <bundle>mvn:org.onap.ccsdk.sli.northbound/dataChange-provider/${project.version}</bundle>
-    </feature>
-
-</features>
index 31623ba..f676699 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>dataChange</artifactId>
-               <groupId>org.onap.ccsdk.sli.northbound</groupId>
-               <version>0.2.0-SNAPSHOT</version>
-       </parent>
-       <artifactId>dataChange-installer</artifactId>
-       <name>dataChange  - Karaf  Installer</name>
-       <packaging>pom</packaging>
+<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>
 
-       <properties>
-               <application.name>sdnc-dataChange</application.name>
-               <features.boot>sdnc-dataChange</features.boot>
-               <features.repositories>mvn:org.onap.ccsdk.sli.northbound/dataChange-features/${project.version}/xml/features</features.repositories>
-               <include.transitive.dependencies>false</include.transitive.dependencies>
-       </properties>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-       <dependencies>
+    <groupId>org.onap.ccsdk.sli.northbound</groupId>
+    <artifactId>dataChange-installer</artifactId>
+    <version>0.2.1-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.northbound</groupId>
-                       <artifactId>dataChange-features</artifactId>
-                       <version>${project.version}</version>
-                       <classifier>features</classifier>
-                       <type>xml</type>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>*</groupId>
-                                       <artifactId>*</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
+    <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name>
 
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.northbound</groupId>
-                       <artifactId>dataChange-provider</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
+    <properties>
+        <application.name>ccsdk-dataChange</application.name>
+        <features.boot>${application.name}</features.boot>
+        <features.repositories>mvn:org.onap.ccsdk.sli.northbound/${features.boot}/${project.version}/xml/features</features.repositories>
+        <include.transitive.dependencies>false</include.transitive.dependencies>
+    </properties>
 
+    <dependencies>
 
-       </dependencies>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.northbound</groupId>
+            <artifactId>${application.name}</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.northbound</groupId>
+            <artifactId>dataChange-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
-       <build>
-               <plugins>
-                       <plugin>
-                               <artifactId>maven-assembly-plugin</artifactId>
-                               <version>2.6</version>
-                               <executions>
-                                       <execution>
-                                               <id>maven-repo-zip</id>
-                                               <goals>
-                                                       <goal>single</goal>
-                                               </goals>
-                                               <phase>package</phase>
-                                               <configuration>
-                                                       <attach>false</attach>
-                                                       <finalName>stage/${application.name}-${project.version}</finalName>
-                                                       <descriptors>
-                                                               <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
-                                                       </descriptors>
-                                                       <appendAssemblyId>false</appendAssemblyId>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>installer-zip</id>
-                                               <goals>
-                                                       <goal>single</goal>
-                                               </goals>
-                                               <phase>package</phase>
-                                               <configuration>
-                                                       <attach>true</attach>
-                                                       <finalName>${application.name}-${project.version}-installer</finalName>
-                                                       <descriptors>
-                                                               <descriptor>src/assembly/assemble_installer_zip.xml</descriptor>
-                                                       </descriptors>
-                                                       <appendAssemblyId>false</appendAssemblyId>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-dependency-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>copy-dependencies</id>
-                                               <goals>
-                                                       <goal>copy-dependencies</goal>
-                                               </goals>
-                                               <phase>prepare-package</phase>
-                                               <configuration>
-                                                       <transitive>false</transitive>
-                                                       <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
-                                                       <overWriteReleases>false</overWriteReleases>
-                                                       <overWriteSnapshots>true</overWriteSnapshots>
-                                                       <overWriteIfNewer>true</overWriteIfNewer>
-                                                       <useRepositoryLayout>true</useRepositoryLayout>
-                                                       <addParentPoms>false</addParentPoms>
-                                                       <copyPom>false</copyPom>
-                                                       <includeGroupIds>org.onap.ccsdk.sli.northbound</includeGroupIds>
-                                                       <excludeArtifactIds>sli-common,sli-provider,dblib-provider</excludeArtifactIds>
-                                                       <scope>provided</scope>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       <plugin>
-                               <artifactId>maven-resources-plugin</artifactId>
-                               <version>2.6</version>
-                               <executions>
-                                       <execution>
-                                               <id>copy-version</id>
-                                               <goals>
-                                                       <goal>copy-resources</goal>
-                                               </goals><!-- here the phase you need -->
-                                               <phase>validate</phase>
-                                               <configuration>
-                                                       <outputDirectory>${basedir}/target/stage</outputDirectory>
-                                                       <resources>
-                                                               <resource>
-                                                                       <directory>src/main/resources/scripts</directory>
-                                                                       <includes>
-                                                                               <include>install-feature.sh</include>
-                                                                       </includes>
-                                                                       <filtering>true</filtering>
-                                                               </resource>
-                                                       </resources>
-                                               </configuration>
-                                       </execution>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.northbound</groupId>
+            <artifactId>dataChange-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
-                               </executions>
-                       </plugin>
 
-               </plugins>
-       </build>
+    </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <id>maven-repo-zip</id>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <attach>false</attach>
+                            <finalName>stage/${application.name}-${project.version}</finalName>
+                            <descriptors>
+                                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
+                            </descriptors>
+                            <appendAssemblyId>false</appendAssemblyId>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>installer-zip</id>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <attach>true</attach>
+                            <finalName>${application.name}-${project.version}-installer</finalName>
+                            <descriptors>
+                                <descriptor>src/assembly/assemble_installer_zip.xml</descriptor>
+                            </descriptors>
+                            <appendAssemblyId>false</appendAssemblyId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <phase>prepare-package</phase>
+                        <configuration>
+                            <transitive>false</transitive>
+                            <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                            <useRepositoryLayout>true</useRepositoryLayout>
+                            <addParentPoms>false</addParentPoms>
+                            <copyPom>false</copyPom>
+                            <includeGroupIds>org.onap.ccsdk.sli.northbound</includeGroupIds>
+                            <scope>provided</scope>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <id>copy-version</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals><!-- here the phase you need -->
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/stage</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources/scripts</directory>
+                                    <includes>
+                                        <include>install-feature.sh</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+
+                </executions>
+            </plugin>
+
+        </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 c3d6d6b..2b38516 100755 (executable)
@@ -1,93 +1,31 @@
 <?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>dataChange</artifactId>
-        <groupId>org.onap.ccsdk.sli.northbound</groupId>
-        <version>0.2.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+        <relativePath/>
     </parent>
+
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>dataChange-model</artifactId>
-    <version>0.2.0-SNAPSHOT</version>
+    <version>0.2.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Import-Package>*</Import-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
-                <version>${odl.yangtools.yang.maven.plugin.version}</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.mdsal</groupId>
-                        <artifactId>maven-sal-api-gen-plugin</artifactId>
-                        <version>${odl.sal.api.gen.plugin.version}</version>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.opendaylight.netconf</groupId>
-                        <artifactId>sal-rest-docgen-maven</artifactId>
-                        <version>${odl.restconf.version}</version>
-                        <type>jar</type>
-                    </dependency>
-                </dependencies>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate-sources</goal>
-                        </goals>
-                        <configuration>
-                            <yangFilesRootDir>${yang.file.directory}</yangFilesRootDir>
-                            <codeGenerators>
-                                <generator>
-                                    <codeGeneratorClass>org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
-                                    <outputBaseDir>${salGeneratorPath}</outputBaseDir>
-                                </generator>
-                                <generator>
-                                    <codeGeneratorClass>org.opendaylight.netconf.sal.rest.doc.maven.StaticDocGenerator</codeGeneratorClass>
-                                    <outputBaseDir>target/swagger</outputBaseDir>
-                                </generator>
-                            </codeGenerators>
-                            <inspectDependencies>true</inspectDependencies>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+    <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name>
 
     <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>yang-binding</artifactId>
-            <version>${odl.mdsal.yang.binding.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-common</artifactId>
-            <version>${odl.yangtools.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
-            <version>${odl.ietf-inet-types.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-yang-types</artifactId>
-            <version>${odl.ietf-yang-types.version}</version>
         </dependency>
     </dependencies>
+
+
 </project>
index f0bbf6e..cd1cd96 100755 (executable)
@@ -1,52 +1,26 @@
 <?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.northbound</groupId>
-               <artifactId>ccsdk-sli-northbound</artifactId>
-               <version>0.2.0-SNAPSHOT</version>
+               <groupId>org.onap.ccsdk.parent</groupId>
+               <artifactId>odlparent-lite</artifactId>
+               <version>1.0.1-SNAPSHOT</version>
+        <relativePath/>
        </parent>
 
-       <packaging>pom</packaging>
        <groupId>org.onap.ccsdk.sli.northbound</groupId>
        <artifactId>dataChange</artifactId>
-       <version>0.2.0-SNAPSHOT</version>
-
-       <properties>
-               <feature-name>dataChange</feature-name>
-       </properties>
-
-       <dependencyManagement>
-
-               <dependencies>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.northbound</groupId>
-                               <artifactId>dataChange-features</artifactId>
-                               <classifier>features</classifier>
-                               <type>xml</type>
-                               <version>${project.version}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.northbound</groupId>
-                               <artifactId>dataChange-model</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.northbound</groupId>
-                               <artifactId>dataChange-provider</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-               </dependencies>
-
+       <version>0.2.1-SNAPSHOT</version>
+       <packaging>pom</packaging>
 
-       </dependencyManagement>
+    <name>ccsdk-sli-northbound :: dataChange</name>
 
-  <modules>
+       <modules>
     <module>model</module>
     <module>features</module>
     <module>provider</module>
     <module>installer</module>
   </modules>
+
 </project>
index 7d35817..1722912 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>dataChange</artifactId>
-          <groupId>org.onap.ccsdk.sli.northbound</groupId>
-          <version>0.2.0-SNAPSHOT</version>
-     </parent>
-     <artifactId>dataChange-provider</artifactId>
-     <packaging>bundle</packaging>
+<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>
 
-     <build>
-          <plugins>
-               <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-bundle-plugin</artifactId>
-                    <extensions>true</extensions>
-               </plugin>
-          </plugins>
-     </build>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+        <relativePath />
+    </parent>
 
-     <dependencies>
-          <dependency>
-               <groupId>org.onap.ccsdk.sli.northbound</groupId>
-               <artifactId>dataChange-model</artifactId>
-          </dependency>
-          <dependency>
-               <groupId>org.opendaylight.controller</groupId>
-               <artifactId>config-api</artifactId>
+    <groupId>org.onap.ccsdk.sli.northbound</groupId>
+    <artifactId>dataChange-provider</artifactId>
+    <version>0.2.1-SNAPSHOT</version>
+    <packaging>bundle</packaging>
 
-               <version>${odl.controller.config.api.version}</version>
-          </dependency>
-          <dependency>
-               <groupId>org.opendaylight.controller</groupId>
-               <artifactId>sal-binding-config</artifactId>
-               <version>${odl.mdsal.version}</version>
-          </dependency>
-          <dependency>
-               <groupId>org.opendaylight.controller</groupId>
-               <artifactId>sal-binding-api</artifactId>
-               <version>${odl.mdsal.version}</version>
-          </dependency>
-          <dependency>
-               <groupId>org.opendaylight.controller</groupId>
-               <artifactId>sal-common-util</artifactId>
-               <version>${odl.mdsal.version}</version>
-          </dependency>
-          <dependency>
-               <groupId>org.onap.ccsdk.sli.core</groupId>
-               <artifactId>sli-common</artifactId>
-               <version>${sdnctl.sli.version}</version>
-          </dependency>
-          <dependency>
-               <groupId>org.onap.ccsdk.sli.core</groupId>
-               <artifactId>sli-provider</artifactId>
-               <version>${sdnctl.sli.version}</version>
-          </dependency>
+    <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.northbound</groupId>
+            <artifactId>dataChange-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-binding-config</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-binding-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>sli-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>sli-provider</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-test-model</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>sal-rest-connector</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-binding-broker-impl</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-binding-broker-impl</artifactId>
+            <type>test-jar</type>
+            <classifier>tests</classifier>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>6.11</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 
-          <dependency>
-               <groupId>org.opendaylight.controller</groupId>
-               <artifactId>sal-test-model</artifactId>
-               <version>${odl.mdsal.version}</version>
-               <scope>test</scope>
-          </dependency>
-          <dependency>
-               <groupId>org.opendaylight.netconf</groupId>
-               <artifactId>sal-rest-connector</artifactId>
-               <version>${odl.mdsal.version}</version>
-               <scope>test</scope>
-          </dependency>
 
-          <dependency>
-               <groupId>org.opendaylight.controller</groupId>
-               <artifactId>sal-binding-broker-impl</artifactId>
-               <version>${odl.mdsal.version}</version>
-               <scope>test</scope>
-          </dependency>
-          <dependency>
-               <groupId>org.opendaylight.controller</groupId>
-               <artifactId>sal-binding-broker-impl</artifactId>
-               <version>${odl.mdsal.version}</version>
-               <type>test-jar</type>
-               <classifier>tests</classifier>
-               <scope>test</scope>
-          </dependency>
-          <dependency>
-               <groupId>junit</groupId>
-               <artifactId>junit</artifactId>
-               <version>${junit.version}</version>
-               <scope>test</scope>
-          </dependency>
-          <dependency>
-               <groupId>org.testng</groupId>
-               <artifactId>testng</artifactId>
-               <version>6.11</version>
-               <scope>test</scope>
-          </dependency>
-          <dependency>
-               <groupId>org.mockito</groupId>
-               <artifactId>mockito-core</artifactId>
-               <version>${mockito.version}</version>
-               <scope>test</scope>
-          </dependency>
-     </dependencies>
 </project>
diff --git a/dataChange/provider/src/main/yang/DataChange-provider-impl.yang b/dataChange/provider/src/main/yang/DataChange-provider-impl.yang
deleted file mode 100755 (executable)
index f7ca378..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-module DataChange-provider-impl {
-
-    yang-version 1;
-    namespace "org:onap:ccsdk:sli:northbound:datachange:provider:impl";
-    prefix "DataChange-provider-impl";
-
-    import config { prefix config; revision-date 2013-04-05; }
-    import opendaylight-md-sal-binding { prefix mdsal; revision-date 2013-10-28; }
-    import opendaylight-sal-binding-broker-impl {
-        prefix binding-impl;
-        revision-date 2013-10-28;
-    }
-
-     description
-        "This module contains the base YANG definitions for
-        DataChange-provider impl implementation.";
-
-    revision "2014-05-23" {
-        description
-            "Initial revision.";
-    }
-
-    // This is the definition of the service implementation as a module identity.
-    identity DataChange-provider-impl {
-            base config:module-type;
-
-            // Specifies the prefix for generated java classes.
-            config:java-name-prefix DataChangeProvider;
-    }
-
-    // Augments the 'configuration' choice node under modules/module.
-    // We consume the three main services, RPCs, DataStore, and Notifications
-    augment "/config:modules/config:module/config:configuration" {
-        case DataChange-provider-impl {
-            when "/config:modules/config:module/config:type = 'DataChange-provider-impl'";
-
-            container rpc-registry {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity mdsal:binding-rpc-registry;
-                    }
-                }
-            }
-
-            container notification-publish-adapter {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity binding-impl:binding-new-notification-publish-service;
-                    }
-                }
-            }
-
-            container data-broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory false;
-                        config:required-identity mdsal:binding-async-data-broker;
-                    }
-                }
-            }
-        }
-    }
-}
index 8705ff1..f6d04e2 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>
-        <groupId>org.onap.ccsdk.sli.northbound</groupId>
-       <packaging>jar</packaging>
-       <artifactId>dmaap-listener</artifactId>
-       <version>0.2.0-SNAPSHOT</version>
+<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>
 
-       <name>DMAAP Listener</name>
-       <description>DMAAP Listener</description>
-       <parent>
-               <groupId>org.onap.ccsdk.sli.northbound</groupId>
-               <artifactId>ccsdk-sli-northbound</artifactId>
-               <version>0.2.0-SNAPSHOT</version>
-       </parent>
-       <properties>
-               <sdc.client.version>1.2.0-SNAPSHOT</sdc.client.version>
-               <fasterxml.jackson.version>2.9.0.pr1</fasterxml.jackson.version>
-               <skip.SWM>true</skip.SWM>
-               <dmaap.listener.base>/opt/app/dmaap-listener</dmaap.listener.base>
-               <dmaap.listener.version>1.1.0-SNAPSHOT</dmaap.listener.version>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+    </parent>
 
-               <maven.build.timestamp.format>yyMMdd-HHmmss</maven.build.timestamp.format>
-               <build.number>${maven.build.timestamp}</build.number>
-               <SWM_VERSION>${project.version}-${build.number}</SWM_VERSION>
-       </properties>
+    <groupId>org.onap.ccsdk.sli.northbound</groupId>
+    <artifactId>dmaap-listener</artifactId>
+    <version>0.2.1-SNAPSHOT</version>
+    <packaging>jar</packaging>
 
-       <dependencies>
+    <name>ccsdk-sli-northbound :: dmaap-listener</name>
+    <description>DMAAP Listener</description>
 
-               <dependency>
-                       <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
-                       <artifactId>dmaapClient</artifactId>
-                       <version>${dmaap.listener.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>slf4j-api</artifactId>
-                       <version>1.7.21</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>slf4j-log4j12</artifactId>
-                       <version>1.6.1</version>
-                       <scope>compile</scope>
-               </dependency>
-               <dependency>
-                       <groupId>log4j</groupId>
-                       <artifactId>log4j</artifactId>
-                       <version>1.2.17</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.fasterxml.jackson.core</groupId>
-                       <artifactId>jackson-core</artifactId>
-                       <version>${fasterxml.jackson.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.fasterxml.jackson.core</groupId>
-                       <artifactId>jackson-databind</artifactId>
-                       <version>${fasterxml.jackson.version}</version>
-               </dependency>
-               <dependency>
-                        <groupId>com.fasterxml.jackson.core</groupId>
-                        <artifactId>jackson-annotations</artifactId>
-                        <version>${fasterxml.jackson.version}</version>
-                </dependency>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>${junit.version}</version>
-                       <scope>test</scope>
-               </dependency>
-                <dependency>
+    <properties>
+        <sdc.client.version>1.2.0-SNAPSHOT</sdc.client.version>
+        <fasterxml.jackson.version>2.9.0.pr1</fasterxml.jackson.version>
+        <skip.SWM>true</skip.SWM>
+        <dmaap.listener.base>/opt/app/dmaap-listener</dmaap.listener.base>
+        <dmaap.listener.version>1.1.0-SNAPSHOT</dmaap.listener.version>
+
+        <maven.build.timestamp.format>yyMMdd-HHmmss</maven.build.timestamp.format>
+        <build.number>${maven.build.timestamp}</build.number>
+        <SWM_VERSION>${project.version}-${build.number}</SWM_VERSION>
+    </properties>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
+            <artifactId>dmaapClient</artifactId>
+            <version>${dmaap.listener.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.21</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.6.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.17</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${fasterxml.jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${fasterxml.jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>${fasterxml.jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>ch.vorburger.mariaDB4j</groupId>
             <artifactId>mariaDB4j</artifactId>
             <version>2.2.3</version>
             <scope>test</scope>
         </dependency>
 
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.core</groupId>
-                       <artifactId>dblib-provider</artifactId>
-                       <version>${sdnctl.dblib.version}</version>
-               </dependency>
-       </dependencies>
-       <build>
-               <plugins>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>dblib-provider</artifactId>
+            <version>${sdnctl.dblib.version}</version>
+        </dependency>
+    </dependencies>
 
-                       <!-- ================================================== -->
-                       <!-- Set the JDK compiler version. -->
-                       <!-- ================================================== -->
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                               <version>2.5.1</version>
-                               <inherited>true</inherited>
-                               <configuration>
-                                       <source>1.7</source>
-                                       <target>1.7</target>
-                               </configuration>
-                       </plugin>
-                        <plugin>
-                                <groupId>org.apache.maven.plugins</groupId>
-                                <artifactId>maven-jar-plugin</artifactId>
-                                <version>2.6</version>
-                                <configuration>
-                                        <archive>
-                                                <manifest>
-                                                        <addClasspath>true</addClasspath>
-                                                        <mainClass>org.onap.ccsdk.sli.northbound.dmaapclient.DmaapListener</mainClass>
-                                                </manifest>
-                                        </archive>
-                                </configuration>
-                        </plugin>
-                       <plugin>
-                               <artifactId>maven-assembly-plugin</artifactId>
-                               <version>2.6</version>
-                               <executions>
-                                       <execution>
-                                               <id>create-zip</id>
-                                               <goals>
-                                                       <goal>single</goal>
-                                               </goals>
-                                               <phase>package</phase>
-                                               <configuration>
-                                                       <attach>true</attach>
-                                                       <finalName>${project.artifactId}.${project.version}</finalName>
-                                                       <attach>true</attach>
-                                                       <descriptors>
-                                                               <descriptor>src/assembly/assemble_zip.xml</descriptor>
-                                                       </descriptors>
-                                                       <appendAssemblyId>false</appendAssemblyId>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
+    <build>
+        <plugins>
 
-               </plugins>
-       </build>
+            <!-- ================================================== -->
+            <!-- Set the JDK compiler version. -->
+            <!-- ================================================== -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.5.1</version>
+                <inherited>true</inherited>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.6</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <mainClass>org.onap.ccsdk.sli.northbound.dmaapclient.DmaapListener</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <id>create-zip</id>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <attach>true</attach>
+                            <finalName>${project.artifactId}.${project.version}</finalName>
+                            <attach>true</attach>
+                            <descriptors>
+                                <descriptor>src/assembly/assemble_zip.xml</descriptor>
+                            </descriptors>
+                            <appendAssemblyId>false</appendAssemblyId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
 
+        </plugins>
+    </build>
 </project>
diff --git a/pom.xml b/pom.xml
index ded5f12..63bcb6e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -3,8 +3,8 @@
 
        <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>
        <artifactId>ccsdk-sli-northbound</artifactId>
 
        <name>ccsdk-sli-northbound</name>
-       <url>https://wiki.openecomp.org</url>
+       <url>https://wiki.onap.org</url>
        <description>The SDN-C Northbound APIs repo contains code for northbound API adaptors, typically MD-SAL applications</description>
 
 
        <issueManagement>
                <system>JIRA</system>
-               <url>https://jira.openecomp.org/</url>
+               <url>https://jira.onap.org/</url>
        </issueManagement>
 
 
        <scm>
-               <connection>scm:git:ssh://git@${openecomp.git.host}/sdnc-northbound.git</connection>
+               <connection>scm:git:ssh://git@${onap.git.host}/sdnc-northbound.git</connection>
 
-               <developerConnection>scm:git:ssh://${openecomp.git.host}:${openecomp.git.port}/${openecomp.git.project}/sdnc-northbound.git</developerConnection>
-               <url>${openecomp.git.protocol}://${openecomp.git.host}/projects/${openecomp.git.project}/repos/sdnc-northbound/browse</url>
+               <developerConnection>scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/sdnc-northbound.git</developerConnection>
+               <url>${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/sdnc-northbound/browse</url>
        </scm>
 
        <ciManagement>
                <system>Jenkins</system>
-               <url>https://jenkins.openecomp.org/</url>
+               <url>https://jenkins.onap.org/</url>
        </ciManagement>
 
        <distributionManagement>
                <site>
                        <id>sdnc-javadoc</id>
-                       <url>dav:https://${openecomp.nexus.host}:${openecomp.nexus.port}/repository/sdn-c-javadoc/${project.artifactId}/${project.version}</url>
+                       <url>dav:https://${onap.nexus.host}:${onap.nexus.port}/repository/sdn-c-javadoc/${project.artifactId}/${project.version}</url>
                </site>
        </distributionManagement>
        <profiles>
                <module>ueb-listener</module>
        </modules>
        <organization>
-               <name>AT&amp;T</name>
+               <name>ONAP</name>
        </organization>
-       <version>0.2.0-SNAPSHOT</version>
+       <version>0.2.1-SNAPSHOT</version>
 
 
 </project>
index 2117368..b8ec986 100755 (executable)
@@ -1,18 +1,21 @@
 <?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>
-        <groupId>org.onap.ccsdk.sli.northbound</groupId>
-       <packaging>jar</packaging>
-       <artifactId>ueb-listener</artifactId>
-       <version>0.2.0-SNAPSHOT</version>
 
-       <name>UEB Listener</name>
-       <description>UEB Listener</description>
        <parent>
-               <groupId>org.onap.ccsdk.sli.northbound</groupId>
-               <artifactId>ccsdk-sli-northbound</artifactId>
-               <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.northbound</groupId>
+       <artifactId>ueb-listener</artifactId>
+       <version>0.2.1-SNAPSHOT</version>
+       <packaging>jar</packaging>
+
+       <name>ccsdk-sli-northbound :: ueb-listener</name>
+       <description>UEB Listener</description>
+
        <properties>
                <sdc.client.version>1.1.32</sdc.client.version>
                 <sdc.tosca.version>1.1.32</sdc.tosca.version>
                <dependency>
                        <groupId>org.onap.ccsdk.sli.core</groupId>
                        <artifactId>dblib-provider</artifactId>
-                       <version>${sdnctl.dblib.version}</version>
+                       <version>${sdnctl.dblib.version}</version>
                </dependency>
        </dependencies>
+
        <build>
                <plugins>
 
 
                </plugins>
        </build>
-
 </project>
index efb7e63..ebb19b8 100644 (file)
@@ -5,7 +5,7 @@
 
 release_name=0
 sprint_number=2
-feature_revision=0
+feature_revision=1
 
 base_version=${release_name}.${sprint_number}.${feature_revision}