Remove unused modules and fix pom structure 02/111102/1
authorDan Timoney <dtimoney@att.com>
Mon, 10 Aug 2020 18:09:14 +0000 (14:09 -0400)
committerDan Timoney <dtimoney@att.com>
Mon, 10 Aug 2020 18:11:09 +0000 (14:11 -0400)
Removed modules not currently being used and restructured poms into
parent/child relationship to fix problem that was causing
version plugin not to update versions properly.

Change-Id: I41d63d469a24c65e8771e1546c879ab1bf8d0d53
Issue-ID: SDNC-1315
Signed-off-by: Dan Timoney <dtimoney@att.com>
Former-commit-id: 9bf0c309085118b432f0fab1d7012a3b33180d4b

28 files changed:
.gitignore
SdncReports/SdncReportsApi/pom.xml
SdncReports/SdncReportsDao/pom.xml
SdncReports/pom.xml
admportal/pom.xml
configbackuprestore/getBackupVnfDetailService/pom.xml
configbackuprestore/pom.xml
configbackuprestore/vnfconfigbackupservice/pom.xml
configbackuprestore/vnfconfigreportsservice/pom.xml
data-migrator/pom.xml
installation/admportal/pom.xml
installation/ansible-server/pom.xml
installation/dmaap-listener/pom.xml
installation/pom.xml
installation/sdnc-web/pom.xml
installation/sdnc/pom.xml
installation/ueb-listener/pom.xml
platform-logic/datachange/pom.xml
platform-logic/generic-resource-api/pom.xml
platform-logic/installer/pom.xml
platform-logic/lcm/pom.xml
platform-logic/optical-service/pom.xml
platform-logic/pom.xml
platform-logic/restapi-templates/pom.xml
platform-logic/restconfapi-yang/pom.xml
platform-logic/setup/pom.xml
platform-logic/vnfapi/pom.xml
pom.xml

index 1c75d57..33b7de6 100755 (executable)
@@ -12,6 +12,7 @@ org.eclipse.core.resources.prefs
 maven-eclipse.xml
 workspace
 .factorypath
+.vscode
 
 ## Compilation Files ##
 *.class
index b0e7c04..a8522b6 100644 (file)
 <?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>
-       <packaging>jar</packaging>
-       <artifactId>SdncReportsApi</artifactId>
-       <groupId>org.onap.sdnc.oam</groupId>
-       <version>2.0.0-SNAPSHOT</version>
-        <name>sdnc-oam :: SdncReports :: SdncReportsApi</name>
-       <parent>
-               <groupId>org.onap.sdnc.oam</groupId>
-               <artifactId>SdncReports</artifactId>
-               <version>2.0.0-SNAPSHOT</version>
-       </parent>
-
-
-       <properties>
-               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-               <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-               <java.version>1.8</java.version>
-       </properties>
-
-       <dependencies>
-       
-               <dependency>
-                       <groupId>ch.vorburger.mariaDB4j</groupId>
-                       <artifactId>mariaDB4j</artifactId>
-                       <version>2.2.3</version>
-               </dependency>
-               
-               <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
-               <dependency>
-                       <groupId>com.google.code.gson</groupId>
-                       <artifactId>gson</artifactId>
-                       <version>2.8.2</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>SdncReportsDao</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.mariadb.jdbc</groupId>
-                       <artifactId>mariadb-java-client</artifactId>
-                       <version>1.1.9</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-web</artifactId>
-                       <version>1.5.4.RELEASE</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-context</artifactId>
-                       <version>4.3.9.RELEASE</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-tomcat</artifactId>
-                       <scope>provided</scope>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.apache.tomcat.embed</groupId>
-                       <artifactId>tomcat-embed-jasper</artifactId>
-                       <scope>provided</scope>
-               </dependency>
-
-
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-devtools</artifactId>
-                       <optional>true</optional>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-test</artifactId>
-                       <scope>test</scope>
-                       <version>1.5.3.RELEASE</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-data-jpa</artifactId>
-               </dependency>
-
-               <!-- Add Log4j2 Dependency -->
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-log4j2</artifactId>
-               </dependency>
-               
-               <!-- Add Web jars, instead of dist folder  -->
-               <dependency>
-                       <groupId>org.webjars</groupId>
-                       <artifactId>bootstrap</artifactId>
-                       <version>3.3.7</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.webjars</groupId>
-                       <artifactId>bootstrap-datepicker</artifactId>
-                       <version>1.0.1</version>
-               </dependency>
-               
-       </dependencies>
-
-       <build>
-
-               <plugins>
-
-                       <plugin>
-                               <groupId>org.springframework.boot</groupId>
-                               <artifactId>spring-boot-maven-plugin</artifactId>
-                               <configuration>
-                                       <executable>true</executable>
-                               </configuration>
-                               
-                       </plugin>
-
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-surefire-plugin</artifactId>
-                               <configuration>
-                                       <skipTests>true</skipTests>
-                               </configuration>
-                       </plugin>
-
-                       <plugin>
-                               <groupId>org.jacoco</groupId>
-                               <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>0.7.5.201505241946</version>
-                               <executions>                                    
-                                       <execution>
-                                               <id>pre-unit-test</id>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <!-- Sets the path to the file which contains the execution data. -->
-                                                       <destFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</destFile>
-                                                       <!-- Sets the name of the property containing the settings for JaCoCo 
-                                                               runtime agent. -->
-                                                       <propertyName>surefireArgLine</propertyName>
-                                               </configuration>
-                                       </execution>
-                                       
-                                       <execution>
-                                               <id>post-unit-test</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>report</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <!-- Sets the path to the file which contains the execution data. -->
-                                                       <dataFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</dataFile>
-                                                       <!-- Sets the output directory for the code coverage report. -->
-                                                       <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-
-                       <plugin>
-                               <groupId>io.fabric8</groupId>
-                               <artifactId>docker-maven-plugin</artifactId>
-                               <version>0.15.3</version>
-                               <configuration>
-                                       <dockerHost>http://127.0.0.1:9092</dockerHost>
-                                       <verbose>true</verbose>
-                                       <images>
-                                               <image>
-                                                       <name>vishal/sdnc_report</name>
-                                                       <build>
-                                                               <dockerFile>Dockerfile</dockerFile>
-                                                               <assembly>
-                                                                       <descriptorRef>artifact</descriptorRef>
-                                                               </assembly>
-                                                       </build>
-                                               </image>
-                                       </images>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.sdnc.oam</groupId>
+        <artifactId>SdncReports</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.onap.sdnc.oam</groupId>
+    <artifactId>SdncReportsApi</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>sdnc-oam :: SdncReports :: SdncReportsApi</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
+    </properties>
+
+    <dependencies>
+    
+        <dependency>
+            <groupId>ch.vorburger.mariaDB4j</groupId>
+            <artifactId>mariaDB4j</artifactId>
+            <version>2.2.3</version>
+        </dependency>
+        
+        <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>SdncReportsDao</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+            <version>1.1.9</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <version>1.5.4.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>4.3.9.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-jasper</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <version>1.5.3.RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+
+        <!-- Add Log4j2 Dependency -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-log4j2</artifactId>
+        </dependency>
+        
+        <!-- Add Web jars, instead of dist folder  -->
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>bootstrap</artifactId>
+            <version>3.3.7</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>bootstrap-datepicker</artifactId>
+            <version>1.0.1</version>
+        </dependency>
+        
+    </dependencies>
+
+    <build>
+        <plugins>
+
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <executable>true</executable>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.7.5.201505241946</version>
+                <executions>                    
+                    <execution>
+                        <id>pre-unit-test</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <!-- Sets the path to the file which contains the execution data. -->
+                            <destFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</destFile>
+                            <!-- Sets the name of the property containing the settings for JaCoCo 
+                                runtime agent. -->
+                            <propertyName>surefireArgLine</propertyName>
+                        </configuration>
+                    </execution>
+                    
+                    <execution>
+                        <id>post-unit-test</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <configuration>
+                            <!-- Sets the path to the file which contains the execution data. -->
+                            <dataFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</dataFile>
+                            <!-- Sets the output directory for the code coverage report. -->
+                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>0.15.3</version>
+                <configuration>
+                    <dockerHost>http://127.0.0.1:9092</dockerHost>
+                    <verbose>true</verbose>
+                    <images>
+                        <image>
+                            <name>vishal/sdnc_report</name>
+                            <build>
+                                <dockerFile>Dockerfile</dockerFile>
+                                <assembly>
+                                    <descriptorRef>artifact</descriptorRef>
+                                </assembly>
+                            </build>
+                        </image>
+                    </images>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
index 5c95994..90a0973 100644 (file)
@@ -1,59 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <groupId>org.onap.sdnc.oam</groupId>
-       <artifactId>SdncReportsDao</artifactId>
-       <version>2.0.0-SNAPSHOT</version>
-       <packaging>jar</packaging>
-
-        <name>sdnc-oam :: SdncReports :: SdncReportsDao</name>
-
-       <parent>
-               <groupId>org.onap.sdnc.oam</groupId>
-               <artifactId>SdncReports</artifactId>
-               <version>2.0.0-SNAPSHOT</version>
-       </parent>
-
-       <dependencies>
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-context</artifactId>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-test</artifactId>
-                       <scope>test</scope>
-                       <version>1.5.3.RELEASE</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-data-jpa</artifactId>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>org.hibernate</groupId>
-                                       <artifactId>hibernate-entitymanager</artifactId>
-                               </exclusion>
-                       </exclusions>
-
-               </dependency>
-
-
-               <!-- <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-tomcat</artifactId> 
-                       <scope>provided</scope> </dependency> -->
-
-               <dependency>
-                       <groupId>com.fasterxml.jackson.core</groupId>
-                       <artifactId>jackson-annotations</artifactId>
-               </dependency>
-
-               <!-- <dependency> <groupId>org.hibernate.javax.persistence</groupId> <artifactId>hibernate-jpa-2.0-api</artifactId> 
-                       <version>1.0.1.Final</version> </dependency> -->
-               <dependency>
-                       <groupId>org.mariadb.jdbc</groupId>
-                       <artifactId>mariadb-java-client</artifactId>
-                       <version>1.1.7</version>
-               </dependency>
-       </dependencies>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.sdnc.oam</groupId>
+        <artifactId>SdncReports</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.onap.sdnc.oam</groupId>
+    <artifactId>SdncReportsDao</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>sdnc-oam :: SdncReports :: SdncReportsDao</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <version>1.5.3.RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate-entitymanager</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+
+        <!-- <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-tomcat</artifactId> 
+            <scope>provided</scope> </dependency> -->
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+        </dependency>
+
+        <!-- <dependency> <groupId>org.hibernate.javax.persistence</groupId> <artifactId>hibernate-jpa-2.0-api</artifactId> 
+            <version>1.0.1.Final</version> </dependency> -->
+        <dependency>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+            <version>1.1.7</version>
+        </dependency>
+    </dependencies>
 </project>
