From b725d4cc77b85bc6c66fbb8825da3d4c4e3b9d63 Mon Sep 17 00:00:00 2001
From: "Stone, Avi (as206k)" <as206k@att.com>
Date: Thu, 10 May 2018 18:22:39 +0300
Subject: 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>
---
 dcaedt_catalog/api/pom.xml     | 14 +++++++-------
 dcaedt_catalog/asdc/pom.xml    | 24 ++++++++++++------------
 dcaedt_catalog/commons/pom.xml |  4 ++--
 dcaedt_catalog/db/pom.xml      |  4 ++--
 dcaedt_catalog/pom.xml         | 10 +++++-----
 dcaedt_catalog/service/pom.xml |  8 ++++----
 6 files changed, 32 insertions(+), 32 deletions(-)

(limited to 'dcaedt_catalog')

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>
-- 
cgit 1.2.3-korg