CLeaning up moved modules and running mvn tidy:pom 45/122545/1
authorSingal, Kapil (ks220y) <ks220y@att.com>
Fri, 9 Jul 2021 12:48:33 +0000 (08:48 -0400)
committerSingal, Kapil (ks220y) <ks220y@att.com>
Fri, 9 Jul 2021 12:48:33 +0000 (08:48 -0400)
Issue-ID: SDNC-1582
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I0ba59010d54d2a379d794beeb7d21b601ac1abf4

38 files changed:
asdcApi/.gitignore [deleted file]
asdcApi/README.md [deleted file]
dataChange/.gitignore [deleted file]
dataChange/.sonar/checkstyle.xml [deleted file]
dataChange/.sonar/pmd.xml [deleted file]
dataChange/README.md [deleted file]
dmaap-listener/.gitignore [deleted file]
dmaap-listener/.sonar/checkstyle.xml [deleted file]
dmaap-listener/.sonar/pmd.xml [deleted file]
dmaap-listener/README.md [deleted file]
features/features-sdnc-northbound/pom.xml
features/installer/pom.xml
features/pom.xml
features/sdnc-northbound-all/pom.xml
generic-resource-api/client/pom.xml
generic-resource-api/features/features-generic-resource-api/pom.xml
generic-resource-api/features/sdnc-generic-resource-api/pom.xml
generic-resource-api/installer/pom.xml
generic-resource-api/model/pom.xml
generic-resource-api/model/swagger/pom.xml
generic-resource-api/model/yang/pom.xml
generic-resource-api/pom.xml
generic-resource-api/provider/pom.xml
optical-service/features/features-optical-service/pom.xml
optical-service/features/sdnc-optical-service/pom.xml
optical-service/installer/pom.xml
optical-service/model/pom.xml
optical-service/provider/pom.xml
pom.xml
ueb-listener/.gitignore [deleted file]
ueb-listener/.sonar/checkstyle.xml [deleted file]
ueb-listener/.sonar/pmd.xml [deleted file]
ueb-listener/README.md [deleted file]
vnftools/features/features-vnftools/pom.xml
vnftools/features/sdnc-vnftools/pom.xml
vnftools/installer/pom.xml
vnftools/pom.xml
vnftools/provider/pom.xml