index 219a26d..6b50c07 100644 (file)
@@ -1,77 +1,76 @@
 <?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>spring-boot-1-starter-parent</artifactId>
+        <version>2.0.0</version>
+        <relativePath/>
+    </parent>
 
-       <groupId>org.onap.sdnc.oam</groupId>
-       <artifactId>SdncReports</artifactId>
-       <version>2.0.0-SNAPSHOT</version>
-       <packaging>pom</packaging>
+    <groupId>org.onap.sdnc.oam</groupId>
+    <artifactId>SdncReports</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-        <name>sdnc-oam :: SdncReports</name>
+    <name>sdnc-oam :: SdncReports</name>
 
-       <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>spring-boot-1-starter-parent</artifactId>
-               <version>2.0.0</version>
-       </parent>
-       <distributionManagement>
-               <repository>
-                       <id>ecomp-releases</id>
-                       <url>http://nexus.onap.org/content/repositories/releases</url>
-               </repository>
-               <snapshotRepository>
-                       <id>ecomp-snapshots</id>
-                       <url>http://nexus.onap.org/content/repositories/snapshots</url>
-               </snapshotRepository>
-       </distributionManagement>
+    <modules>
+        <module>SdncReportsDao</module>
+        <module>SdncReportsApi</module>
+    </modules>
 
-       <modules>
-               <module>SdncReportsDao</module>
-               <module>SdncReportsApi</module>
-       </modules>
-
-       <build>
-
-               <plugins>
-                       <plugin>
-                               <groupId>org.jacoco</groupId>
-                               <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>0.7.5.201505241946</version>
-                               <executions>
-                                       <!-- Prepares the property pointing to the JaCoCo runtime agent which 
-                                               is passed as VM argument when Maven the Surefire plugin is executed. -->
-                                       <execution>
-                                               <id>pre-unit-test</id>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <!-- Sets the path to the file which contains the execution data. -->
-                                                       <destFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</destFile>
-                                                       <!-- Sets the name of the property containing the settings for JaCoCo 
-                                                               runtime agent. -->
-                                                       <propertyName>surefireArgLine</propertyName>
-                                               </configuration>
-                                       </execution>
-                                       <!-- Ensures that the code coverage report for unit tests is created 
-                                               after unit tests have been run. -->
-                                       <execution>
-                                               <id>post-unit-test</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>report</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <!-- Sets the path to the file which contains the execution data. -->
-                                                       <dataFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</dataFile>
-                                                       <!-- Sets the output directory for the code coverage report. -->
-                                                       <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-               </plugins>
-       </build>
+    <distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <url>http://nexus.onap.org/content/repositories/releases</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <url>http://nexus.onap.org/content/repositories/snapshots</url>
+        </snapshotRepository>
+    </distributionManagement>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.7.5.201505241946</version>
+                <executions>
+                    <!-- Prepares the property pointing to the JaCoCo runtime agent which 
+                        is passed as VM argument when Maven the Surefire plugin is executed. -->
+                    <execution>
+                        <id>pre-unit-test</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <!-- Sets the path to the file which contains the execution data. -->
+                            <destFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</destFile>
+                            <!-- Sets the name of the property containing the settings for JaCoCo 
+                                runtime agent. -->
+                            <propertyName>surefireArgLine</propertyName>
+                        </configuration>
+                    </execution>
+                    <!-- Ensures that the code coverage report for unit tests is created 
+                        after unit tests have been run. -->
+                    <execution>
+                        <id>post-unit-test</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <configuration>
+                            <!-- Sets the path to the file which contains the execution data. -->
+                            <dataFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</dataFile>
+                            <!-- Sets the output directory for the code coverage report. -->
+                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
index 7fc8644..9c1c8bc 100644 (file)
         <build.number>${maven.build.timestamp}</build.number>
         <SWM_VERSION>${project.version}-${build.number}</SWM_VERSION>
     </properties>
-       <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>
+
+    <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>org.onap.ccsdk.sli.core</groupId>
index b1e35c0..1e65ddd 100644 (file)
 <?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.sdnc.oam.vnfbackup</groupId>
