From: andre.schmid <andre.schmid@est.tech>
Date: Tue, 28 Sep 2021 10:24:44 +0000 (+0100)
Subject: Fix clean up of build file sdctool.tar
X-Git-Tag: 1.10.0~61
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F82%2F124682%2F2;p=sdc.git

Fix clean up of build file sdctool.tar

Fixes clean up/generation of cassandra-init build file sdctool.tar.
It was not being deleted during the clean, also not being overwritten
during the build. This could cause the file to not be updated during
the build process, in case of changes in the content that composes it.

Change-Id: I82ba2cfaa0f7d823fcf5cfff27292483a7ff9ea2
Issue-ID: SDC-3741
Signed-off-by: andre.schmid <andre.schmid@est.tech>
---

diff --git a/asdctool/pom.xml b/asdctool/pom.xml
index 5c012596ec..0d4f12dc7b 100644
--- a/asdctool/pom.xml
+++ b/asdctool/pom.xml
@@ -767,6 +767,29 @@
       </activation>
       <build>
         <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-clean-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>clean.sdctool.tar</id>
+                <phase>initialize</phase>
+                <goals>
+                  <goal>clean</goal>
+                </goals>
+                <configuration>
+                  <filesets>
+                    <fileset>
+                      <directory>${basedir}/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/files/default</directory>
+                      <includes>
+                        <include>sdctool.tar</include>
+                      </includes>
+                    </fileset>
+                  </filesets>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-resources-plugin</artifactId>
@@ -781,6 +804,7 @@
                   <outputDirectory>
                     ${basedir}/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/files/default
                   </outputDirectory>
+                  <overwrite>true</overwrite>
                   <resources>
                     <resource>
                       <directory>${project.parent.basedir}/asdctool/target</directory>