Fix pom.xml

Change pom version according to ONAP versioning

Change-Id: I2cecbebb11040a690335947aaddad8d3c2f7afd1
Issue-ID: SDC-1316
Signed-off-by: Stone, Avi (as206k) <as206k@att.com>

12 files changed, 93 insertions, 68 deletions

diff --git a/dcaedt_be/pom.xml b/dcaedt_be/pom.xml
index b236858..e00aaba 100644
--- a/dcaedt_be/pom.xml
+++ b/dcaedt_be/pom.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project 
-	xmlns="http://maven.apache.org/POM/4.0.0" 
+<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.sdc.dcae.composition</groupId>
+	<groupId>org.onap.sdc.dcae-d.composition</groupId>
 	<artifactId>dcae_dt_be</artifactId>
 	<packaging>war</packaging>
 	<name>DCAE DT BE</name>
 	<parent>
-		<groupId>org.onap.sdc.dcae</groupId>
+		<groupId>org.onap.sdc.dcae-d.dt-be-main</groupId>
 		<artifactId>dcae_dt_be_main</artifactId>
-		<version>1806.0.1-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<dependency>
@@ -54,27 +54,27 @@
 			<version>20160810</version>
 		</dependency>
 		<dependency>
-			<groupId>org.onap.sdc.dcae</groupId>
+			<groupId>org.onap.sdc.dcae-d.dt-be-main</groupId>
 			<artifactId>DCAE-DT-Catalog-ASDC</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.onap.sdc.dcae</groupId>
+			<groupId>org.onap.sdc.dcae-d.dt-be-main</groupId>
 			<artifactId>DCAE-DT-Catalog-API</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.onap.sdc.dcae</groupId>
+			<groupId>org.onap.sdc.dcae-d.dt-be-main</groupId>
 			<artifactId>DCAE-DT-Catalog-Commons</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.onap.sdc.dcae</groupId>
+			<groupId>org.onap.sdc.dcae-d.dt-be-main</groupId>
 			<artifactId>DCAE-DT-Catalog-DB</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.onap.sdc.dcae</groupId>
+			<groupId>org.onap.sdc.dcae-d.dt-be-main</groupId>
 			<artifactId>DCAE-DT-Catalog-Service</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -174,7 +174,7 @@
 						</resource>
 					</webResources>
 				</configuration>
-				<!-- <executions><execution><goals><goal>repackage</goal></goals></execution></executions><configuration><jvmArguments> -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8096 
+				<!-- <executions><execution><goals><goal>repackage</goal></goals></execution></executions><configuration><jvmArguments> -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8096
 					</jvmArguments></configuration> -->
 			</plugin>
 			<plugin>
diff --git a/dcaedt_catalog/api/pom.xml b/dcaedt_catalog/api/pom.xml
index 234f12f..9f1ee46 100644
--- a/dcaedt_catalog/api/pom.xml
+++ b/dcaedt_catalog/api/pom.xml
@@ -2,9 +2,9 @@
 	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.sdc.dcae</groupId>
+		<groupId>org.onap.sdc.dcae-d.dt-be-main</groupId>
 		<artifactId>DCAE-DT-Catalog</artifactId>
-		<version>1806.0.1-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>DCAE-DT-Catalog-API</artifactId>
 	<packaging>jar</packaging>
@@ -105,8 +105,8 @@
 						</manifestEntries>
 					</archive>
 				</configuration>
-				<!-- <executions> <execution> <id>make-assembly</id> this is used for 
-					inheritance merges <phase>package</phase> bind to the packaging phase <goals> 
+				<!-- <executions> <execution> <id>make-assembly</id> this is used for
+					inheritance merges <phase>package</phase> bind to the packaging phase <goals>
 					<goal>single</goal> </goals> </execution> </executions> -->
 			</plugin>
 		</plugins>
@@ -155,18 +155,18 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.sdc.dcae</groupId>
+			<groupId>org.onap.sdc.dcae-d.dt-be-main</groupId>
 			<artifactId>DCAE-DT-Catalog-Commons</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.onap.sdc.dcae</groupId>
