From ff6f166e6a55f98abd2d19052e75aa2a4740a912 Mon Sep 17 00:00:00 2001
From: "Singal, Kapil (ks220y)" <ks220y@att.com>
Date: Mon, 17 Aug 2020 10:56:59 -0400
Subject: Fixing and Refactoring Pom

Changing parent reference to avoid relative path issue and adding copyright header to new pom

Issue-ID: CCSDK-2642
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: Ibd6a6867eea9849cc1ddc37e9accdba6b4ddca09
---
 .../cba-assembly-descriptor/pom.xml                | 34 +++++++++++----
 .../src/main/resources/assemblies/cba_zip.xml      | 48 +++++++++++-----------
 .../test-blueprint-kotlin-parent/pom.xml           |  4 +-
 3 files changed, 51 insertions(+), 35 deletions(-)

diff --git a/components/model-catalog/blueprint-model/cba-assembly-descriptor/pom.xml b/components/model-catalog/blueprint-model/cba-assembly-descriptor/pom.xml
index e918cc214..5a2432953 100644
--- a/components/model-catalog/blueprint-model/cba-assembly-descriptor/pom.xml
+++ b/components/model-catalog/blueprint-model/cba-assembly-descriptor/pom.xml
@@ -1,11 +1,27 @@
 <?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.ccsdk.cds.blueprintsprocessor</groupId>
-  <artifactId>cba-assembly-descriptor</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-  <name>CBA - Assembly Sescriptor</name>
-  <description>Shared assembly descriptor</description>
+<!--
+  ~  Copyright © 2020 AT&T.
+  ~
+  ~  Licensed under the Apache License, Version 2.0 (the "License");
+  ~  you may not use this file except in compliance with the License.
+  ~  You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing, software
+  ~  distributed under the License is distributed on an "AS IS" BASIS,
+  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~  See the License for the specific language governing permissions and
+  ~  limitations under the License.
+  -->
+
+<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.cds.blueprintsprocessor</groupId>
+    <artifactId>cba-assembly-descriptor</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+
+    <name>CBA - Assembly Sescriptor</name>
+    <description>Shared assembly descriptor</description>
 </project>
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/cba-assembly-descriptor/src/main/resources/assemblies/cba_zip.xml b/components/model-catalog/blueprint-model/cba-assembly-descriptor/src/main/resources/assemblies/cba_zip.xml
index 71a3c8d44..c6c3bde71 100644
--- a/components/model-catalog/blueprint-model/cba-assembly-descriptor/src/main/resources/assemblies/cba_zip.xml
+++ b/components/model-catalog/blueprint-model/cba-assembly-descriptor/src/main/resources/assemblies/cba_zip.xml
@@ -16,28 +16,28 @@
   -->
 
 <assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-  <!-- create a tar.gz file containing the projects dependencies -->
-  <id>cba</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <fileSet>
-      <directory>${project.basedir}</directory>
-      <includes>
-        <include>Definitions/**</include>
-        <include>Distribution/**</include>
-        <include>Environments/**</include>
-        <include>Plans/**</include>
-        <include>Others/**</include>
-        <include>Scripts/**</include>
-        <include>Templates/**</include>
-        <include>TOSCA-Metadata/**</include>
-        <include>pom.xml</include>
-      </includes>
-    </fileSet>
-  </fileSets>
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+    <!-- create a tar.gz file containing the projects dependencies -->
+    <id>cba</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>${project.basedir}</directory>
+            <includes>
+                <include>Definitions/**</include>
+                <include>Distribution/**</include>
+                <include>Environments/**</include>
+                <include>Plans/**</include>
+                <include>Others/**</include>
+                <include>Scripts/**</include>
+                <include>Templates/**</include>
+                <include>TOSCA-Metadata/**</include>
+                <include>pom.xml</include>
+            </includes>
+        </fileSet>
+    </fileSets>
 </assembly>
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/test-blueprint-kotlin-parent/pom.xml b/components/model-catalog/blueprint-model/test-blueprint-kotlin-parent/pom.xml
index 1459531ec..de321f86f 100644
--- a/components/model-catalog/blueprint-model/test-blueprint-kotlin-parent/pom.xml
+++ b/components/model-catalog/blueprint-model/test-blueprint-kotlin-parent/pom.xml
@@ -19,8 +19,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
-        <artifactId>cba-parent</artifactId>
+        <groupId>org.onap.ccsdk.cds.cba</groupId>
+        <artifactId>blueprint-model</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
-- 
cgit 1.2.3-korg