-               <artifactId>configbackuprestore</artifactId>
-               <version>2.0.0-SNAPSHOT</version>
-       </parent>
-       <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
-       <artifactId>getBackupVnfDetailService</artifactId>
-       <version>2.0.0-SNAPSHOT</version>
-       <name>sdnc-oam :: vnfbackup :: getBackupVnfDetailService</name>
-       <url>http://maven.apache.org</url>
-       <properties>
-               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-       </properties>
-       <dependencies>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>4.4</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.mariadb.jdbc</groupId>
-                       <artifactId>mariadb-java-client</artifactId>
-                       <version>1.1.9</version>
-               </dependency>
-               <!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
-               <dependency>
-                       <groupId>commons-codec</groupId>
-                       <artifactId>commons-codec</artifactId>
-                       <version>1.9</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-web</artifactId>
-                       <version>1.5.4.RELEASE</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-context</artifactId>
-                       <version>4.3.9.RELEASE</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-tomcat</artifactId>
-                       <scope>provided</scope>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.apache.tomcat.embed</groupId>
-                       <artifactId>tomcat-embed-jasper</artifactId>
-                       <scope>provided</scope>
-               </dependency>
-
-
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-devtools</artifactId>
-                       <optional>true</optional>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-test</artifactId>
-                       <scope>test</scope>
-                       <version>1.5.3.RELEASE</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-data-jpa</artifactId>
-               </dependency>
-
-               <!-- Add Log4j2 Dependency -->
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-log4j2</artifactId>
-               </dependency>
-               <!-- https://mvnrepository.com/artifact/org.javers/javers-core -->
-               <dependency>
-                       <groupId>org.javers</groupId>
-                       <artifactId>javers-core</artifactId>
-                       <version>3.9.3</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.json</groupId>
-                       <artifactId>json</artifactId>
-                       <version>20180130</version>
-               </dependency>
-
-               <!-- https://mvnrepository.com/artifact/com.flipkart.zjsonpatch/zjsonpatch -->
-               <dependency>
-                       <groupId>com.flipkart.zjsonpatch</groupId>
-                       <artifactId>zjsonpatch</artifactId>
-                       <version>0.4.6</version>
-               </dependency>
-
-       </dependencies>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.jacoco</groupId>
-                               <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>0.7.5.201505241946</version>
-                               <executions>
-                                       <!-- Prepares the property pointing to the JaCoCo runtime agent which 
-                                               is passed as VM argument when Maven the Surefire plugin is executed. -->
-                                       <execution>
-                                               <id>pre-unit-test</id>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <!-- Sets the path to the file which contains the execution data. -->
-                                                       <destFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</destFile>
-                                                       <!-- Sets the name of the property containing the settings for JaCoCo 
-                                                               runtime agent. -->
-                                                       <propertyName>surefireArgLine</propertyName>
-                                               </configuration>
-                                       </execution>
-                                       <!-- Ensures that the code coverage report for unit tests is created 
-                                               after unit tests have been run. -->
-                                       <execution>
-                                               <id>post-unit-test</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>report</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <!-- Sets the path to the file which contains the execution data. -->
-                                                       <dataFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</dataFile>
-                                                       <!-- Sets the output directory for the code coverage report. -->
-                                                       <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-               </plugins>
-       </build>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
+        <artifactId>configbackuprestore</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
+    <artifactId>getBackupVnfDetailService</artifactId>
+    <version>2.0.0</version>
+
+    <name>sdnc-oam :: vnfbackup :: getBackupVnfDetailService</name>
+    <url>http://maven.apache.org</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.4</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+            <version>1.1.9</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.9</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <version>1.5.4.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>4.3.9.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-jasper</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <version>1.5.3.RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+
+        <!-- Add Log4j2 Dependency -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-log4j2</artifactId>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.javers/javers-core -->
+        <dependency>
+            <groupId>org.javers</groupId>
+            <artifactId>javers-core</artifactId>
+            <version>3.9.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20180130</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/com.flipkart.zjsonpatch/zjsonpatch -->
+        <dependency>
+            <groupId>com.flipkart.zjsonpatch</groupId>
+            <artifactId>zjsonpatch</artifactId>
+            <version>0.4.6</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.7.5.201505241946</version>
+                <executions>
+                    <!-- Prepares the property pointing to the JaCoCo runtime agent which 
+                        is passed as VM argument when Maven the Surefire plugin is executed. -->
+                    <execution>
+                        <id>pre-unit-test</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <!-- Sets the path to the file which contains the execution data. -->
+                            <destFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</destFile>
+                            <!-- Sets the name of the property containing the settings for JaCoCo 
+                                runtime agent. -->
+                            <propertyName>surefireArgLine</propertyName>
+                        </configuration>
+                    </execution>
+                    <!-- Ensures that the code coverage report for unit tests is created 
+                        after unit tests have been run. -->
+                    <execution>
+                        <id>post-unit-test</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <configuration>
+                            <!-- Sets the path to the file which contains the execution data. -->
+                            <dataFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</dataFile>
+                            <!-- Sets the output directory for the code coverage report. -->
+                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
index 2bd4dbd..599c4ea 100644 (file)
@@ -1,94 +1,93 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
-       <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>spring-boot-1-starter-parent</artifactId>
+        <version>2.0.0</version>
+    </parent>
 
-       <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
-       <artifactId>configbackuprestore</artifactId>
-       <version>2.0.0-SNAPSHOT</version>
-       <name>sdnc-oam :: vnfbackup</name>
-       <packaging>pom</packaging>
+    <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
+    <artifactId>configbackuprestore</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-       <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>spring-boot-1-starter-parent</artifactId>
-               <version>2.0.0</version>
-       </parent>
+    <name>sdnc-oam :: vnfbackup</name>
 
-       <properties>
-               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <modules>
+        <module>getBackupVnfDetailService</module>
+        <module>vnfconfigreportsservice</module>
+        <module>vnfconfigbackupservice</module>
+    </modules>
 
-               <!-- ONAP repositories -->
-               <onap.nexus.host>nexus.onap.org</onap.nexus.host>
-               <onap.nexus.port>443</onap.nexus.port>
-               <onap.nexus.protocol>https</onap.nexus.protocol>
-               <onap.nexus.public-url>https://nexus.onap.org/content/groups/public</onap.nexus.public-url>
-               <onap.nexus.staging-url>https://nexus.onap.org/content/groups/staging</onap.nexus.staging-url>
-               <onap.nexus.release-url>https://nexus.onap.org/content/repositories/releases</onap.nexus.release-url>
-               <onap.nexus.snapshot-url>https://nexus.onap.org/content/repositories/snapshots</onap.nexus.snapshot-url>
-               <onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id>
-               <onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id>
-       </properties>
+    <distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <url>http://nexus.onap.org/content/repositories/releases</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <url>http://nexus.onap.org/content/repositories/snapshots</url>
+        </snapshotRepository>
+    </distributionManagement>
 
-       <dependencies>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>3.8.1</version>
-                       <scope>test</scope>
-               </dependency>
-       </dependencies>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-       <distributionManagement>
-               <repository>
-                       <id>ecomp-releases</id>
-                       <url>http://nexus.onap.org/content/repositories/releases</url>
-               </repository>
-               <snapshotRepository>
-                       <id>ecomp-snapshots</id>
-                       <url>http://nexus.onap.org/content/repositories/snapshots</url>
-               </snapshotRepository>
-       </distributionManagement>
+        <!-- ONAP repositories -->
+        <onap.nexus.host>nexus.onap.org</onap.nexus.host>
+        <onap.nexus.port>443</onap.nexus.port>
+        <onap.nexus.protocol>https</onap.nexus.protocol>
+        <onap.nexus.public-url>https://nexus.onap.org/content/groups/public</onap.nexus.public-url>
+        <onap.nexus.staging-url>https://nexus.onap.org/content/groups/staging</onap.nexus.staging-url>
+        <onap.nexus.release-url>https://nexus.onap.org/content/repositories/releases</onap.nexus.release-url>
+        <onap.nexus.snapshot-url>https://nexus.onap.org/content/repositories/snapshots</onap.nexus.snapshot-url>
+        <onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id>
+        <onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id>
+    </properties>
 
-       <modules>
-               <module>getBackupVnfDetailService</module>
-               <module>vnfconfigreportsservice</module>
-               <module>vnfconfigbackupservice</module>
-       </modules>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.jacoco</groupId>
-                               <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>0.7.5.201505241946</version>
-                               <executions>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.7.5.201505241946</version>
+                <executions>
 
-                                       <execution>
-                                               <id>pre-unit-test</id>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <destFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</destFile>
-                                                       <propertyName>surefireArgLine</propertyName>
-                                               </configuration>
-                                       </execution>
-
-                                       <execution>
-                                               <id>post-unit-test</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>report</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <dataFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</dataFile>
-                                                       <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-               </plugins>
-       </build>
+                    <execution>
+                        <id>pre-unit-test</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <destFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</destFile>
+                            <propertyName>surefireArgLine</propertyName>
+                        </configuration>
+                    </execution>
 
+                    <execution>
+                        <id>post-unit-test</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <configuration>
+                            <dataFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</dataFile>
+                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
index 70a9a80..a79162a 100644 (file)
 <?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.sdnc.oam.vnfbackup</groupId>
