From fb0b3dc943bca0346271e0889ff2e7dbf3c77eeb Mon Sep 17 00:00:00 2001
From: Jozsef Csongvai <jozsef.csongvai@bell.ca>
Date: Tue, 11 Aug 2020 16:17:55 -0400
Subject: Add test-blueprint-kotlin-parent

This parent project is intended for inheritence in CBA pom.xml.
It provides dependencies for testing and mocking kotlin scripts.
By turning a CBA into a maven project which inherits this parent,
users will be able to debug and unit test their kotlin scripts.

The parent also includes a profile (-Pdeploy-cba) which will enrich
and publish the CBA to a running instance of CDS, defined by properties
in the CBA pom.xml.

This patch also adds a common assembly descriptor for resuse in
maven-assembly-plugin where it is used to package CBA into zip.

Issue-ID: CCSDK-2642
Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca>
Change-Id: I160c3c3e982ad4ed46f0704d6dc27dadfb0dfdc8
---
 .../resource-audit/Distribution/cba_zip.xml        | 43 ----------------------
 .../test-blueprint/resource-audit/pom.xml          | 13 +++++--
 2 files changed, 10 insertions(+), 46 deletions(-)
 delete mode 100755 components/model-catalog/blueprint-model/test-blueprint/resource-audit/Distribution/cba_zip.xml

(limited to 'components/model-catalog/blueprint-model/test-blueprint/resource-audit')

diff --git a/components/model-catalog/blueprint-model/test-blueprint/resource-audit/Distribution/cba_zip.xml b/components/model-catalog/blueprint-model/test-blueprint/resource-audit/Distribution/cba_zip.xml
deleted file mode 100755
index c6c3bde71..000000000
--- a/components/model-catalog/blueprint-model/test-blueprint/resource-audit/Distribution/cba_zip.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~  Copyright © 2019 IBM.
-  ~
-  ~  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.
-  -->
-
-<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>
-</assembly>
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/test-blueprint/resource-audit/pom.xml b/components/model-catalog/blueprint-model/test-blueprint/resource-audit/pom.xml
index 21d9b8df5..3cc08222d 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/resource-audit/pom.xml
+++ b/components/model-catalog/blueprint-model/test-blueprint/resource-audit/pom.xml
@@ -43,6 +43,13 @@
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>3.1.0</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
+                        <artifactId>cba-assembly-descriptor</artifactId>
+                        <version>1.0.0-SNAPSHOT</version>
+                    </dependency>
+                </dependencies>
                 <executions>
                     <execution>
                         <id>cba</id>
@@ -52,9 +59,9 @@
                         </goals>
                         <configuration>
                             <appendAssemblyId>false</appendAssemblyId>
-                            <descriptors>
-                                <descriptor>Distribution/cba_zip.xml</descriptor>
-                            </descriptors>
+                            <descriptorRefs>
+                                <descriptorRef>cba_zip</descriptorRef>
+                            </descriptorRefs>
                         </configuration>
                     </execution>
                 </executions>
-- 
cgit 1.2.3-korg