+			<groupId>org.onap.sdc.dcae-d.dt-be-main</groupId>
 			<artifactId>DCAE-DT-Catalog-ASDC</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.sdc.dcae</groupId>
+			<groupId>org.onap.sdc.dcae-d.dt-be-main</groupId>
 			<artifactId>DCAE-DT-Validator-Checker</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/dcaedt_catalog/asdc/pom.xml b/dcaedt_catalog/asdc/pom.xml
index 14323fe..a140df8 100644
--- a/dcaedt_catalog/asdc/pom.xml
+++ b/dcaedt_catalog/asdc/pom.xml
@@ -2,9 +2,9 @@
 	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.sdc.dcae</groupId>
+		<groupId>org.onap.sdc.dcae-d.dt-be-main</groupId>
 		<artifactId>DCAE-DT-Catalog</artifactId>
-		<version>1806.0.1-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>DCAE-DT-Catalog-ASDC</artifactId>
 	<packaging>jar</packaging>
@@ -41,13 +41,13 @@
 					</execution>
 				</executions>
 			</plugin>
-			<!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>buildnumber-maven-plugin</artifactId> 
-				<version>1.4</version> <executions> <execution> <phase>validate</phase> <goals> 
-				<goal>create</goal> </goals> </execution> </executions> <configuration> <doCheck>false</doCheck> 
-				<doUpdate>false</doUpdate> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> 
-				<artifactId>maven-jar-plugin</artifactId> <version>2.1</version> <configuration> 
-				<archive> <manifest> <addDefaultImplementationEntries>true</addDefaultImplementationEntries> 
-				</manifest> <manifestEntries> <Implementation-Build>${buildNumber}</Implementation-Build> 
+			<!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>buildnumber-maven-plugin</artifactId>
+				<version>1.4</version> <executions> <execution> <phase>validate</phase> <goals>
+				<goal>create</goal> </goals> </execution> </executions> <configuration> <doCheck>false</doCheck>
+				<doUpdate>false</doUpdate> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId> <version>2.1</version> <configuration>
+				<archive> <manifest> <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+				</manifest> <manifestEntries> <Implementation-Build>${buildNumber}</Implementation-Build>
 				</manifestEntries> </archive> </configuration> </plugin> -->
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
@@ -73,7 +73,7 @@
 			<version>3.8.1</version>
 			<scope>test</scope>
 		</dependency>
-		<!-- <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> 
+		<!-- <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId>
 			<version>2.4.4</version> </dependency> -->
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -111,12 +111,12 @@
 			<version>1.3</version>
 		</dependency>
 		<dependency>
-			<groupId>org.onap.sdc.dcae</groupId>
+			<groupId>org.onap.sdc.dcae-d.dt-be-main</groupId>
 			<artifactId>DCAE-DT-Catalog-Commons</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.onap.sdc.dcae</groupId>
+			<groupId>org.onap.sdc.dcae-d.dt-be-main</groupId>
 			<artifactId>DCAE-DT-Validator-Checker</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/dcaedt_catalog/commons/pom.xml b/dcaedt_catalog/commons/pom.xml
index d285e1b..9bc3649 100644
--- a/dcaedt_catalog/commons/pom.xml
+++ b/dcaedt_catalog/commons/pom.xml
@@ -1,9 +1,9 @@
 <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.sdc.dcae</groupId>
+    <groupId>org.onap.sdc.dcae-d.dt-be-main</groupId>
     <artifactId>DCAE-DT-Catalog</artifactId>
-    <version>1806.0.1-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>DCAE-DT-Catalog-Commons</artifactId>
   <packaging>jar</packaging>
diff --git a/dcaedt_catalog/db/pom.xml b/dcaedt_catalog/db/pom.xml
index 8a0e1f9..f44410d 100644
--- a/dcaedt_catalog/db/pom.xml
+++ b/dcaedt_catalog/db/pom.xml
@@ -1,9 +1,9 @@
 <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.sdc.dcae</groupId>
+    <groupId>org.onap.sdc.dcae-d.dt-be-main</groupId>
     <artifactId>DCAE-DT-Catalog</artifactId>
-    <version>1806.0.1-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>DCAE-DT-Catalog-DB</artifactId>
   <packaging>jar</packaging>
