From 42ef3e4d9d80ac3de18cb687fac3c375ecdc96db Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dt5972@att.com>
Date: Thu, 13 Sep 2018 12:11:35 -0400
Subject: 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>

Former-commit-id: 597abe7f0380146d5e44588c2be24c63357afbd7
---
 .../getBackupVnfDetailService/pom.xml              | 99 ++++++++++------------
 configbackuprestore/pom.xml                        |  9 +-
 configbackuprestore/vnfconfigbackupservice/pom.xml | 10 +--
 .../vnfconfigreportsservice/pom.xml                | 56 ++++++------
 4 files changed, 86 insertions(+), 88 deletions(-)

(limited to 'configbackuprestore')

diff --git a/configbackuprestore/getBackupVnfDetailService/pom.xml b/configbackuprestore/getBackupVnfDetailService/pom.xml
index a5259f09..ad82e094 100644
--- 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 9aa3c32d..4501ca7d 100644
--- 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 bf6fdf0e..c3de9c2e 100644
--- 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 1d83bd02..22ed28f3 100644
--- 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>
 
-- 
cgit 1.2.3-korg