diff --git a/asdcApi/.gitignore b/asdcApi/.gitignore
deleted file mode 100755 (executable)
index b73caf3..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-#####standard .git ignore entries#####
-
-## IDE Specific Files ##
-org.eclipse.core.resources.prefs
-.classpath
-.project
-.settings
-.idea
-.externalToolBuilders
-maven-eclipse.xml
-workspace
-
-## Compilation Files ##
-*.class
-**/target
-target
-target-ide
-MANIFEST.MF
-
-## Misc Ignores (OS specific etc) ##
-bin/
-dist
-*~
-*.ipr
-*.iml
-*.iws
-classes
-out/
-.DS_STORE
-.metadata
-
-## Folders which contain auto generated source code ##
-yang-gen-config
-yang-gen-sal
diff --git a/asdcApi/README.md b/asdcApi/README.md
deleted file mode 100644 (file)
index acef067..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-ASDCAPI MOVED TO CCSDK!
-
-The code for asdcApi moved to the ccsdk/sli/northbound repository
diff --git a/dataChange/.gitignore b/dataChange/.gitignore
deleted file mode 100755 (executable)
index b73caf3..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-#####standard .git ignore entries#####
-
-## IDE Specific Files ##
-org.eclipse.core.resources.prefs
-.classpath
-.project
-.settings
-.idea
-.externalToolBuilders
-maven-eclipse.xml
-workspace
-
-## Compilation Files ##
-*.class
-**/target
-target
-target-ide
-MANIFEST.MF
-
-## Misc Ignores (OS specific etc) ##
-bin/
-dist
-*~
-*.ipr
-*.iml
-*.iws
-classes
-out/
-.DS_STORE
-.metadata
-
-## Folders which contain auto generated source code ##
-yang-gen-config
-yang-gen-sal
diff --git a/dataChange/.sonar/checkstyle.xml b/dataChange/.sonar/checkstyle.xml
deleted file mode 100755 (executable)
index 3fa2315..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd"><!-- Generated by Sonar --><module name="Checker"><module name="SuppressionCommentFilter"/><module name="TreeWalker"><module name="FileContentsHolder"/> <module name="ClassFanOutComplexity"><property name="severity" value="warning"/></module><module name="NestedForDepth"><property name="severity" value="warning"/><property name="max" value="1"/></module><module name="ClassDataAbstractionCoupling"><property name="severity" value="warning"/></module></module></module>
\ No newline at end of file
diff --git a/dataChange/.sonar/pmd.xml b/dataChange/.sonar/pmd.xml
deleted file mode 100755 (executable)
index 80343b3..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<ruleset>\r
-  <rule ref="rulesets/java/naming.xml/BooleanGetMethodName">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/j2ee.xml/StaticEJBFieldShouldBeFinal">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/coupling.xml/CouplingBetweenObjects">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/codesize.xml/TooManyMethods">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/naming.xml/AvoidFieldNameMatchingTypeName">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/basic.xml/DoubleCheckedLocking">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/naming.xml/AvoidFieldNameMatchingMethodName">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/coupling.xml/ExcessiveImports">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/basic.xml/OverrideBothEqualsAndHashcode">\r
-    <priority>2</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/naming.xml/ShortMethodName">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/basic.xml/BooleanInstantiation">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/codesize.xml/TooManyFields">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/controversial.xml/AvoidUsingNativeCode">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/optimizations.xml/UseStringBufferForStringAppends">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/coupling.xml/LooseCoupling">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/design.xml/NonThreadSafeSingleton">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/j2ee.xml/DoNotUseThreads">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/sunsecure.xml/ArrayIsStoredDirectly">\r
-    <priority>5</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/sunsecure.xml/MethodReturnsInternalArray">\r
-    <priority>2</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/design.xml/AssignmentToNonFinalStatic">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/strictexception.xml/AvoidCatchingGenericException">\r
-    <priority>3</priority>\r
-  </rule>\r
-</ruleset>\r
-\r
diff --git a/dataChange/README.md b/dataChange/README.md
deleted file mode 100644 (file)
index c0a1dcb..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-DATACHANGE MOVED TO CCSDK!
-
-The code for dataChange moved to the ccsdk/sli/northbound repository
diff --git a/dmaap-listener/.gitignore b/dmaap-listener/.gitignore
deleted file mode 100755 (executable)
index 1b8a6ba..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-org.eclipse.core.resources.prefs
-.classpath\r
-.project\r
-.settings\r
-.idea\r
-.externalToolBuilders\r
-maven-eclipse.xml\r
-*.class\r
-target/\r
-MANIFEST.MF\r
-.DS_STORE\r
-.metadata\r
diff --git a/dmaap-listener/.sonar/checkstyle.xml b/dmaap-listener/.sonar/checkstyle.xml
deleted file mode 100755 (executable)
index 3fa2315..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd"><!-- Generated by Sonar --><module name="Checker"><module name="SuppressionCommentFilter"/><module name="TreeWalker"><module name="FileContentsHolder"/> <module name="ClassFanOutComplexity"><property name="severity" value="warning"/></module><module name="NestedForDepth"><property name="severity" value="warning"/><property name="max" value="1"/></module><module name="ClassDataAbstractionCoupling"><property name="severity" value="warning"/></module></module></module>
\ No newline at end of file
diff --git a/dmaap-listener/.sonar/pmd.xml b/dmaap-listener/.sonar/pmd.xml
deleted file mode 100755 (executable)
index 80343b3..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<ruleset>\r
-  <rule ref="rulesets/java/naming.xml/BooleanGetMethodName">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/j2ee.xml/StaticEJBFieldShouldBeFinal">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/coupling.xml/CouplingBetweenObjects">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/codesize.xml/TooManyMethods">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/naming.xml/AvoidFieldNameMatchingTypeName">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/basic.xml/DoubleCheckedLocking">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/naming.xml/AvoidFieldNameMatchingMethodName">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/coupling.xml/ExcessiveImports">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/basic.xml/OverrideBothEqualsAndHashcode">\r
-    <priority>2</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/naming.xml/ShortMethodName">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/basic.xml/BooleanInstantiation">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/codesize.xml/TooManyFields">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/controversial.xml/AvoidUsingNativeCode">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/optimizations.xml/UseStringBufferForStringAppends">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/coupling.xml/LooseCoupling">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/design.xml/NonThreadSafeSingleton">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/j2ee.xml/DoNotUseThreads">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/sunsecure.xml/ArrayIsStoredDirectly">\r
-    <priority>5</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/sunsecure.xml/MethodReturnsInternalArray">\r
-    <priority>2</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/design.xml/AssignmentToNonFinalStatic">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/strictexception.xml/AvoidCatchingGenericException">\r
-    <priority>3</priority>\r
-  </rule>\r
-</ruleset>\r
-\r
diff --git a/dmaap-listener/README.md b/dmaap-listener/README.md
deleted file mode 100644 (file)
index ed067b1..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-DMAAP-LISTENER MOVED TO CCSDK!
-
-The code for dmaap-listener moved to the ccsdk/sli/northbound repository
index 2902c9b..dfa33e6 100644 (file)
@@ -24,6 +24,5 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-
     </dependencies>
 </project>
index 8a1bb46..800ac8f 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>
+    <modelVersion>4.0.0</modelVersion>
 
-       <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>odlparent-lite</artifactId>
-               <version>2.2.0-SNAPSHOT</version>
-               <relativePath/>
-       </parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>2.2.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-       <groupId>org.onap.sdnc.northbound</groupId>
-       <artifactId>sdnc-northbound-features-installer</artifactId>
-       <version>2.2.0-SNAPSHOT</version>
-       <packaging>pom</packaging>
+    <groupId>org.onap.sdnc.northbound</groupId>
+    <artifactId>sdnc-northbound-features-installer</artifactId>
+    <version>2.2.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-       <name>sdnc-northbound :: features :: ${project.artifactId}</name>
+    <name>sdnc-northbound :: features :: ${project.artifactId}</name>
 