diff --git a/dcaedt_catalog/pom.xml b/dcaedt_catalog/pom.xml
index 701d665..3bc2373 100644
--- a/dcaedt_catalog/pom.xml
+++ b/dcaedt_catalog/pom.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" 
+<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 
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
                              http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
  	<artifactId>DCAE-DT-Catalog</artifactId>
   <packaging>pom</packaging>
   <name>DCAE DT Catalog</name>
  <parent>
-		<groupId>org.onap.sdc.dcae</groupId>
+		<groupId>org.onap.sdc.dcae-d.dt-be-main</groupId>
 		<artifactId>dcae_dt_be_main</artifactId>
-		<version>1806.0.1-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 </parent>
   <modules>
     <module>asdc</module>
@@ -19,7 +19,7 @@
     <module>api</module>
 		<module>service</module>
   </modules>
- 	
+
   <scm>
  		<connection>scm:git:https://github.research.att.com/ASC/ASC-Catalog/</connection>
  		<developerConnection>scm:git:https://github.research.att.com/ASC/ASC-Catalog/</developerConnection>
diff --git a/dcaedt_catalog/service/pom.xml b/dcaedt_catalog/service/pom.xml
index c41980d..539e0cb 100644
--- a/dcaedt_catalog/service/pom.xml
+++ b/dcaedt_catalog/service/pom.xml
@@ -1,10 +1,10 @@
 <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.sdc.dcae</groupId>
+    <groupId>org.onap.sdc.dcae-d.dt-be-main</groupId>
     <artifactId>DCAE-DT-Catalog</artifactId>
-    <version>1806.0.1-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>DCAE-DT-Catalog-Service</artifactId>
   <packaging>jar</packaging>
@@ -72,7 +72,7 @@
 			<version>1.4.1.RELEASE</version>
 		</dependency>
         <dependency>
-            <groupId>org.onap.sdc.dcae</groupId>
+            <groupId>org.onap.sdc.dcae-d.dt-be-main</groupId>
             <artifactId>DCAE-DT-Catalog-API</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/dcaedt_tools/pom.xml b/dcaedt_tools/pom.xml
index 50ed8ef..8abf055 100644
--- a/dcaedt_tools/pom.xml
+++ b/dcaedt_tools/pom.xml
@@ -2,13 +2,13 @@
 <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.sdc.dcae.tools</groupId>
+    <groupId>org.onap.sdc.dcae-d.tools</groupId>
     <artifactId>dcaedt_tools</artifactId>
     <name>DCAE-D Tools</name>
     <parent>
-        <groupId>org.onap.sdc.dcae</groupId>
+        <groupId>org.onap.sdc.dcae-d.dt-be-main</groupId>
         <artifactId>dcae_dt_be_main</artifactId>
-        <version>1806.0.1-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
     <build>
         <plugins>
@@ -74,7 +74,7 @@
             <version>2.8.0</version>
         </dependency>
         <dependency>
-            <groupId>org.onap.sdc.dcae.property</groupId>
+            <groupId>org.onap.sdc.dcae-d.dt-be-property</groupId>
             <artifactId>DCAE-DT-PROPERTY</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -126,11 +126,11 @@
             <version>4.12</version>
         </dependency>
     </dependencies>
-    
+
     <distributionManagement>
       <site>
           <id>onap-site</id>
           <url>dav:${onap.nexus.url}${sitePath}</url>
       </site>
   	</distributionManagement>
-</project>
\ No newline at end of file
+</project>
diff --git a/dcaedt_validator/checker/pom.xml b/dcaedt_validator/checker/pom.xml
index 4b64c8b..66d9a8f 100644
--- a/dcaedt_validator/checker/pom.xml
+++ b/dcaedt_validator/checker/pom.xml
@@ -1,11 +1,11 @@
-<project 
-	xmlns="http://maven.apache.org/POM/4.0.0" 
+<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.sdc.dcae</groupId>
+		<groupId>org.onap.sdc.dcae-d.dt-be-main</groupId>
 		<artifactId>DCAE-DT-Validator</artifactId>
-		<version>1806.0.1-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>DCAE-DT-Validator-Checker</artifactId>
 	<packaging>jar</packaging>
