Repository: zeppelin Updated Branches: refs/heads/master 4f73272c0 -> b983304c0
ZEPPELIN-3822. All interpreter folders (ZEPPELIN_HOME/interpreter) are deleted when maven clean is invoked ### What is this PR for? This PR is to fix the bug that `ZEPPELIN_HOME`/interpreter folder is always deleted when maven clean is invoked for module `zeppelin`. ### What type of PR is it? [Bug Fix] ### Todos * [ ] - Task ### What is the Jira issue? * https://jira.apache.org/jira/browse/ZEPPELIN-3822 ### How should this be tested? * CI pass ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? NO Author: Jeff Zhang <zjf...@apache.org> Closes #3223 from zjffdu/ZEPPELIN-3822 and squashes the following commits: da4773dfe [Jeff Zhang] ZEPPELIN-3822. All interpreter folders (ZEPPELIN_HOME/interpreter) are deleted when maven clean is invoked Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/b983304c Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/b983304c Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/b983304c Branch: refs/heads/master Commit: b983304c078ce5632785b5840e8bf96787aca1d4 Parents: 4f73272 Author: Jeff Zhang <zjf...@apache.org> Authored: Mon Nov 12 11:32:37 2018 +0800 Committer: Jeff Zhang <zjf...@apache.org> Committed: Tue Nov 13 16:15:45 2018 +0800 ---------------------------------------------------------------------- pom.xml | 71 ++++++++++++-------------------- zeppelin-interpreter-parent/pom.xml | 47 +++++++++++---------- zeppelin-web/pom.xml | 5 +++ 3 files changed, 58 insertions(+), 65 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/b983304c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 786c337..a66900d 100644 --- a/pom.xml +++ b/pom.xml @@ -440,32 +440,6 @@ </plugin> <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>${plugin.resource.version}</version> - <executions> - <execution> - <id>copy-resources</id> - <phase>validate</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${basedir}/target/site</outputDirectory> - <resources> - <resource> - <directory>${basedir}/../_tools/site</directory> - <filtering>true</filtering> - <includes> - <include>**/*</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> <artifactId>maven-jar-plugin</artifactId> <version>${plugin.jar.version}</version> <configuration> @@ -619,23 +593,6 @@ </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clean-plugin</artifactId> - <version>${plugin.clean.version}</version> - <configuration> - <filesets> - <fileset> - <directory>interpreter</directory> - <followSymlinks>false</followSymlinks> - <excludes> - <exclude>lib/**</exclude> - </excludes> - </fileset> - </filesets> - </configuration> - </plugin> - - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>xml-maven-plugin</artifactId> <version>1.0.1</version> @@ -747,7 +704,33 @@ </execution> </executions> </plugin> - + + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>${plugin.resource.version}</version> + <executions> + <execution> + <id>copy-resources</id> + <phase>validate</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${basedir}/target/site</outputDirectory> + <resources> + <resource> + <directory>${basedir}/../_tools/site</directory> + <filtering>true</filtering> + <includes> + <include>**/*</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </pluginManagement> </build> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/b983304c/zeppelin-interpreter-parent/pom.xml ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter-parent/pom.xml b/zeppelin-interpreter-parent/pom.xml index e5a85ac..e01f8d5 100644 --- a/zeppelin-interpreter-parent/pom.xml +++ b/zeppelin-interpreter-parent/pom.xml @@ -136,31 +136,36 @@ </execution> </executions> </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clean-plugin</artifactId> + <version>${plugin.clean.version}</version> + <configuration> + <filesets> + <fileset> + <directory>${project.basedir}/../interpreter/${interpreter.name}</directory> + <followSymlinks>false</followSymlinks> + </fileset> + </filesets> + </configuration> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> </pluginManagement> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clean-plugin</artifactId> - <version>${plugin.clean.version}</version> - <configuration> - <filesets> - <fileset> - <directory>${project.basedir}/../interpreter/${interpreter.name}</directory> - <followSymlinks>false</followSymlinks> - </fileset> - </filesets> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> + + + </plugins> </build> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/b983304c/zeppelin-web/pom.xml ---------------------------------------------------------------------- diff --git a/zeppelin-web/pom.xml b/zeppelin-web/pom.xml index 2a6c432..498803b 100644 --- a/zeppelin-web/pom.xml +++ b/zeppelin-web/pom.xml @@ -208,6 +208,11 @@ </filesets> </configuration> </plugin> + + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>${plugin.resource.version}</version> + </plugin> </plugins> </build>