-       <properties>
-               <application.name>sdnc-northbound-all</application.name>
-               <features.boot>${application.name}</features.boot>
-               <features.repositories>mvn:org.onap.sdnc.northbound/${features.boot}/${project.version}/xml/features</features.repositories>
-               <include.transitive.dependencies>false</include.transitive.dependencies>
-       </properties>
+    <properties>
+        <application.name>sdnc-northbound-all</application.name>
+        <features.boot>${application.name}</features.boot>
+        <features.repositories>mvn:org.onap.sdnc.northbound/${features.boot}/${project.version}/xml/features
+        </features.repositories>
+        <include.transitive.dependencies>false</include.transitive.dependencies>
+    </properties>
 
-       <dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.sdnc.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>
+    </dependencies>
 
-               <dependency>
-                       <groupId>org.onap.sdnc.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>
-
-
-       </dependencies>
-
-       <build>
-               <plugins>
-                       <plugin>
-                               <artifactId>maven-assembly-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>maven-repo-zip</id>
-                                               <goals>
-                                                       <goal>single</goal>
-                                               </goals>
-                                               <phase>package</phase>
-                                               <configuration>
-                                                       <attach>true</attach>
-                                                       <finalName>stage/${application.name}-${project.version}</finalName>
-                                                       <descriptors>
-                                                               <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
-                                                       </descriptors>
-                                                       <appendAssemblyId>true</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.sdnc.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>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>maven-repo-zip</id>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <attach>true</attach>
+                            <finalName>stage/${application.name}-${project.version}</finalName>
+                            <descriptors>
+                                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
+                            </descriptors>
+                            <appendAssemblyId>true</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.sdnc.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 4b79fd3..aa9e6fe 100755 (executable)
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-       <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>odlparent-lite</artifactId>
-               <version>2.2.0-SNAPSHOT</version>
-               <relativePath/>
-       </parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>2.2.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-       <groupId>org.onap.sdnc.northbound</groupId>
-       <artifactId>sdnc-northbound-feature-aggregator</artifactId>
-       <version>2.2.0-SNAPSHOT</version>
-       <packaging>pom</packaging>
+    <groupId>org.onap.sdnc.northbound</groupId>
+    <artifactId>sdnc-northbound-feature-aggregator</artifactId>
+    <version>2.2.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-       <name>sdnc-northbound :: features</name>
+    <name>sdnc-northbound :: features</name>
 
-       <modules>
+    <modules>
         <module>sdnc-northbound-all</module>
         <module>features-sdnc-northbound</module>
         <module>installer</module>
index fb9411b..3931842 100644 (file)
@@ -1,55 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-       <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>single-feature-parent</artifactId>
-               <version>2.2.0-SNAPSHOT</version>
-               <relativePath/>
-       </parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>2.2.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-       <groupId>org.onap.sdnc.northbound</groupId>
-       <artifactId>sdnc-northbound-all</artifactId>
-       <version>2.2.0-SNAPSHOT</version>
-       <packaging>feature</packaging>
+    <groupId>org.onap.sdnc.northbound</groupId>
+    <artifactId>sdnc-northbound-all</artifactId>
+    <version>2.2.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
 
-       <name>sdnc-northbound :: features :: ${project.artifactId}</name>
+    <name>sdnc-northbound :: features :: ${project.artifactId}</name>
 