-               <artifactId>configbackuprestore</artifactId>
-               <version>2.0.0-SNAPSHOT</version>
-       </parent>
-       
-       <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
-       <artifactId>vnfconfigbackupservice</artifactId>
-       <version>2.0.0-SNAPSHOT</version>
-       <name>sdnc-oam :: vnfbackup :: vnfconfigbackupservice</name>
-       <url>http://maven.apache.org</url>
-       
-       <dependencies>
-       
-               <dependency>
-                       <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
-                       <artifactId>getBackupVnfDetailService</artifactId>
-                       <version>2.0.0-SNAPSHOT</version>
-               </dependency>
-               
-               <dependency>
-                       <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
-                       <artifactId>vnfconfigreportsservice</artifactId>
-                       <version>2.0.0-SNAPSHOT</version>
-               </dependency>
-               
-               <dependency>
-                       <groupId>org.jmockit</groupId>
-                       <artifactId>jmockit</artifactId>
-                       <version>1.19</version>
-                       <scope>test</scope>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.jmockit</groupId>
-                       <artifactId>jmockit-coverage</artifactId>
-                       <version>1.19</version>
-                       <scope>test</scope>
-               </dependency>
-               
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>4.9</version>
-                       <scope>test</scope>
-               </dependency>
-
-               <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>jstl</artifactId>
-                       <scope>provided</scope>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.mariadb.jdbc</groupId>
-                       <artifactId>mariadb-java-client</artifactId>
-                       <version>1.1.9</version>
-               </dependency>
-               
-               <!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
-               <dependency>
-                       <groupId>commons-codec</groupId>
-                       <artifactId>commons-codec</artifactId>
-                       <version>1.9</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-web</artifactId>
-                       <version>1.5.4.RELEASE</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-context</artifactId>
-                       <version>4.3.9.RELEASE</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-tomcat</artifactId>
-                       <scope>provided</scope>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.apache.tomcat.embed</groupId>
-                       <artifactId>tomcat-embed-jasper</artifactId>
-                       <scope>provided</scope>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-devtools</artifactId>
-                       <optional>true</optional>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-test</artifactId>
-                       <scope>test</scope>
-                       <version>1.5.3.RELEASE</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-data-jpa</artifactId>
-               </dependency>
-
-               <!-- Add Log4j2 Dependency -->
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-log4j2</artifactId>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.json</groupId>
-                       <artifactId>json</artifactId>
-                       <version>20180130</version>
-               </dependency>
-               
-               <!-- https://mvnrepository.com/artifact/com.fasterxml/jackson-xml-databind -->
-               <dependency>
-                       <groupId>com.fasterxml</groupId>
-                       <artifactId>jackson-xml-databind</artifactId>
-                       <version>0.6.2</version>
-               </dependency>
-               
-               <dependency>
-               <groupId>org.webjars</groupId>
-                       <artifactId>bootstrap</artifactId>
-                       <version>3.3.7</version>
-               </dependency>
-
-               <dependency>
-               <groupId>org.webjars</groupId>
-                       <artifactId>bootstrap-datepicker</artifactId>
-                       <version>1.0.1</version>
-               </dependency>
-               
-               <dependency>
-                       <groupId>org.webjars.bower</groupId>
-                       <artifactId>angular-object-diff</artifactId>
-                       <version>1.0.1</version>
-               </dependency>
-
-       </dependencies>
-
-       <build>
-               <plugins>
-
-                       <plugin>
-                               <groupId>org.springframework.boot</groupId>
-                               <artifactId>spring-boot-maven-plugin</artifactId>
-                       </plugin>
-
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-surefire-plugin</artifactId>
-                               <version>2.21.0</version>
-                               <configuration>
-                                       <argLine>-XX:+StartAttachListener</argLine>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
+        <artifactId>configbackuprestore</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
+    <artifactId>vnfconfigbackupservice</artifactId>
+    <version>2.0.0</version>
+
+    <name>sdnc-oam :: vnfbackup :: vnfconfigbackupservice</name>
+    <url>http://maven.apache.org</url>
+
+    <dependencies>
+    
+        <dependency>
+            <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
+            <artifactId>getBackupVnfDetailService</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
+            <artifactId>vnfconfigreportsservice</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.jmockit</groupId>
+            <artifactId>jmockit</artifactId>
+            <version>1.19</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jmockit</groupId>
+            <artifactId>jmockit-coverage</artifactId>
+            <version>1.19</version>
+            <scope>test</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.9</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+            <version>1.1.9</version>
+        </dependency>
+        
+        <!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.9</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <version>1.5.4.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>4.3.9.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-jasper</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <version>1.5.3.RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+
+        <!-- Add Log4j2 Dependency -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-log4j2</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20180130</version>
+        </dependency>
+        
+        <!-- https://mvnrepository.com/artifact/com.fasterxml/jackson-xml-databind -->
+        <dependency>
+            <groupId>com.fasterxml</groupId>
+            <artifactId>jackson-xml-databind</artifactId>
+            <version>0.6.2</version>
+        </dependency>
+        
+        <dependency>
+        <groupId>org.webjars</groupId>
+        <artifactId>bootstrap</artifactId>
+        <version>3.3.7</version>
+        </dependency>
+
+        <dependency>
+        <groupId>org.webjars</groupId>
+        <artifactId>bootstrap-datepicker</artifactId>
+        <version>1.0.1</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.webjars.bower</groupId>
+            <artifactId>angular-object-diff</artifactId>
+            <version>1.0.1</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.21.0</version>
+                <configuration>
+                    <argLine>-XX:+StartAttachListener</argLine>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
index 4cd0356..2d51910 100644 (file)
 <?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.sdnc.oam.vnfbackup</groupId>
-               <artifactId>configbackuprestore</artifactId>
-               <version>2.0.0-SNAPSHOT</version>
-       </parent>
-       <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
-       <artifactId>vnfconfigreportsservice</artifactId>
-       <version>2.0.0-SNAPSHOT</version>
-       <name>sdnc-oam :: vnfbackup :: vnfconfigreportservice</name>
-       <url>http://maven.apache.org</url>
-       <properties>
-               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-       </properties>
-       <dependencies>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>4.11</version>
-                       <scope>test</scope>
-               </dependency>
-
-               <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>jstl</artifactId>
-                       <scope>provided</scope>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.mariadb.jdbc</groupId>
-                       <artifactId>mariadb-java-client</artifactId>
-                       <version>1.1.9</version>
-               </dependency>
-               <!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
-               <dependency>
-                       <groupId>commons-codec</groupId>
-                       <artifactId>commons-codec</artifactId>
-                       <version>1.9</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-web</artifactId>
-                       <version>1.5.4.RELEASE</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-context</artifactId>
-                       <version>4.3.9.RELEASE</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-tomcat</artifactId>
-                       <scope>provided</scope>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.apache.tomcat.embed</groupId>
-                       <artifactId>tomcat-embed-jasper</artifactId>
-                       <scope>provided</scope>
-               </dependency>
-
-
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-devtools</artifactId>
-                       <optional>true</optional>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-test</artifactId>
-                       <scope>test</scope>
-                       <version>1.5.3.RELEASE</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-data-jpa</artifactId>
-               </dependency>
-
-               <!-- Add Log4j2 Dependency -->
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-log4j2</artifactId>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.json</groupId>
-                       <artifactId>json</artifactId>
-                       <version>20180130</version>
-               </dependency>
-               <!-- https://mvnrepository.com/artifact/com.fasterxml/jackson-xml-databind -->
-               <dependency>
-                       <groupId>com.fasterxml</groupId>
-                       <artifactId>jackson-xml-databind</artifactId>
-                       <version>0.6.2</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.mockito</groupId>
-                       <artifactId>mockito-all</artifactId>
-                       <version>1.9.5</version>
-                       <scope>test</scope>
-               </dependency>
-       </dependencies>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
+        <artifactId>configbackuprestore</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
+    <artifactId>vnfconfigreportsservice</artifactId>
+    <version>2.0.0</version>
+
+    <name>sdnc-oam :: vnfbackup :: vnfconfigreportservice</name>
+    <url>http://maven.apache.org</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+            <version>1.1.9</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.9</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <version>1.5.4.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>4.3.9.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-jasper</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <version>1.5.3.RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+
+        <!-- Add Log4j2 Dependency -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-log4j2</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20180130</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.fasterxml/jackson-xml-databind -->
+        <dependency>
+            <groupId>com.fasterxml</groupId>
+            <artifactId>jackson-xml-databind</artifactId>
+            <version>0.6.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <version>1.9.5</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 </project>
index f9470a0..a0c6919 100644 (file)
@@ -6,8 +6,9 @@
         <groupId>org.onap.sdnc.oam</groupId>
         <artifactId>sdnc-oam</artifactId>
         <version>2.0.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
-    
+
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>data-migrator</artifactId>
     <version>2.0.0-SNAPSHOT</version>
@@ -29,7 +30,6 @@
         <dependencies>
         </dependencies>
     </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.slf4j</groupId>
index b232c57..cbb8462 100644 (file)
@@ -1,20 +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/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.0.0</version>
+        <groupId>org.onap.sdnc.oam</groupId>
+        <artifactId>installation</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>pom</packaging>
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>installation-admportal</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
     <name>sdnc-oam :: installation :: ${project.artifactId}</name>
     <description>Creates admportal Docker container</description>
+    <organization>
+        <name>openECOMP</name>
+    </organization>
 
     <properties>
         <image.name>onap/admportal-sdnc-image</image.name>
@@ -24,7 +27,6 @@
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
     </properties>
 
-
     <build>
         <plugins>
 
                 </executions>
             </plugin>
             <plugin>
-                <artifactId>exec-maven-plugin</artifactId>
                 <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
                 <version>1.5.0</version>
                 <executions>
                     <execution>
 
 
         </plugins>
-
     </build>
-    <organization>
-        <name>openECOMP</name>
-    </organization>
 </project>
index 7db0d74..f91ddfc 100644 (file)
@@ -1,19 +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/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.0.0</version>
+        <groupId>org.onap.sdnc.oam</groupId>
+        <artifactId>installation</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>pom</packaging>
+
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>installation-ansible-server</artifactId>
     <version>2.0.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
     <name>sdnc-oam :: installation :: ${project.artifactId}</name>
     <description>Creates ansible-server Docker container</description>
+    <organization>
+        <name>ONAP</name>
+    </organization>
 
     <properties>
         <image.name>onap/sdnc-ansible-server-image</image.name>
@@ -24,7 +28,6 @@
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
     </properties>
 
-
     <build>
         <plugins>
             <plugin>
             </build>
         </profile>
     </profiles>