@@ -152,7 +152,7 @@
 			<version>0.9.11</version>
 		</dependency>
 		<dependency>
-			<groupId>org.onap.sdc.dcae</groupId>
+			<groupId>org.onap.sdc.dcae-d.dt-be-main</groupId>
 			<artifactId>kwalify</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/dcaedt_validator/kwalify/pom.xml b/dcaedt_validator/kwalify/pom.xml
index fe68f17..5eed50b 100644
--- a/dcaedt_validator/kwalify/pom.xml
+++ b/dcaedt_validator/kwalify/pom.xml
@@ -1,11 +1,11 @@
-<project 
-	xmlns="http://maven.apache.org/POM/4.0.0" 
+<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.sdc.dcae</groupId>
+		<groupId>org.onap.sdc.dcae-d.dt-be-main</groupId>
 		<artifactId>DCAE-DT-Validator</artifactId>
-		<version>1806.0.1-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>kwalify</artifactId>
 	<packaging>jar</packaging>
diff --git a/dcaedt_validator/pom.xml b/dcaedt_validator/pom.xml
index cc6df87..5937865 100644
--- a/dcaedt_validator/pom.xml
+++ b/dcaedt_validator/pom.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project 
-  xmlns="http://maven.apache.org/POM/4.0.0" 
+<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>
   <artifactId>DCAE-DT-Validator</artifactId>
   <packaging>pom</packaging>
   <name>ASC Validator</name>
   <parent>
-    <groupId>org.onap.sdc.dcae</groupId>
+    <groupId>org.onap.sdc.dcae-d.dt-be-main</groupId>
     <artifactId>dcae_dt_be_main</artifactId>
-    <version>1806.0.1-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
   <modules>
     <module>kwalify</module>
diff --git a/pom.xml b/pom.xml
index 61ae9fa..99cb42d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project 
-    xmlns="http://maven.apache.org/POM/4.0.0" 
+<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.sdc.dcae</groupId>
+    <groupId>org.onap.sdc.dcae-d.dt-be-main</groupId>
     <artifactId>dcae_dt_be_main</artifactId>
     <version>1806.0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
@@ -18,7 +18,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.onap.sdc.dcae.property</groupId>
+            <groupId>org.onap.sdc.dcae-d.dt-be-property</groupId>
             <artifactId>DCAE-DT-PROPERTY</artifactId>
             <version>${project.version}</version>
             <exclusions>
@@ -39,6 +39,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
         <nexus.proxy>https://nexus.onap.org</nexus.proxy>
+        <staging.profile.id>176c31dfe190a</staging.profile.id>
     </properties>
     <build>
         <plugins>
@@ -61,6 +62,31 @@
                     </execution>
                 </executions>
             </plugin>
+            <!-- Site Plugin -->
+      			<plugin>
+      				<groupId>org.apache.maven.plugins</groupId>
+      				<artifactId>maven-site-plugin</artifactId>
+      				<version>3.4</version>
+      				<dependencies>
+      					<dependency>
+      						<groupId>org.apache.maven.wagon</groupId>
+      						<artifactId>wagon-webdav-jackrabbit</artifactId>
+      						<version>2.10</version>
+      					</dependency>
+      				</dependencies>
+      			</plugin>
+      			<!-- Staging Plugin -->
+      			<plugin>
+      				<groupId>org.sonatype.plugins</groupId>
+      				<artifactId>nexus-staging-maven-plugin</artifactId>
+      				<version>1.6.7</version>
+      				<extensions>true</extensions>
+      				<configuration>
+      					<nexusUrl>${nexus.proxy}</nexusUrl>
+      					<stagingProfileId>${staging.profile.id}</stagingProfileId>
+      					<serverId>ecomp-staging</serverId>
+      				</configuration>
+      			</plugin>
         </plugins>
     </build>
     <profiles>
@@ -186,7 +212,7 @@
                                          </tags>
                                     </build>
                                 </image>
-                                
+
                                 <!-- Build tools image -->
                                 <image>
                                     <name>onap/dcae-tools</name>
@@ -275,4 +301,3 @@
         </site>
     </distributionManagement>
 </project>
-