-       <dependencyManagement>
-           <dependencies>
-               <dependency>
-  <groupId>org.onap.ccsdk.sli.core</groupId>
-  <artifactId>sli-core-artifacts</artifactId>
-  <version>${ccsdk.sli.core.version}</version>
-  <type>pom</type>
-  <scope>import</scope>
-               </dependency>
-           </dependencies>
-       </dependencyManagement>
-       <dependencies>
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>sdnc-generic-resource-api</artifactId>
-                       <version>${project.version}</version>
-                       <type>xml</type>
-                       <classifier>features</classifier>
-               </dependency>
-                <dependency>
-                        <groupId>${project.groupId}</groupId>
-                        <artifactId>sdnc-optical-service</artifactId>
-                        <version>${project.version}</version>
-                        <type>xml</type>
-                        <classifier>features</classifier>
-                </dependency>
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>sdnc-vnftools</artifactId>
-                       <version>${project.version}</version>
-                       <type>xml</type>
-                       <classifier>features</classifier>
-               </dependency>
-
-       
-       </dependencies>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>sli-core-artifacts</artifactId>
+                <version>${ccsdk.sli.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnc-generic-resource-api</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnc-optical-service</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnc-vnftools</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+    </dependencies>
 </project>
index 35a400d..36cda5a 100644 (file)
@@ -20,6 +20,7 @@
     <properties>
         <api.name>generic-resource</api.name>
     </properties>
+
     <dependencies>
         <dependency>
             <groupId>javax.annotation</groupId>
@@ -27,6 +28,7 @@
             <version>1.0</version>
         </dependency>
     </dependencies>
+
     <build>
         <plugins>
             <plugin>
index c8dcc50..bd84611 100644 (file)
@@ -1,29 +1,28 @@
 <?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>
+    <modelVersion>4.0.0</modelVersion>
 
-       <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>feature-repo-parent</artifactId>
-               <version>2.2.0-SNAPSHOT</version>
-               <relativePath/>
-       </parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>feature-repo-parent</artifactId>
+        <version>2.2.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-       <groupId>org.onap.sdnc.northbound</groupId>
-       <artifactId>features-generic-resource-api</artifactId>
-       <version>2.2.0-SNAPSHOT</version>
-       <packaging>feature</packaging>
+    <groupId>org.onap.sdnc.northbound</groupId>
+    <artifactId>features-generic-resource-api</artifactId>
+    <version>2.2.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
 
-       <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name>
+    <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name>
 
-       <dependencies>
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>sdnc-generic-resource-api</artifactId>
-                       <version>${project.version}</version>
-                       <type>xml</type>
-                       <classifier>features</classifier>
-               </dependency>
-
-       </dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnc-generic-resource-api</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+    </dependencies>
 </project>
index 8acb44a..57e69c7 100644 (file)
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>ccsdk-sli</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
@@ -40,6 +40,5 @@
             <artifactId>generic-resource-api-provider</artifactId>
             <version>${project.version}</version>
         </dependency>
-
     </dependencies>
 </project>
index 2f64fe2..60281ff 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>
+    <modelVersion>4.0.0</modelVersion>
 
-       <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>odlparent-lite</artifactId>
-               <version>2.2.0-SNAPSHOT</version>
-               <relativePath/>
-       </parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>2.2.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-       <groupId>org.onap.sdnc.northbound</groupId>
-       <artifactId>generic-resource-api-installer</artifactId>
-       <version>2.2.0-SNAPSHOT</version>
-       <packaging>pom</packaging>
+    <groupId>org.onap.sdnc.northbound</groupId>
+    <artifactId>generic-resource-api-installer</artifactId>
+    <version>2.2.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-       <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name>
+    <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name>
 
-       <properties>
-               <application.name>sdnc-generic-resource-api</application.name>
-               <features.boot>${application.name}</features.boot>
-               <features.repositories>mvn:org.onap.sdnc.northbound/${application.name}/${project.version}/xml/features</features.repositories>
-               <include.transitive.dependencies>false</include.transitive.dependencies>
-       </properties>
+    <properties>
+        <application.name>sdnc-generic-resource-api</application.name>
+        <features.boot>${application.name}</features.boot>
+        <features.repositories>mvn:org.onap.sdnc.northbound/${application.name}/${project.version}/xml/features
+        </features.repositories>
+        <include.transitive.dependencies>false</include.transitive.dependencies>
+    </properties>
 
-       <dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.sdnc.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.sdnc.northbound</groupId>
+            <artifactId>generic-resource-api-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
 
-               <dependency>
-                       <groupId>org.onap.sdnc.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.sdnc.northbound</groupId>
-                       <artifactId>generic-resource-api-provider</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-
-
-       </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>true</attach>
-                                                       <finalName>stage/${application.name}-${project.version}</finalName>
-                                                       <descriptors>
-                                                               <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
-                                                       </descriptors>
-                                               </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.sdnc.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>
+    <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>true</attach>
+                            <finalName>stage/${application.name}-${project.version}</finalName>
+                            <descriptors>
+                                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
+                            </descriptors>
+                        </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.sdnc.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 792fe04..4d49bbb 100644 (file)
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-       <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>odlparent-lite</artifactId>
-               <version>2.2.0-SNAPSHOT</version>
-               <relativePath/>
-       </parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>2.2.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-       <groupId>org.onap.sdnc.northbound</groupId>
-       <artifactId>generic-resource-api-model</artifactId>
-       <version>2.2.0-SNAPSHOT</version>
-       <packaging>pom</packaging>
+    <groupId>org.onap.sdnc.northbound</groupId>
+    <artifactId>generic-resource-api-model</artifactId>
+    <version>2.2.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-       <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name>
+    <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name>
 
-       <modules>
-               <module>yang</module>
-               <module>swagger</module>
-       </modules>
+    <modules>
+        <module>yang</module>
+        <module>swagger</module>
+    </modules>
 </project>
index 871c744..4b0ce29 100644 (file)
@@ -29,7 +29,7 @@
             <artifactId>generic-resource-api-model-yang</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!-- End this is where the yang comes from -->        
+        <!-- End this is where the yang comes from -->
     </dependencies>
 
     <repositories>
@@ -52,7 +52,9 @@
                 <configuration>
                     <outputDirectory>${project.build.directory}/dependency</outputDirectory>
                     <includes>**\/*.yang</includes>
-                    <includeGroupIds>org.opendaylight.mdsal.model,org.opendaylight.mdsal.binding.model.ietf,org.onap.sdnc.northbound</includeGroupIds>
+                    <includeGroupIds>
+                        org.opendaylight.mdsal.model,org.opendaylight.mdsal.binding.model.ietf,org.onap.sdnc.northbound
+                    </includeGroupIds>
                 </configuration>
                 <executions>
                     <execution>
                         <configuration>
                             <codeGenerators>
                                 <generator>
-                                    <codeGeneratorClass>com.mrv.yangtools.maven.gen.swagger.MavenSwaggerGenerator</codeGeneratorClass>
+                                    <codeGeneratorClass>com.mrv.yangtools.maven.gen.swagger.MavenSwaggerGenerator
+                                    </codeGeneratorClass>
                                     <outputBaseDir>${project.basedir}/src/main/json</outputBaseDir>
                                     <resourceBaseDir>${project.build.directory}/yang</resourceBaseDir>
                                     <additionalConfiguration>
                         <configuration>
                             <codeGenerators>
                                 <generator>
-                                    <codeGeneratorClass>com.mrv.yangtools.maven.gen.swagger.MavenSwaggerGenerator</codeGeneratorClass>
+                                    <codeGeneratorClass>com.mrv.yangtools.maven.gen.swagger.MavenSwaggerGenerator
+                                    </codeGeneratorClass>
                                     <outputBaseDir>${project.basedir}/src/main/yaml</outputBaseDir>
                                     <resourceBaseDir>${project.build.directory}/yang</resourceBaseDir>
                                     <additionalConfiguration>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
             </plugin>
-             <plugin>
+            <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
                 <version>1.10</version>
index 7dbf48b..8ac6c40 100644 (file)
@@ -21,8 +21,6 @@
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc6991</artifactId>
         </dependency>
-
-        
     </dependencies>
 
     <build>
index 61c6549..a84a827 100644 (file)
@@ -1,26 +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/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-       <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>odlparent-lite</artifactId>
-               <version>2.2.0-SNAPSHOT</version>
-               <relativePath/>
-       </parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>2.2.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-       <groupId>org.onap.sdnc.northbound</groupId>
-       <artifactId>generic-resource-api</artifactId>
-       <version>2.2.0-SNAPSHOT</version>
-       <packaging>pom</packaging>
+    <groupId>org.onap.sdnc.northbound</groupId>
+    <artifactId>generic-resource-api</artifactId>
+    <version>2.2.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-       <name>sdnc-northbound :: generic-resource-api</name>
+    <name>sdnc-northbound :: generic-resource-api</name>
 
-       <modules>
-               <module>model</module>
-               <module>provider</module>
-               <module>features</module>
-               <module>client</module>
-               <module>installer</module>
-       </modules>
+    <modules>
+        <module>model</module>
+        <module>provider</module>
+        <module>features</module>
+        <module>client</module>
+        <module>installer</module>
+    </modules>
 </project>
index 2dd8d69..45ed0ae 100644 (file)
     <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name>
 
     <dependencyManagement>
-           <dependencies>
-               <dependency>
+        <dependencies>
+            <dependency>
                 <groupId>org.onap.ccsdk.sli.core</groupId>
                 <artifactId>sli-core-artifacts</artifactId>
-                <version>${ccsdk.sli.core.version}</version>
+                <version>${ccsdk.sli.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
-               </dependency>
-           </dependencies>
-       </dependencyManagement>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
         <dependency>
             <groupId>org.onap.sdnc.northbound</groupId>
             <scope>test</scope>
         </dependency>
     </dependencies>
+
     <build>
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                  <forceJavacCompilerUse>true</forceJavacCompilerUse>
+                    <forceJavacCompilerUse>true</forceJavacCompilerUse>
                 </configuration>
-              </plugin>
+            </plugin>
         </plugins>
     </build>
 </project>
index eba8f31..5a4ae5c 100644 (file)
@@ -28,6 +28,5 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-
     </dependencies>
 </project>
index 1cbc767..edafbc5 100644 (file)
     <name>sdnc-northbound :: optical-service :: ${project.artifactId}</name>
 
     <dependencies>
-
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>ccsdk-sli</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
@@ -35,6 +34,5 @@
             <artifactId>optical-service-provider</artifactId>
             <version>${project.version}</version>
         </dependency>
-
     </dependencies>
 </project>
index b2db80a..82bdb2a 100644 (file)
     <properties>
         <application.name>sdnc-optical-service</application.name>
         <features.boot>${application.name}</features.boot>
-        <features.repositories>mvn:org.onap.sdnc.northbound/${features.boot}/${project.version}/xml/features</features.repositories>
+        <features.repositories>mvn:org.onap.sdnc.northbound/${features.boot}/${project.version}/xml/features
+        </features.repositories>
         <include.transitive.dependencies>false</include.transitive.dependencies>
     </properties>
 
     <dependencies>
-
         <dependency>
             <groupId>org.onap.sdnc.northbound</groupId>
             <artifactId>${application.name}</artifactId>
             <artifactId>optical-service-model</artifactId>
             <version>${project.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.onap.sdnc.northbound</groupId>
             <artifactId>optical-service-provider</artifactId>
             <version>${project.version}</version>
         </dependency>
-
-
     </dependencies>
 
     <build>
                             </resources>
                         </configuration>
                     </execution>
-
                 </executions>
             </plugin>
-
         </plugins>
     </build>
 </project>
index 346bc1f..444e92b 100644 (file)
@@ -25,7 +25,5 @@
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc6991</artifactId>
         </dependency>
-
-        
     </dependencies>
 </project>
index 756737c..dda0e8c 100644 (file)
@@ -25,7 +25,7 @@
             <dependency>
                 <groupId>org.onap.ccsdk.sli.core</groupId>
                 <artifactId>sli-core-artifacts</artifactId>
-                <version>${ccsdk.sli.core.version}</version>
+                <version>${ccsdk.sli.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/pom.xml b/pom.xml
index cc55ba2..c9f29aa 100644 (file)
--- a/pom.xml
+++ b/pom.xml
 <?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>
+    <modelVersion>4.0.0</modelVersion>
 
-       <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>odlparent-lite</artifactId>
-               <version>2.2.0-SNAPSHOT</version>
-               <relativePath/>
-       </parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>2.2.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-       <groupId>org.onap.sdnc.northbound</groupId>
-       <artifactId>sdnc-northbound</artifactId>
-       <version>2.2.0-SNAPSHOT</version>
-       <packaging>pom</packaging>
+    <groupId>org.onap.sdnc.northbound</groupId>
+    <artifactId>sdnc-northbound</artifactId>
+    <version>2.2.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-       <name>sdnc-northbound</name>
-       <description>The SDN-C Northbound APIs repo contains code for northbound API adaptors, typically MD-SAL applications</description>
-       <url>https://wiki.onap.org</url>
-       <organization>
-               <name>ONAP</name>
-       </organization>
+    <name>sdnc-northbound</name>
+    <description>The SDN-C Northbound APIs repo contains code for northbound API adaptors, typically MD-SAL
+        applications
+    </description>
+    <url>https://wiki.onap.org</url>
+    <organization>
+        <name>ONAP</name>
+    </organization>
 
-       <modules>
-               <module>generic-resource-api</module>
-               <module>optical-service</module>
-               <module>vnftools</module>
-               <module>features</module>
-       </modules>
+    <modules>
+        <module>generic-resource-api</module>
+        <module>optical-service</module>
+        <module>vnftools</module>
+        <module>features</module>
+    </modules>
 
-       <scm>
-               <connection>scm:git:ssh://git@${onap.git.host}/sdnc-northbound.git</connection>
+    <scm>
+        <connection>scm:git:ssh://git@${onap.git.host}/sdnc-northbound.git</connection>
+        <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>
+    <issueManagement>
+        <system>JIRA</system>
+        <url>https://jira.onap.org/</url>
+    </issueManagement>
+    <ciManagement>
+        <system>Jenkins</system>
+        <url>https://jenkins.onap.org/</url>
+    </ciManagement>
+    <distributionManagement>
+        <site>
+            <id>sdnc-javadoc</id>
+            <url>
+                dav:https://${onap.nexus.host}:${onap.nexus.port}/repository/sdn-c-javadoc/${project.artifactId}/${project.version}
+            </url>
+        </site>
+    </distributionManagement>
 
-               <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>
-       <issueManagement>
-               <system>JIRA</system>
-               <url>https://jira.onap.org/</url>
-       </issueManagement>
-       <ciManagement>
-               <system>Jenkins</system>
-               <url>https://jenkins.onap.org/</url>
-       </ciManagement>
-       <distributionManagement>
-               <site>
-                       <id>sdnc-javadoc</id>
-                       <url>dav:https://${onap.nexus.host}:${onap.nexus.port}/repository/sdn-c-javadoc/${project.artifactId}/${project.version}</url>
-               </site>
-       </distributionManagement>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.17</version>
+                <configuration>
+                    <skipTests>false</skipTests>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-surefire-plugin</artifactId>
-                               <version>2.17</version>
-                               <configuration>
-                                       <skipTests>false</skipTests>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-
-       <profiles>
-               <profile>
-                       <id>blackduck</id>
-                       <activation>
-                               <property>
-                                       <name>blackduck-scan</name>
-                               </property>
-                       </activation>
-                       <build>
-                                       <plugins>
-                                               <plugin>
-                                                       <groupId>com.blackducksoftware.integration</groupId>
-                                                       <artifactId>hub-maven-plugin</artifactId>
-                                                       <version>1.4.0</version>
-                                                       <inherited>false</inherited>
-                                                       <configuration>
-                                                               <hubProjectName>${project.name}</hubProjectName>
-                                                               <outputDirectory>${project.basedir}</outputDirectory>
-                                                       </configuration>
-                                                       <executions>
-                                                               <execution>
-                                                                       <id>create-bdio-file</id>
-                                                                       <phase>package</phase>
-                                                                       <goals>
-                                                                               <goal>createHubOutput</goal>
-                                                                       </goals>
-                                                               </execution>
-                                                       </executions>
-                                               </plugin>
-                                       </plugins>
-
-
-                       </build>
-
-               </profile>
-
-       </profiles>
+    <profiles>
+        <profile>
+            <id>blackduck</id>
+            <activation>
+                <property>
+                    <name>blackduck-scan</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>com.blackducksoftware.integration</groupId>
+                        <artifactId>hub-maven-plugin</artifactId>
+                        <version>1.4.0</version>
+                        <inherited>false</inherited>
+                        <configuration>
+                            <hubProjectName>${project.name}</hubProjectName>
+                            <outputDirectory>${project.basedir}</outputDirectory>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>create-bdio-file</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>createHubOutput</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
diff --git a/ueb-listener/.gitignore b/ueb-listener/.gitignore
deleted file mode 100755 (executable)
index 1b8a6ba..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-org.eclipse.core.resources.prefs
-.classpath\r
-.project\r
-.settings\r
-.idea\r
-.externalToolBuilders\r
-maven-eclipse.xml\r
-*.class\r
-target/\r
-MANIFEST.MF\r
-.DS_STORE\r
-.metadata\r
diff --git a/ueb-listener/.sonar/checkstyle.xml b/ueb-listener/.sonar/checkstyle.xml
deleted file mode 100755 (executable)
index 3fa2315..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd"><!-- Generated by Sonar --><module name="Checker"><module name="SuppressionCommentFilter"/><module name="TreeWalker"><module name="FileContentsHolder"/> <module name="ClassFanOutComplexity"><property name="severity" value="warning"/></module><module name="NestedForDepth"><property name="severity" value="warning"/><property name="max" value="1"/></module><module name="ClassDataAbstractionCoupling"><property name="severity" value="warning"/></module></module></module>
\ No newline at end of file
diff --git a/ueb-listener/.sonar/pmd.xml b/ueb-listener/.sonar/pmd.xml
deleted file mode 100755 (executable)
index 80343b3..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<ruleset>\r
-  <rule ref="rulesets/java/naming.xml/BooleanGetMethodName">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/j2ee.xml/StaticEJBFieldShouldBeFinal">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/coupling.xml/CouplingBetweenObjects">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/codesize.xml/TooManyMethods">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/naming.xml/AvoidFieldNameMatchingTypeName">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/basic.xml/DoubleCheckedLocking">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/naming.xml/AvoidFieldNameMatchingMethodName">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/coupling.xml/ExcessiveImports">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/basic.xml/OverrideBothEqualsAndHashcode">\r
-    <priority>2</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/naming.xml/ShortMethodName">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/basic.xml/BooleanInstantiation">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/codesize.xml/TooManyFields">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/controversial.xml/AvoidUsingNativeCode">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/optimizations.xml/UseStringBufferForStringAppends">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/coupling.xml/LooseCoupling">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/design.xml/NonThreadSafeSingleton">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/j2ee.xml/DoNotUseThreads">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/sunsecure.xml/ArrayIsStoredDirectly">\r
-    <priority>5</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/sunsecure.xml/MethodReturnsInternalArray">\r
-    <priority>2</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/design.xml/AssignmentToNonFinalStatic">\r
-    <priority>3</priority>\r
-  </rule>\r
-  <rule ref="rulesets/java/strictexception.xml/AvoidCatchingGenericException">\r
-    <priority>3</priority>\r
-  </rule>\r
-</ruleset>\r
-\r
diff --git a/ueb-listener/README.md b/ueb-listener/README.md
deleted file mode 100644 (file)
index 842ddb1..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-UEB-LISTENER MOVED TO CCSDK!
-
-The code for ueb-listener moved to the ccsdk/sli/northbound repository
index b996aba..6a40016 100644 (file)
@@ -1,29 +1,28 @@
 <?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>
+    <modelVersion>4.0.0</modelVersion>
 
-       <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>feature-repo-parent</artifactId>
-               <version>2.2.0-SNAPSHOT</version>
-               <relativePath/>
-       </parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>feature-repo-parent</artifactId>
+        <version>2.2.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-       <groupId>org.onap.sdnc.northbound</groupId>
-       <artifactId>features-vnftools</artifactId>
-       <version>2.2.0-SNAPSHOT</version>
-       <packaging>feature</packaging>
+    <groupId>org.onap.sdnc.northbound</groupId>
+    <artifactId>features-vnftools</artifactId>
+    <version>2.2.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
 
-       <name>sdnc-northbound :: vnftools :: ${project.artifactId}</name>
+    <name>sdnc-northbound :: vnftools :: ${project.artifactId}</name>
 
-       <dependencies>
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>sdnc-vnftools</artifactId>
-                       <version>${project.version}</version>
-                       <type>xml</type>
-                       <classifier>features</classifier>
-               </dependency>
-
-       </dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnc-vnftools</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+    </dependencies>
 </project>
index e70447a..1dca050 100644 (file)
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>ccsdk-sli</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
@@ -35,6 +35,5 @@
             <artifactId>vnftools-provider</artifactId>
             <version>${project.version}</version>
         </dependency>
-
     </dependencies>
 </project>
index c29bb4e..a4ea19f 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>
+    <modelVersion>4.0.0</modelVersion>
 
-       <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>odlparent-lite</artifactId>
-               <version>2.2.0-SNAPSHOT</version>
-       </parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>2.2.0-SNAPSHOT</version>
+    </parent>
 
-       <groupId>org.onap.sdnc.northbound</groupId>
-       <artifactId>vnftools-installer</artifactId>
-       <version>2.2.0-SNAPSHOT</version>
-       <packaging>pom</packaging>
+    <groupId>org.onap.sdnc.northbound</groupId>
+    <artifactId>vnftools-installer</artifactId>
+    <version>2.2.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-       <name>sdnc-northbound :: vnftools :: ${project.artifactId}</name>
+    <name>sdnc-northbound :: vnftools :: ${project.artifactId}</name>
 
-       <properties>
-               <application.name>sdnc-vnftools</application.name>
-               <features.boot>${application.name}</features.boot>
-               <features.repositories>mvn:org.onap.sdnc.northbound/${application.name}/${project.version}/xml/features</features.repositories>
-               <include.transitive.dependencies>false</include.transitive.dependencies>
-       </properties>
+    <properties>
+        <application.name>sdnc-vnftools</application.name>
+        <features.boot>${application.name}</features.boot>
+        <features.repositories>mvn:org.onap.sdnc.northbound/${application.name}/${project.version}/xml/features
+        </features.repositories>
+        <include.transitive.dependencies>false</include.transitive.dependencies>
+    </properties>
 
-       <dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</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.sdnc.northbound</groupId>
+            <artifactId>vnftools-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
 
-               <dependency>
-                       <groupId>${project.groupId}</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.sdnc.northbound</groupId>
-                       <artifactId>vnftools-provider</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-
-
-       </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>true</attach>
-                                                       <finalName>stage/${application.name}-${project.version}</finalName>
-                                                       <descriptors>
-                                                               <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
-                                                       </descriptors>
-                                               </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.sdnc.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>
+    <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>true</attach>
+                            <finalName>stage/${application.name}-${project.version}</finalName>
+                            <descriptors>
+                                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
+                            </descriptors>
+                        </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.sdnc.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 6b39c13..59eb09a 100644 (file)
@@ -1,49 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-
-       <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>odlparent-lite</artifactId>
-               <version>2.2.0-SNAPSHOT</version>
-       </parent>
-
-       <groupId>org.onap.sdnc.northbound</groupId>
-       <artifactId>vnftools</artifactId>
-       <version>2.2.0-SNAPSHOT</version>
-       <packaging>pom</packaging>
-
-       <name>VNF Tools Plugin</name>
-       <description>Provides execute nodes to Directed Graphs that use the VNF Module.</description>
-
-       <modules>
-    <module>provider</module>
-    <module>features</module>
-    <module>installer</module>
-  </modules>
-
-       <properties>
-               <feature-name>vnftools</feature-name>
-       </properties>
-
-       <dependencyManagement>
-
-                <dependencies>
-                        <dependency>
-                                <groupId>org.onap.sdnc.northbound</groupId>
-                                <artifactId>vnftools-features</artifactId>
-                                <version>${project.version}</version>
-                                <type>xml</type>
-                                <classifier>features</classifier>
-                        </dependency>
-
-                        <dependency>
-                                <groupId>org.onap.sdnc.northbound</groupId>
-                                <artifactId>vnftools-provider</artifactId>
-                                <version>${project.version}</version>
-                        </dependency>
-                </dependencies>
-
-
-        </dependencyManagement>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>2.2.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.onap.sdnc.northbound</groupId>
+    <artifactId>vnftools</artifactId>
+    <version>2.2.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>VNF Tools Plugin</name>
+    <description>Provides execute nodes to Directed Graphs that use the VNF Module.</description>
+
+    <modules>
+        <module>provider</module>
+        <module>features</module>
+        <module>installer</module>
+    </modules>
+
+    <properties>
+        <feature-name>vnftools</feature-name>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.onap.sdnc.northbound</groupId>
+                <artifactId>vnftools-features</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.sdnc.northbound</groupId>
+                <artifactId>vnftools-provider</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 </project>
index 0e8f04f..ee271d5 100644 (file)
@@ -25,7 +25,7 @@
             <dependency>
                 <groupId>org.onap.ccsdk.sli.core</groupId>
                 <artifactId>sli-core-artifacts</artifactId>
-                <version>${ccsdk.sli.core.version}</version>
+                <version>${ccsdk.sli.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sliPluginUtils-provider</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
         </dependency>
     </dependencies>
 </project>