-    <organization>
-        <name>ONAP</name>
-    </organization>
 </project>
index 5974aa4..aa72d42 100644 (file)
@@ -1,19 +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/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.0.0</version>
+        <groupId>org.onap.sdnc.oam</groupId>
+        <artifactId>installation</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>pom</packaging>
+
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>installation-dmaap-listener</artifactId>
     <version>2.0.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
     <name>sdnc-oam :: installation :: ${project.artifactId}</name>
     <description>Creates dmaap-listener Docker container</description>
+    <organization>
+        <name>ONAP</name>
+    </organization>
 
     <properties>
         <image.name>onap/sdnc-dmaap-listener-image</image.name>
@@ -24,7 +28,6 @@
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
     </properties>
 
-
     <build>
         <plugins>
 
             </plugin>
 
             <plugin>
-                <artifactId>exec-maven-plugin</artifactId>
                 <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
                 <version>1.5.0</version>
                 <executions>
 
                 </executions>
             </plugin>
         </plugins>
-
     </build>
 
     <profiles>
             </build>
         </profile>
     </profiles>
-    <organization>
-        <name>ONAP</name>
-    </organization>
 </project>
index 0b8edce..96d623d 100644 (file)
@@ -1,21 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.0.0</version>
+        <groupId>org.onap.sdnc.oam</groupId>
+        <artifactId>sdnc-oam</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>pom</packaging>
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>installation</artifactId>
     <version>2.0.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
     <name>sdnc-oam :: installation</name>
     <description>Installs SDN-C on local file system</description>
 
+    <modules>
+        <module>ansible-server</module>
+        <module>sdnc</module>
+        <module>sdnc-web</module>
+        <module>ueb-listener</module>
+        <module>dmaap-listener</module>
+    </modules>
+
     <properties>
         <application.name>installation</application.name>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
-
-    <modules>
-        <module>ansible-server</module>
-        <module>sdnc</module>
-        <module>sdnc-web</module>
-        <module>admportal</module>
-        <module>ueb-listener</module>
-        <module>dmaap-listener</module>
-    </modules>
 </project>
index 3e6e9fd..ee49e7f 100644 (file)
 <?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.0.0</version>
-       </parent>
+    <parent>
+        <groupId>org.onap.sdnc.oam</groupId>
+        <artifactId>installation</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+    </parent>
 
-       <groupId>org.onap.sdnc.oam</groupId>
-       <artifactId>installation-sdnc-web</artifactId>
-       <version>2.0.0-SNAPSHOT</version>
-       <packaging>pom</packaging>
+    <groupId>org.onap.sdnc.oam</groupId>
+    <artifactId>installation-sdnc-web</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-       <name>sdnc-oam :: installation :: ${project.artifactId}</name>
-       <description>Creates SDN Controller WebUI Docker container</description>
+    <name>sdnc-oam :: installation :: ${project.artifactId}</name>
+    <description>Creates SDN Controller WebUI Docker container</description>
 
-       <properties>
-               <base.image.repo>docker.io/bitnami/nginx:1.16-debian-9</base.image.repo>
-               <image.name>onap/sdnc-web-image</image.name>
-               <sdnc.project.version>${project.version}</sdnc.project.version>
-               <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
-               <ccsdk.groupId>org.onap.ccsdk.features.sdnr.wt</ccsdk.groupId>
-               <ccsdk.features.version>1.0.0-SNAPSHOT</ccsdk.features.version>
-               <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
-               <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
-               <docker.push.phase>deploy</docker.push.phase>
-               <docker.verbose>true</docker.verbose>
-       </properties>
+    <properties>
+        <base.image.repo>docker.io/bitnami/nginx:1.16-debian-9</base.image.repo>
+        <image.name>onap/sdnc-web-image</image.name>
+        <sdnc.project.version>${project.version}</sdnc.project.version>
+        <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
+        <ccsdk.groupId>org.onap.ccsdk.features.sdnr.wt</ccsdk.groupId>
+        <ccsdk.features.version>1.0.0-SNAPSHOT</ccsdk.features.version>
+        <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
+        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+        <docker.push.phase>deploy</docker.push.phase>
+        <docker.verbose>true</docker.verbose>
+    </properties>
 
