You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by al...@apache.org on 2020/06/18 16:51:31 UTC

[zeppelin] branch branch-0.9 updated: [ZEPPELIN-4892] Delete plugin dir in clean phase

This is an automated email from the ASF dual-hosted git repository.

alexott pushed a commit to branch branch-0.9
in repository https://gitbox.apache.org/repos/asf/zeppelin.git


The following commit(s) were added to refs/heads/branch-0.9 by this push:
     new 0939215  [ZEPPELIN-4892] Delete plugin dir in clean phase
0939215 is described below

commit 09392155259d561ae5c5d4dbe196ac551f38f3fc
Author: Philipp Dallig <ph...@gmail.com>
AuthorDate: Thu Jun 18 14:05:37 2020 +0200

    [ZEPPELIN-4892] Delete plugin dir in clean phase
    
    ### What is this PR for?
    This PR will delete the content of the plugin folders. Unfortunately the main folder is still present after a `mvn clean`
    
    ### What type of PR is it?
    - Bug Fix
    
    ### What is the Jira issue?
    * https://issues.apache.org/jira/browse/ZEPPELIN-4892
    
    ### How should this be tested?
    * **Travis-CI:** https://travis-ci.org/github/Reamer/zeppelin/builds/699667326
    
    ### Questions:
    * Does the licenses files need update? No
    * Is there breaking changes for older versions? No
    * Does this needs documentation? No
    
    Author: Philipp Dallig <ph...@gmail.com>
    
    Closes #3808 from Reamer/clean_plugin_dir and squashes the following commits:
    
    a0dab671c [Philipp Dallig] Delete plugin dir in clean phase
    
    (cherry picked from commit 2e51c39718d89f4af6babcdaa6ae971f0ce54ce8)
    Signed-off-by: Alex Ott <al...@apache.org>
---
 zeppelin-plugins/pom.xml | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/zeppelin-plugins/pom.xml b/zeppelin-plugins/pom.xml
index 5e5168d..92a9f29 100644
--- a/zeppelin-plugins/pom.xml
+++ b/zeppelin-plugins/pom.xml
@@ -101,7 +101,7 @@
                                 <goal>copy-dependencies</goal>
                             </goals>
                             <configuration>
-                                <outputDirectory>${project.build.directory}/../../../../plugins/${plugin.name}</outputDirectory>
+                                <outputDirectory>${project.basedir}/../../../plugins/${plugin.name}</outputDirectory>
                                 <overWriteReleases>false</overWriteReleases>
                                 <overWriteSnapshots>false</overWriteSnapshots>
                                 <overWriteIfNewer>true</overWriteIfNewer>
@@ -115,7 +115,7 @@
                                 <goal>copy</goal>
                             </goals>
                             <configuration>
-                                <outputDirectory>${project.build.directory}/../../../../plugins/${plugin.name}</outputDirectory>
+                                <outputDirectory>${project.basedir}/../../../plugins/${plugin.name}</outputDirectory>
                                 <overWriteReleases>false</overWriteReleases>
                                 <overWriteSnapshots>false</overWriteSnapshots>
                                 <overWriteIfNewer>true</overWriteIfNewer>
@@ -131,6 +131,27 @@
                         </execution>
                     </executions>
                 </plugin>
+                <plugin>
+                    <artifactId>maven-clean-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>delete-plugin-dir</id>
+                            <goals>
+                                <goal>clean</goal>
+                            </goals>
+                            <phase>clean</phase>
+                            <configuration>
+                                <filesets>
+                                    <fileset>
+                                        <directory>${project.basedir}/../../../plugins/${plugin.name}</directory>
+                                        <followSymlinks>true</followSymlinks>
+                                        <useDefaultExcludes>false</useDefaultExcludes>
+                                    </fileset>
+                                </filesets>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>