Fix groupIds

Incorrect groupIds - need to match repo structure.  Also, name tags
need to include sdnc-oam to map to correct Sonar project.

Change-Id: I530855763bb02fc655a2192f9af55da63fd12512
Issue-ID: SDNC-445
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>

diff --git a/SdncReports/SdncReportsApi/pom.xml b/SdncReports/SdncReportsApi/pom.xml
index 2529a05..f532078 100644 (file)
--- a/SdncReports/SdncReportsApi/pom.xml
+++ b/SdncReports/SdncReportsApi/pom.xml
@@ -1,210 +1,193 @@
-<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>
-  <parent>
-    <groupId>org.onap.ccsdk.parent</groupId>
-    <artifactId>SdncReports</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-  </parent>
-  
-  
-   <properties>
+<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>1.4.0-SNAPSHOT</version>
+        <name>sdnc-oam :: SdncReports :: SdncReportsApi</name>
+       <parent>
+               <groupId>org.onap.sdnc.oam</groupId>
+               <artifactId>SdncReports</artifactId>
+               <version>1.4.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>com.h2database</groupId>
-    <artifactId>h2</artifactId>
-    <scope>test</scope>
-    <version>1.4.194</version>
- </dependency> -->
-
-       <dependency>
-    <groupId>ch.vorburger.mariaDB4j</groupId>
-    <artifactId>mariaDB4j</artifactId>
-    <version>2.2.3</version>
-</dependency>
-
-<!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
+
+       <dependencies>
+
+               <!-- <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> 
+                       <scope>test</scope> <version>1.4.194</version> </dependency> -->
+
+               <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>com.sdnc.reports</groupId>
-               <artifactId>sdnc_reports_certification</artifactId>
-               <version>0.0.1-SNAPSHOT</version>
-                 <scope>test</scope>
-                   <classifier>exec</classifier>
-       </dependency> -->
-       
-       <dependency>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>SdncReportsDao</artifactId>
-               <version>0.0.1-SNAPSHOT</version>
-       </dependency>
-       
-       <dependency>
+
+               <!-- <dependency> <groupId>com.sdnc.reports</groupId> <artifactId>sdnc_reports_certification</artifactId> 
+                       <version>0.0.1-SNAPSHOT</version> <scope>test</scope> <classifier>exec</classifier> 
+                       </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>
+
+               <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>
 
-       <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>
+               </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-data-jpa</artifactId>           
-       </dependency>   
-       
+                       <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>   
-
-
-  </dependencies>
-  
-  <build>
-
-  <plugins>
-
-    <plugin>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-maven-plugin</artifactId>
-      <configuration>
-        <executable>true</executable>
-    </configuration>
-     <!--  <configuration>
-        <mainClass>${start-class}</mainClass>
-        <layout>ZIP</layout>
-      </configuration>
-      <executions>
-        <execution>
-          <goals>
-            <goal>repackage</goal>
-          </goals>
-        </execution>
-      </executions> -->
-    </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>
-        <!--
-            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>
-
-        <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>
\ No newline at end of file
+               <dependency>
+                       <groupId>org.springframework.boot</groupId>
+                       <artifactId>spring-boot-starter-log4j2</artifactId>
+               </dependency>
+
+
+       </dependencies>
+
+       <build>
+
+               <plugins>
+
+                       <plugin>
+                               <groupId>org.springframework.boot</groupId>
+                               <artifactId>spring-boot-maven-plugin</artifactId>
+                               <configuration>
+                                       <executable>true</executable>
+                               </configuration>
+                               <!-- <configuration> <mainClass>${start-class}</mainClass> <layout>ZIP</layout> 
+                                       </configuration> <executions> <execution> <goals> <goal>repackage</goal> 
+                                       </goals> </execution> </executions> -->
+                       </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>
+                                       <!-- 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>
+
+                       <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>

diff --git a/SdncReports/SdncReportsDao/pom.xml b/SdncReports/SdncReportsDao/pom.xml
index 5e6afa1..afcce95 100644 (file)
--- a/SdncReports/SdncReportsDao/pom.xml
+++ b/SdncReports/SdncReportsDao/pom.xml
@@ -1,65 +1,65 @@
-<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>
-  <artifactId>SdncReportsDao</artifactId>
-  <packaging>jar</packaging>
-  
-  <parent>
-    <groupId>org.onap.ccsdk.parent</groupId>
-    <artifactId>SdncReports</artifactId>
-    <version>0.0.1-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>
-       
+<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>1.4.0-SNAPSHOT</version>
+       <packaging>jar</packaging>
+
+        <name>sdnc-oam :: SdncReports :: SdncReportsDao</name>
+
+       <parent>
+               <groupId>org.onap.sdnc.oam</groupId>
+               <artifactId>SdncReports</artifactId>
+               <version>1.4.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>                                
+                                       <artifactId>hibernate-entitymanager</artifactId>
                                </exclusion>
                        </exclusions>
-                       
+
                </dependency>
-               
+
                <dependency>
                        <groupId>mysql</groupId>
                        <artifactId>mysql-connector-java</artifactId>
                        <scope>runtime</scope>
                </dependency>
 
-       <!--    <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-tomcat</artifactId>
-                       <scope>provided</scope>
-               </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>
\ No newline at end of file
+
+               <!-- <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>

diff --git a/SdncReports/pom.xml b/SdncReports/pom.xml
index a811d1b..5b9bd5d 100644 (file)
--- a/SdncReports/pom.xml
+++ b/SdncReports/pom.xml
@@ -1,13 +1,16 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
        <modelVersion>4.0.0</modelVersion>
 
 