-       <dependencies>
-               <dependency>
-                       <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-                       <artifactId>sdnr-wt-odlux-framework</artifactId>
-                       <version>${ccsdk.features.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-                       <artifactId>sdnr-wt-odlux-apps-installer</artifactId>
-                       <version>${ccsdk.features.version}</version>
-                       <type>zip</type>
-                       <classifier>repo</classifier>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-                       <artifactId>sdnr-wt-helpserver-installer</artifactId>
-                       <version>${ccsdk.features.version}</version>
-                       <type>zip</type>
-                       <classifier>repo</classifier>
-               </dependency>
-       </dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+            <artifactId>sdnr-wt-odlux-framework</artifactId>
+            <version>${ccsdk.features.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+            <artifactId>sdnr-wt-odlux-apps-installer</artifactId>
+            <version>${ccsdk.features.version}</version>
+            <type>zip</type>
+            <classifier>repo</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+            <artifactId>sdnr-wt-helpserver-installer</artifactId>
+            <version>${ccsdk.features.version}</version>
+            <type>zip</type>
+            <classifier>repo</classifier>
+        </dependency>
+    </dependencies>
 
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.codehaus.groovy.maven</groupId>
-                               <artifactId>gmaven-plugin</artifactId>
-                               <version>1.0</version>
-                               <executions>
-                                       <execution>
-                                               <phase>validate</phase>
-                                               <goals>
-                                                       <goal>execute</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <source>${basedir}/../TagVersion.groovy</source>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       <plugin>
-                               <artifactId>maven-resources-plugin</artifactId>
-                               <version>2.6</version>
-                               <executions>
-                                       <execution>
-                                               <id>copy-dockerfile</id>
-                                               <goals>
-                                                       <goal>copy-resources</goal>
-                                               </goals>                                                <!-- here the phase you need -->
-                                               <phase>validate</phase>
-                                               <configuration>
-                                                       <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
-                                                       <resources>
-                                                               <resource>
-                                                                       <directory>src/main/docker</directory>
-                                                                       <includes>
-                                                                               <include>Dockerfile</include>
-                                                                       </includes>
-                                                                       <filtering>true</filtering>
-                                                               </resource>
-                                                       </resources>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>copy-siteconf</id>
-                                               <goals>
-                                                       <goal>copy-resources</goal>
-                                               </goals>                                                <!-- here the phase you need -->
-                                               <phase>validate</phase>
-                                               <configuration>
-                                                       <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
-                                                       <resources>
-                                                               <resource>
-                                                                       <directory>src/main/resources</directory>
-                                                                       <includes>
-                                                                               <include>*.conf</include>
-                                                                       </includes>
-                                                                       <filtering>true</filtering>
-                                                               </resource>
-                                                       </resources>
-                                               </configuration>
-                                       </execution>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.groovy.maven</groupId>
+                <artifactId>gmaven-plugin</artifactId>
+                <version>1.0</version>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                            <source>${basedir}/../TagVersion.groovy</source>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <id>copy-dockerfile</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>                        <!-- here the phase you need -->
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/docker</directory>
+                                    <includes>
+                                        <include>Dockerfile</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy-siteconf</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>                        <!-- here the phase you need -->
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources</directory>
+                                    <includes>
+                                        <include>*.conf</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
 
-                                       <execution>
-                                               <id>copy-scripts</id>
-                                               <goals>
-                                                       <goal>copy-resources</goal>
-                                               </goals>                                                <!-- here the phase you need -->
-                                               <phase>validate</phase>
-                                               <configuration>
-                                                       <outputDirectory>${basedir}/target/docker-stage/bin</outputDirectory>
-                                                       <resources>
-                                                               <resource>
-                                                                       <directory>src/main/scripts</directory>
-                                                                       <includes>
-                                                                               <include>*.sh</include>
-                                                                       </includes>
-                                                                       <filtering>true</filtering>
-                                                               </resource>
-                                                       </resources>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-dependency-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>unpack features</id>
-                                               <phase>generate-sources</phase>
-                                               <goals>
-                                                       <goal>unpack</goal>
-                                               </goals>
+                    <execution>
+                        <id>copy-scripts</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>                        <!-- here the phase you need -->
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/docker-stage/bin</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/scripts</directory>
+                                    <includes>
+                                        <include>*.sh</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack features</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
 
-                                               <configuration>
-                                                       <artifactItems>
-                                                               <artifactItem>
-                                                                       <groupId>${ccsdk.groupId}</groupId>
-                                                                       <artifactId>sdnr-wt-odlux-framework</artifactId>
-                                                                       <version>${ccsdk.features.version}</version>
-                                                                       <type>jar</type>
-                                                                       <overWrite>false</overWrite>
-                                                                       <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-                                                                       <includes>odlux/**</includes>
-                                                               </artifactItem>
-                                                               <!-- connectApp -->
-                                                               <artifactItem>
-                                                                       <groupId>${ccsdk.groupId}</groupId>
-                                                                       <artifactId>sdnr-wt-odlux-app-connectApp</artifactId>
-                                                                       <version>${ccsdk.features.version}</version>
-                                                                       <type>jar</type>
-                                                                       <overWrite>false</overWrite>
-                                                                       <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-                                                                       <includes>odlux/**</includes>
-                                                               </artifactItem>
-                                                               <!-- eventLogApp -->
-                                                               <artifactItem>
-                                                                       <groupId>${ccsdk.groupId}</groupId>
-                                                                       <artifactId>sdnr-wt-odlux-app-eventLogApp</artifactId>
-                                                                       <version>${ccsdk.features.version}</version>
-                                                                       <type>jar</type>
-                                                                       <overWrite>false</overWrite>
-                                                                       <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-                                                                       <includes>odlux/**</includes>
-                                                               </artifactItem>
-                                                               <!-- helpApp -->
-                                                               <artifactItem>
-                                                                       <groupId>${ccsdk.groupId}</groupId>
-                                                                       <artifactId>sdnr-wt-odlux-app-helpApp</artifactId>
-                                                                       <version>${ccsdk.features.version}</version>
-                                                                       <type>jar</type>
-                                                                       <overWrite>false</overWrite>
-                                                                       <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-                                                                       <includes>odlux/**</includes>
-                                                               </artifactItem>
-                                                               <!-- maintenanceApp -->
-                                                               <artifactItem>
-                                                                       <groupId>${ccsdk.groupId}</groupId>
-                                                                       <artifactId>sdnr-wt-odlux-app-maintenanceApp</artifactId>
-                                                                       <version>${ccsdk.features.version}</version>
-                                                                       <type>jar</type>
-                                                                       <overWrite>false</overWrite>
-                                                                       <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-                                                                       <includes>odlux/**</includes>
-                                                               </artifactItem>
-                                                               <!-- minimumApp -->
-                                                               <artifactItem>
-                                                                       <groupId>${ccsdk.groupId}</groupId>
-                                                                       <artifactId>sdnr-wt-odlux-app-minimumApp</artifactId>
-                                                                       <version>${ccsdk.features.version}</version>
-                                                                       <type>jar</type>
-                                                                       <overWrite>false</overWrite>
-                                                                       <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-                                                                       <includes>odlux/**</includes>
-                                                               </artifactItem>
-                                                               <!-- configurationApp -->
-                                                               <artifactItem>
-                                                                       <groupId>${ccsdk.groupId}</groupId>
-                                                                       <artifactId>sdnr-wt-odlux-app-configurationApp</artifactId>
-                                                                       <version>${ccsdk.features.version}</version>
-                                                                       <type>jar</type>
-                                                                       <overWrite>false</overWrite>
-                                                                       <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-                                                                       <includes>odlux/**</includes>
-                                                               </artifactItem>
-                                                               <!-- demoApp -->
-                                                               <artifactItem>
-                                                                       <groupId>${ccsdk.groupId}</groupId>
-                                                                       <artifactId>sdnr-wt-odlux-app-demoApp</artifactId>
-                                                                       <version>${ccsdk.features.version}</version>
-                                                                       <type>jar</type>
-                                                                       <overWrite>false</overWrite>
-                                                                       <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-                                                                       <includes>odlux/**</includes>
-                                                               </artifactItem>
-                                                               <!-- faultApp -->
-                                                               <artifactItem>
-                                                                       <groupId>${ccsdk.groupId}</groupId>
-                                                                       <artifactId>sdnr-wt-odlux-app-faultApp</artifactId>
-                                                                       <version>${ccsdk.features.version}</version>
-                                                                       <type>jar</type>
-                                                                       <overWrite>false</overWrite>
-                                                                       <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-                                                                       <includes>odlux/*</includes>
-                                                               </artifactItem>
-                                                               <!-- inventoryApp -->
-                                                               <artifactItem>
-                                                                       <groupId>${ccsdk.groupId}</groupId>
-                                                                       <artifactId>sdnr-wt-odlux-app-inventoryApp</artifactId>
-                                                                       <version>${ccsdk.features.version}</version>
-                                                                       <type>jar</type>
-                                                                       <overWrite>false</overWrite>
-                                                                       <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-                                                                       <includes>odlux/**</includes>
-                                                               </artifactItem>
-                                                               <!-- mediatorApp -->
-                                                               <artifactItem>
-                                                                       <groupId>${ccsdk.groupId}</groupId>
-                                                                       <artifactId>sdnr-wt-odlux-app-mediatorApp</artifactId>
-                                                                       <version>${ccsdk.features.version}</version>
-                                                                       <type>jar</type>
-                                                                       <overWrite>false</overWrite>
-                                                                       <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-                                                                       <includes>odlux/**</includes>
-                                                               </artifactItem>
-                                                               <!-- performanceHistoryApp -->
-                                                               <artifactItem>
-                                                                       <groupId>${ccsdk.groupId}</groupId>
-                                                                       <artifactId>sdnr-wt-odlux-app-performanceHistoryApp</artifactId>
-                                                                       <version>${ccsdk.features.version}</version>
-                                                                       <type>jar</type>
-                                                                       <overWrite>false</overWrite>
-                                                                       <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-                                                                       <includes>odlux/**</includes>
-                                                               </artifactItem>
-                                                               <!-- helpserver resources -->
-                                                               <artifactItem>
-                                                                       <groupId>${ccsdk.groupId}</groupId>
-                                                                       <artifactId>sdnr-wt-helpserver-provider</artifactId>
-                                                                       <version>${ccsdk.features.version}</version>
-                                                                       <type>jar</type>
-                                                                       <overWrite>false</overWrite>
-                                                                       <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-                                                                       <includes>help/**</includes>
-                                                               </artifactItem>
-                                                       </artifactItems>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       <plugin>
-                               <groupId>io.fabric8</groupId>
-                               <artifactId>docker-maven-plugin</artifactId>
-                               <version>0.16.5</version>
-                               <inherited>false</inherited>
-                               <configuration>
-                                       <images>
-                                               <image>
-                                                       <name>${image.name}</name>
-                                                       <build>
-                                                               <cleanup>try</cleanup>
-                                                               <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
-                                                               <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
-                                                               <tags>
-                                                                       <tag>${project.docker.latestminortag.version}</tag>
-                                                                       <tag>${project.docker.latestfulltag.version}</tag>
-                                                                       <tag>${project.docker.latesttagtimestamp.version}</tag>
-                                                               </tags>
-                                                       </build>
-                                               </image>
-                                       </images>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>generate-images</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>build</goal>
-                                               </goals>
-                                       </execution>
-                                       <execution>
-                                               <id>push-images</id>
-                                               <phase>${docker.push.phase}</phase>
-                                               <goals>
-                                                       <goal>build</goal>
-                                                       <goal>push</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                       </plugin>
-               </plugins>
-       </build>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>${ccsdk.groupId}</groupId>
+                                    <artifactId>sdnr-wt-odlux-framework</artifactId>
+                                    <version>${ccsdk.features.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
+                                    <includes>odlux/**</includes>
+                                </artifactItem>
+                                <!-- connectApp -->
+                                <artifactItem>
+                                    <groupId>${ccsdk.groupId}</groupId>
+                                    <artifactId>sdnr-wt-odlux-app-connectApp</artifactId>
+                                    <version>${ccsdk.features.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
+                                    <includes>odlux/**</includes>
+                                </artifactItem>
+                                <!-- eventLogApp -->
+                                <artifactItem>
+                                    <groupId>${ccsdk.groupId}</groupId>
+                                    <artifactId>sdnr-wt-odlux-app-eventLogApp</artifactId>
+                                    <version>${ccsdk.features.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
+                                    <includes>odlux/**</includes>
+                                </artifactItem>
+                                <!-- helpApp -->
+                                <artifactItem>
+                                    <groupId>${ccsdk.groupId}</groupId>
+                                    <artifactId>sdnr-wt-odlux-app-helpApp</artifactId>
+                                    <version>${ccsdk.features.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
+                                    <includes>odlux/**</includes>
+                                </artifactItem>
+                                <!-- maintenanceApp -->
+                                <artifactItem>
+                                    <groupId>${ccsdk.groupId}</groupId>
+                                    <artifactId>sdnr-wt-odlux-app-maintenanceApp</artifactId>
+                                    <version>${ccsdk.features.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
+                                    <includes>odlux/**</includes>
+                                </artifactItem>
+                                <!-- minimumApp -->
+                                <artifactItem>
+                                    <groupId>${ccsdk.groupId}</groupId>
+                                    <artifactId>sdnr-wt-odlux-app-minimumApp</artifactId>
+                                    <version>${ccsdk.features.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
+                                    <includes>odlux/**</includes>
+                                </artifactItem>
+                                <!-- configurationApp -->
+                                <artifactItem>
+                                    <groupId>${ccsdk.groupId}</groupId>
+                                    <artifactId>sdnr-wt-odlux-app-configurationApp</artifactId>
+                                    <version>${ccsdk.features.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
+                                    <includes>odlux/**</includes>
+                                </artifactItem>
+                                <!-- demoApp -->
+                                <artifactItem>
+                                    <groupId>${ccsdk.groupId}</groupId>
+                                    <artifactId>sdnr-wt-odlux-app-demoApp</artifactId>
+                                    <version>${ccsdk.features.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
+                                    <includes>odlux/**</includes>
+                                </artifactItem>
+                                <!-- faultApp -->
+                                <artifactItem>
+                                    <groupId>${ccsdk.groupId}</groupId>
+                                    <artifactId>sdnr-wt-odlux-app-faultApp</artifactId>
+                                    <version>${ccsdk.features.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
+                                    <includes>odlux/*</includes>
+                                </artifactItem>
+                                <!-- inventoryApp -->
+                                <artifactItem>
+                                    <groupId>${ccsdk.groupId}</groupId>
+                                    <artifactId>sdnr-wt-odlux-app-inventoryApp</artifactId>
+                                    <version>${ccsdk.features.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
+                                    <includes>odlux/**</includes>
+                                </artifactItem>
+                                <!-- mediatorApp -->
+                                <artifactItem>
+                                    <groupId>${ccsdk.groupId}</groupId>
+                                    <artifactId>sdnr-wt-odlux-app-mediatorApp</artifactId>
+                                    <version>${ccsdk.features.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
+                                    <includes>odlux/**</includes>
+                                </artifactItem>
+                                <!-- performanceHistoryApp -->
+                                <artifactItem>
+                                    <groupId>${ccsdk.groupId}</groupId>
+                                    <artifactId>sdnr-wt-odlux-app-performanceHistoryApp</artifactId>
+                                    <version>${ccsdk.features.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
+                                    <includes>odlux/**</includes>
+                                </artifactItem>
+                                <!-- helpserver resources -->
+                                <artifactItem>
+                                    <groupId>${ccsdk.groupId}</groupId>
+                                    <artifactId>sdnr-wt-helpserver-provider</artifactId>
+                                    <version>${ccsdk.features.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
+                                    <includes>help/**</includes>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>0.16.5</version>
+                <inherited>false</inherited>
+                <configuration>
+                    <images>
+                        <image>
+                            <name>${image.name}</name>
+                            <build>
+                                <cleanup>try</cleanup>
+                                <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
+                                <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
+                                <tags>
+                                    <tag>${project.docker.latestminortag.version}</tag>
+                                    <tag>${project.docker.latestfulltag.version}</tag>
+                                    <tag>${project.docker.latesttagtimestamp.version}</tag>
+                                </tags>
+                            </build>
+                        </image>
+                    </images>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>generate-images</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>push-images</id>
+                        <phase>${docker.push.phase}</phase>
+                        <goals>
+                            <goal>build</goal>
+                            <goal>push</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
index 9c832fb..abc6928 100644 (file)
@@ -1,20 +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/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.0.0</version>
+        <groupId>org.onap.sdnc.oam</groupId>
+        <artifactId>installation</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>pom</packaging>
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>installation-sdnc</artifactId>
     <version>2.0.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
     <name>sdnc-oam :: installation :: ${project.artifactId}</name>
     <description>Creates SDN Controller Docker container</description>
+    <organization>
+        <name>ONAP</name>
+    </organization>
 
     <properties>
         <image.name>onap/sdnc-aaf-image</image.name>
             <groupId>org.onap.sdnc.northbound</groupId>
             <artifactId>generic-resource-api-installer</artifactId>
             <version>${sdnc.northbound.version}</version>
-            <classifier>repo</classifier>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.sdnc.northbound</groupId>
             <artifactId>vnfapi-installer</artifactId>
             <version>${sdnc.northbound.version}</version>
-            <classifier>repo</classifier>
             <type>zip</type>
+            <classifier>repo</classifier>
        </dependency>
        <dependency>
             <groupId>org.onap.sdnc.northbound</groupId>
             <artifactId>optical-service-installer</artifactId>
             <version>${sdnc.northbound.version}</version>
-            <classifier>repo</classifier>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
-       <dependency>
+        <dependency>
             <groupId>org.onap.sdnc.northbound</groupId>
             <artifactId>vnftools-installer</artifactId>
             <version>${sdnc.northbound.version}</version>
-            <classifier>repo</classifier>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.sdnc.northbound</groupId>
             <artifactId>sdnc-northbound-features-installer</artifactId>
             <version>${sdnc.northbound.version}</version>
-            <classifier>repo</classifier>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
 
         <dependency>
             <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
             <artifactId>oofpcipoc-installer</artifactId>
             <version>${ccsdk.features.version}</version>
-            <classifier>repo</classifier>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
 
         <dependency>
             <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
             <artifactId>sdnr-northbound-features-installer</artifactId>
             <version>${ccsdk.features.version}</version>
-            <classifier>repo</classifier>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
             <artifactId>sdnr-wt-feature-aggregator-installer</artifactId>
             <version>${ccsdk.features.version}</version>
-            <classifier>repo</classifier>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
     </dependencies>
 
                 </executions>
             </plugin>
             <plugin>
-                <artifactId>exec-maven-plugin</artifactId>
                 <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
                 <version>1.5.0</version>
                 <executions>
                     <execution>
             </plugin>
         </plugins>
     </build>
-    <organization>
-        <name>ONAP</name>
-    </organization>
 </project>
index 02746ab..eabd44b 100644 (file)
@@ -1,19 +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/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.0.0</version>
+        <groupId>org.onap.sdnc.oam</groupId>
+        <artifactId>installation</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>pom</packaging>
+
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>installation-ueb-listener</artifactId>
     <version>2.0.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
     <name>sdnc-oam :: installation :: ${project.artifactId}</name>
     <description>Creates ueb-listener Docker container</description>
+    <organization>
+        <name>ONAP</name>
+    </organization>
 
     <properties>
         <image.name>onap/sdnc-ueb-listener-image</image.name>
@@ -25,7 +29,6 @@
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
     </properties>
 
-
     <build>
         <plugins>
 
             </plugin>
 
             <plugin>
-                <artifactId>exec-maven-plugin</artifactId>
                 <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
                 <version>1.5.0</version>
                 <executions>
 
                 </executions>
             </plugin>
         </plugins>
-
     </build>
 
     <profiles>
             </build>
         </profile>
     </profiles>
-    <organization>
-        <name>ONAP</name>
-    </organization>
 </project>
index a25894a..591e3fd 100644 (file)
@@ -3,10 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.0.0</version>
-        <relativePath/>
+        <groupId>org.onap.sdnc.oam</groupId>
+        <artifactId>platform-logic</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.sdnc.oam</groupId>
index aff80fa..9cac753 100644 (file)
@@ -3,10 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.0.0</version>
-        <relativePath/>
+        <groupId>org.onap.sdnc.oam</groupId>
+        <artifactId>platform-logic</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.sdnc.oam</groupId>
index 17aa896..2d1551a 100644 (file)
@@ -1,47 +1,46 @@
 <?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.0.0</version>
-               <relativePath/>
-       </parent>
+    <parent>
+        <groupId>org.onap.sdnc.oam</groupId>
+        <artifactId>platform-logic</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+    </parent>
 
-       <groupId>org.onap.sdnc.oam</groupId>
-       <artifactId>platform-logic-installer</artifactId>
-       <version>2.0.0-SNAPSHOT</version>
-       <packaging>pom</packaging>
+    <groupId>org.onap.sdnc.oam</groupId>
+    <artifactId>platform-logic-installer</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-       <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
-       <description>Contains platform-level service logic installer</description>
+    <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
+    <description>Contains platform-level service logic installer</description>
 
-       <build>
-               <plugins>
+    <build>
+        <plugins>
 
-                       <plugin>
-                               <artifactId>maven-assembly-plugin</artifactId>
-                               <version>2.6</version>
-                               <executions>
-                                       <execution>
-                                               <id>create-zip</id>
-                                               <goals>
-                                                       <goal>single</goal>
-                                               </goals>
-                                               <phase>package</phase>
-                                               <configuration>
-                                                       <attach>true</attach>
-                                                       <descriptors>
-                                                               <descriptor>src/assembly/assemble_zip.xml</descriptor>
-                                                       </descriptors>
-                                                       <appendAssemblyId>false</appendAssemblyId>
-                                               </configuration>
-                                       </execution>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <id>create-zip</id>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <attach>true</attach>
+                            <descriptors>
+                                <descriptor>src/assembly/assemble_zip.xml</descriptor>
+                            </descriptors>
+                            <appendAssemblyId>false</appendAssemblyId>
+                        </configuration>
+                    </execution>
 
-                               </executions>
-                       </plugin>
+                </executions>
+            </plugin>
 
         </plugins>
-       </build>
+    </build>
 </project>
index df2ac6c..a8b895c 100644 (file)
@@ -1,56 +1,55 @@
 <?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.0.0</version>
-        <relativePath/>
-       </parent>
+    <parent>
+        <groupId>org.onap.sdnc.oam</groupId>
+        <artifactId>platform-logic</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+    </parent>
 
-       <groupId>org.onap.sdnc.oam</groupId>
-       <artifactId>platform-logic-lcm</artifactId>
-       <version>2.0.0-SNAPSHOT</version>
-       <packaging>pom</packaging>
+    <groupId>org.onap.sdnc.oam</groupId>
+    <artifactId>platform-logic-lcm</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
     <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
-       <description>Contains platform-level service logic for the LCM</description>
+    <description>Contains platform-level service logic for the LCM</description>
 
-       <build>
-               <plugins>
-                       <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>../target/svclogic/graphs/lcm</outputDirectory>
-                                                       <resources>
-                                                               <resource>
-                                                                       <directory>src/main/xml</directory>
-                                                                       <includes>
-                                                                               <include>**/*.xml</include>
-                                                                       </includes>
-                                                                       <filtering>true</filtering>
-                                                               </resource>
-                                                               <resource>
-                                                                       <directory>src/main/resources</directory>
-                                                                       <includes>
-                                                                               <include>graph.versions</include>
-                                                                       </includes>
-                                                                       <filtering>true</filtering>
-                                                               </resource>
-                                                       </resources>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-               </plugins>
-       </build>
+    <build>
+        <plugins>
+            <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>../target/svclogic/graphs/lcm</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/xml</directory>
+                                    <includes>
+                                        <include>**/*.xml</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                                <resource>
+                                    <directory>src/main/resources</directory>
+                                    <includes>
+                                        <include>graph.versions</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
index 99e7b65..9c067b0 100644 (file)
@@ -3,10 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.0.0</version>
-        <relativePath/>
+        <groupId>org.onap.sdnc.oam</groupId>
+        <artifactId>platform-logic</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.sdnc.oam</groupId>
index b57949b..f638ce8 100644 (file)
@@ -3,10 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.0.0</version>
-        <relativePath/>
+        <groupId>org.onap.sdnc.oam</groupId>
+        <artifactId>sdnc-oam</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.sdnc.oam</groupId>
@@ -24,8 +23,8 @@
         <module>setup</module>
         <module>generic-resource-api</module>
         <module>vnfapi</module>
-       <module>lcm</module>
-       <module>optical-service</module>
+    <module>lcm</module>
+    <module>optical-service</module>
         <module>restapi-templates</module>
         <module>restconfapi-yang</module>
         <module>datachange</module>
index 426a44f..d56d994 100644 (file)
@@ -3,10 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.0.0</version>
-        <relativePath/>
+        <groupId>org.onap.sdnc.oam</groupId>
+        <artifactId>platform-logic</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.sdnc.oam</groupId>
index c75b76a..7e4ec04 100644 (file)
@@ -3,10 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.0.0</version>
-        <relativePath/>
+        <groupId>org.onap.sdnc.oam</groupId>
+        <artifactId>platform-logic</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.sdnc.oam</groupId>
index 25a3cca..14ba4a3 100644 (file)
@@ -3,10 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.0.0</version>
-        <relativePath/>
+        <groupId>org.onap.sdnc.oam</groupId>
+        <artifactId>platform-logic</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.sdnc.oam</groupId>
index 511710e..1ec28e8 100644 (file)
@@ -1,56 +1,55 @@
 <?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.0.0</version>
-        <relativePath/>
-       </parent>
+    <parent>
+        <groupId>org.onap.sdnc.oam</groupId>
+        <artifactId>platform-logic</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+    </parent>
 
-       <groupId>org.onap.sdnc.oam</groupId>
-       <artifactId>platform-logic-vnfapi</artifactId>
-       <version>2.0.0-SNAPSHOT</version>
-       <packaging>pom</packaging>
+    <groupId>org.onap.sdnc.oam</groupId>
+    <artifactId>platform-logic-vnfapi</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
     <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
-       <description>Contains platform-level service logic for the VNF-API</description>
+    <description>Contains platform-level service logic for the VNF-API</description>
 
-       <build>
-               <plugins>
-                       <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>../target/svclogic/graphs/vnfapi</outputDirectory>
-                                                       <resources>
-                                                               <resource>
-                                                                       <directory>src/main/xml</directory>
-                                                                       <includes>
-                                                                               <include>**/*.xml</include>
-                                                                       </includes>
-                                                                       <filtering>true</filtering>
-                                                               </resource>
-                                                               <resource>
-                                                                       <directory>src/main/resources</directory>
-                                                                       <includes>
-                                                                               <include>graph.versions</include>
-                                                                       </includes>
-                                                                       <filtering>true</filtering>
-                                                               </resource>
-                                                       </resources>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-               </plugins>
-       </build>
+    <build>
+        <plugins>
+            <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>../target/svclogic/graphs/vnfapi</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/xml</directory>
+                                    <includes>
+                                        <include>**/*.xml</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                                <resource>
+                                    <directory>src/main/resources</directory>
+                                    <includes>
+                                        <include>graph.versions</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/pom.xml b/pom.xml
index d3600bc..daf0b90 100755 (executable)
--- 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.0.0</version>
-       </parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>2.0.0</version>
+        <relativePath/>
+    </parent>
 
-       <groupId>org.onap.sdnc.oam</groupId>
-       <artifactId>sdnc-oam</artifactId>
-       <version>2.0.0-SNAPSHOT</version>
-       <packaging>pom</packaging>
+    <groupId>org.onap.sdnc.oam</groupId>
+    <artifactId>sdnc-oam</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-       <name>sdnc-oam</name>
-       <description>The SDN-C OAM component contains the components needed to operate, administer and maintain the SDN-C platform.</description>
-       <url>https://wiki.onap.org</url>
-       <organization>
-               <name>AT&amp;T</name>
-       </organization>
+    <name>sdnc-oam</name>
+    <description>The SDN-C OAM component contains the components needed to operate, administer and maintain the SDN-C platform.</description>
+    <url>https://wiki.onap.org</url>
+    <organization>
+        <name>AT&amp;T</name>
+    </organization>
 
-       <modules>
-               <module>admportal</module>
-               <module>platform-logic</module>
-               <module>configbackuprestore</module>
-               <module>SdncReports</module>
-               <module>data-migrator</module>
-       </modules>
+    <modules>
+        <module>platform-logic</module>
+        <module>data-migrator</module>
+    </modules>
 
-       <scm>
+    <scm>
                 <connection>scm:git:ssh://git@${onap.git.host}/sdnc-oam.git</connection>
                 <developerConnection>scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/sdnc-oam.git</developerConnection>
                 <url>${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/sdnc-oam/browse</url>
-               <tag>HEAD</tag>
-       </scm>
-       <issueManagement>
-               <system>JIRA</system>
-               <url>https://jira.onap.org/</url>
-       </issueManagement>
-       <ciManagement>
-               <system>Jenkins</system>
-               <url>https://jenkins.onap.org/</url>
-       </ciManagement>
-       <distributionManagement>
+            <tag>HEAD</tag>
+     </scm>
+    <issueManagement>
+        <system>JIRA</system>
+        <url>https://jira.onap.org/</url>
+    </issueManagement>
+    <ciManagement>
+        <system>Jenkins</system>
+        <url>https://jenkins.onap.org/</url>
+    </ciManagement>
+    <distributionManagement>
         <site>
           <id>sdnc-javadoc</id>
           <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>
+    <dependencies>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.25</version>
+        </dependency>
+    </dependencies>
 
-       <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>
+        <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>
-               <profile>
-                 <id>docker</id>
-                 <modules>
-                       <module>installation</module>
-                 </modules>
-               </profile>
+            </build>
 
-       </profiles>
-       <dependencies>
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>slf4j-api</artifactId>
-                       <version>1.7.25</version>
-               </dependency>
-       </dependencies>
+        </profile>
+          <profile>
+          <id>docker</id>
+          <modules>
+            <module>installation</module>
+          </modules>
+            </profile>
+
+    </profiles>
 </project>