From 3283393bab7cc57af2dc8b70419adbbb34af5c90 Mon Sep 17 00:00:00 2001
From: Michael Lando <ml636r@att.com>
Date: Mon, 24 Jul 2017 23:21:12 +0300
Subject: [SDC] 1710 rebase

Change-Id: I119765d0a74f05722fc19586338fa49fd467095e
Signed-off-by: Michael Lando <ml636r@att.com>
---
 catalog-be/pom.xml | 75 +++++++++++++++++++++---------------------------------
 1 file changed, 29 insertions(+), 46 deletions(-)

(limited to 'catalog-be')

diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index 963bcf99e7..87f4011171 100644
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -660,31 +660,6 @@
 				</executions>
 			</plugin>
 
-			<plugin>
-				<artifactId>maven-clean-plugin</artifactId>
-				<version>2.6.1</version>
-				<executions>
-					<execution>
-						<id>clean.sdc.zip.chef.os.folder</id>
-						<phase>initialize</phase>
-						<goals>
-							<goal>clean</goal>
-						</goals>
-						<configuration>
-
-							<filesets>
-								<fileset>
-									<directory>${project.parent.basedir}/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/files/default/sdc-*.zip</directory>
-									<includes>
-										<include>sdc-*.zip</include>
-									</includes>
-									<followSymlinks>false</followSymlinks>
-								</fileset>
-							</filesets>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<artifactId>maven-resources-plugin</artifactId>
 				<version>2.6</version>
@@ -707,41 +682,49 @@
 							</resources>
 						</configuration>
 					</execution>
+          			<execution>
+            			<id>copy.tosca.folder.to.os.chef</id>
+            			<!-- here the phase you need -->
+            			<phase>install</phase>
+            			<goals>
+              				<goal>copy-resources</goal>
+            			</goals>
+            			<configuration>
+              				<outputDirectory>${project.parent.basedir}/asdctool/tosca</outputDirectory>
+              				<resources>          
+                				<resource>
+                  					<directory>${project.parent.basedir}/catalog-be/src/main/resources/import/tosca</directory>
+                  					<filtering>true</filtering>
+                				</resource>
+              				</resources>              
+            			</configuration>            
+          			</execution>
 				</executions>
 			</plugin>
 
 			<plugin>
-				<groupId>com.coderplus.maven.plugins</groupId>
-				<artifactId>copy-rename-maven-plugin</artifactId>
-				<version>1.0</version>
+				<artifactId>maven-clean-plugin</artifactId>
+				<version>3.0.0</version>
 				<executions>
 					<execution>
-						<id>copy-file</id>
-						<phase>install</phase>
-						<goals>
-							<goal>copy</goal>
-						</goals>
-						<configuration>
-							<sourceFile>${project.parent.basedir}/catalog-be/src/main/resources/config/SDC.zip</sourceFile>
-							<destinationFile>${project.parent.basedir}/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/files/default/SDC.zip</destinationFile>
-						</configuration>
-					</execution>
-					<execution>
-						<id>rename-file</id>
-						<phase>install</phase>
+						<id>clean.tosca.chef.os.folder</id>
+						<phase>clean</phase>
 						<goals>
-							<goal>rename</goal>
+							<goal>clean</goal>
 						</goals>
 						<configuration>
-							<sourceFile>${project.parent.basedir}/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/files/default/SDC.zip</sourceFile>
-							<destinationFile>${project.parent.basedir}/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/files/default/SDC-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.zip</destinationFile>
+
+							<filesets>
+								<fileset>
+									<directory>${project.parent.basedir}/asdctool/tosca</directory>
+									<followSymlinks>false</followSymlinks>
+								</fileset>
+							</filesets>
 						</configuration>
 					</execution>
 				</executions>
 			</plugin>
 
-
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
-- 
cgit 1.2.3-korg