-       <groupId>org.onap.ccsdk.parent</groupId>        
+       <groupId>org.onap.sdnc.oam</groupId>
        <artifactId>SdncReports</artifactId>
-       <version>0.0.1-SNAPSHOT</version>
+       <version>1.4.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
+        <name>sdnc-oam :: SdncReports</name>
+
        <parent>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-starter-parent</artifactId>
@@ -23,10 +26,10 @@
                        <url>http://nexus.onap.org/content/repositories/snapshots</url>
                </snapshotRepository>
        </distributionManagement>
-       
+
        <modules>
                <module>SdncReportsDao</module>
-               <module>SdncReportsApi</module>         
+               <module>SdncReportsApi</module>
        </modules>
 
        <build>

diff --git a/configbackuprestore/getBackupVnfDetailService/pom.xml b/configbackuprestore/getBackupVnfDetailService/pom.xml
index a5259f0..ad82e09 100644 (file)
--- a/configbackuprestore/getBackupVnfDetailService/pom.xml
+++ b/configbackuprestore/getBackupVnfDetailService/pom.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0"?>
 <project
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-       xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+       xmlns="http://maven.apache.org/POM/4.0.0"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
        <modelVersion>4.0.0</modelVersion>
        <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
+               <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
                <artifactId>configbackuprestore</artifactId>
-               <version>1.0-SNAPSHOT</version>
+               <version>1.4.0-SNAPSHOT</version>
        </parent>
-       <groupId>com.onap.sdnc.vnfbackup</groupId>
+       <groupId>com.onap.sdnc.oam.vnfbackup</groupId>
        <artifactId>getBackupVnfDetailService</artifactId>
-       <version>1.0-SNAPSHOT</version>
-       <name>getBackupVnfDetailService</name>
+       <version>1.4.0-SNAPSHOT</version>
+       <name>sdnc-oam :: vnfbackup :: getBackupVnfDetailService</name>
        <url>http://maven.apache.org</url>
        <properties>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -105,50 +106,44 @@
 
        </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>
+               <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>
\ No newline at end of file
+</project>

diff --git a/configbackuprestore/pom.xml b/configbackuprestore/pom.xml
index 9aa3c32..4501ca7 100644 (file)
--- a/configbackuprestore/pom.xml
+++ b/configbackuprestore/pom.xml
@@ -1,13 +1,14 @@
 <?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"
+<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">
 
        <modelVersion>4.0.0</modelVersion>
 
-       <groupId>org.onap.ccsdk.parent</groupId>
+       <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
        <artifactId>configbackuprestore</artifactId>
-       <version>1.0-SNAPSHOT</version>
-       <name>Archetype - configbackuprestore</name>
+       <version>1.4.0-SNAPSHOT</version>
+       <name>sdnc-oam :: vnfbackup</name>
        <packaging>pom</packaging>
 
        <parent>

diff --git a/configbackuprestore/vnfconfigbackupservice/pom.xml b/configbackuprestore/vnfconfigbackupservice/pom.xml
index bf6fdf0..c3de9c2 100644 (file)
--- a/configbackuprestore/vnfconfigbackupservice/pom.xml
+++ b/configbackuprestore/vnfconfigbackupservice/pom.xml
@@ -6,15 +6,15 @@
        <modelVersion>4.0.0</modelVersion>
        
        <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
+               <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
                <artifactId>configbackuprestore</artifactId>
-               <version>1.0-SNAPSHOT</version>
+               <version>1.4.0-SNAPSHOT</version>
        </parent>
        
-       <groupId>com.onap.sdnc.vnfbackupservice</groupId>
+       <groupId>com.onap.sdnc.oam.vnfbackup</groupId>
        <artifactId>vnfconfigbackupservice</artifactId>
-       <version>1.0-SNAPSHOT</version>
-       <name>vnfconfigbackupservice</name>
+       <version>1.4.0-SNAPSHOT</version>
+       <name>sdnc-oam :: vnfbackup :: vnfconfigbackupservice</name>
        <url>http://maven.apache.org</url>
        
        <dependencies>

diff --git a/configbackuprestore/vnfconfigreportsservice/pom.xml b/configbackuprestore/vnfconfigreportsservice/pom.xml
index 1d83bd0..22ed28f 100644 (file)
--- a/configbackuprestore/vnfconfigreportsservice/pom.xml
+++ b/configbackuprestore/vnfconfigreportsservice/pom.xml
@@ -1,34 +1,36 @@
 <?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
+<project
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+       xmlns="http://maven.apache.org/POM/4.0.0"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
                <artifactId>configbackuprestore</artifactId>
-               <version>1.0-SNAPSHOT</version>
+               <version>1.4.0-SNAPSHOT</version>
        </parent>
-  <groupId>com.onap.sdnc.vnfbackup</groupId>
-  <artifactId>vnfconfigreportsservice</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <name>vnfconfigreportsservice</name>
-  <url>http://maven.apache.org</url>
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-  <dependencies>
+       <groupId>com.onap.sdnc.oam.vnfbackup</groupId>
+       <artifactId>vnfconfigreportsservice</artifactId>
+       <version>1.4.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>
-               
+                       <groupId>javax.servlet</groupId>
+                       <artifactId>jstl</artifactId>
+                       <scope>provided</scope>
+               </dependency>
+
                <dependency>
                        <groupId>org.mariadb.jdbc</groupId>
                        <artifactId>mariadb-java-client</artifactId>
@@ -101,12 +103,12 @@
                        <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>
+               <dependency>
+                       <groupId>org.mockito</groupId>
+                       <artifactId>mockito-all</artifactId>
+                       <version>1.9.5</version>
+                       <scope>test</scope>
+               </dependency>
        </dependencies>
 </project>