Repository: zeppelin Updated Branches: refs/heads/master 685eb9249 -> 7a67138a9
ZEPPELIN-3367. Unnecessary plugins folder is copied to zeppelin parent folder ### What is this PR for? Change pom file to avoid the Unnecessary plugins folder copying to zeppelin parent folder which sometimes will cause build failure if user don't have permission to write the zeppelin parent folder. ### What type of PR is it? [Bug Fix] ### Todos * [ ] - Task ### What is the Jira issue? * https://issues.apache.org/jira/browse/ZEPPELIN-3367 ### 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 #2913 from zjffdu/ZEPPELIN-3367 and squashes the following commits: 8d7bb21 [Jeff Zhang] ZEPPELIN-3367. Unnecessary plugins folder is copied to zeppelin parent folder Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/7a67138a Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/7a67138a Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/7a67138a Branch: refs/heads/master Commit: 7a67138a9e80fb6b38bd7434034f021ac61a7d2d Parents: 685eb92 Author: Jeff Zhang <zjf...@apache.org> Authored: Fri Mar 30 09:21:41 2018 +0800 Committer: Jeff Zhang <zjf...@apache.org> Committed: Sun Apr 8 16:15:24 2018 +0800 ---------------------------------------------------------------------- zeppelin-plugins/notebookrepo/azure/pom.xml | 8 ++ .../notebookrepo/filesystem/pom.xml | 8 ++ zeppelin-plugins/notebookrepo/gcs/pom.xml | 10 +++ zeppelin-plugins/notebookrepo/git/pom.xml | 8 ++ zeppelin-plugins/notebookrepo/github/pom.xml | 9 ++ zeppelin-plugins/notebookrepo/mongodb/pom.xml | 8 ++ zeppelin-plugins/notebookrepo/s3/pom.xml | 8 ++ zeppelin-plugins/notebookrepo/vfs/pom.xml | 8 ++ .../notebookrepo/zeppelin-hub/pom.xml | 9 ++ zeppelin-plugins/pom.xml | 87 ++++++++++---------- 10 files changed, 120 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7a67138a/zeppelin-plugins/notebookrepo/azure/pom.xml ---------------------------------------------------------------------- diff --git a/zeppelin-plugins/notebookrepo/azure/pom.xml b/zeppelin-plugins/notebookrepo/azure/pom.xml index f663de6..2969175 100644 --- a/zeppelin-plugins/notebookrepo/azure/pom.xml +++ b/zeppelin-plugins/notebookrepo/azure/pom.xml @@ -68,4 +68,12 @@ </exclusions> </dependency> </dependencies> + + <build> + <plugins> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + </plugins> + </build> </project> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7a67138a/zeppelin-plugins/notebookrepo/filesystem/pom.xml ---------------------------------------------------------------------- diff --git a/zeppelin-plugins/notebookrepo/filesystem/pom.xml b/zeppelin-plugins/notebookrepo/filesystem/pom.xml index 422b7b6..712122d 100644 --- a/zeppelin-plugins/notebookrepo/filesystem/pom.xml +++ b/zeppelin-plugins/notebookrepo/filesystem/pom.xml @@ -41,6 +41,14 @@ <plugin.name>NotebookRepo/FileSystemNotebookRepo</plugin.name> </properties> + <build> + <plugins> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + </plugins> + </build> + <profiles> <profile> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7a67138a/zeppelin-plugins/notebookrepo/gcs/pom.xml ---------------------------------------------------------------------- diff --git a/zeppelin-plugins/notebookrepo/gcs/pom.xml b/zeppelin-plugins/notebookrepo/gcs/pom.xml index 15aa7c7..b741c97 100644 --- a/zeppelin-plugins/notebookrepo/gcs/pom.xml +++ b/zeppelin-plugins/notebookrepo/gcs/pom.xml @@ -43,6 +43,7 @@ <plugin.name>NotebookRepo/GCSNotebookRepo</plugin.name> </properties> + <dependencies> <dependency> <groupId>com.google.cloud</groupId> @@ -138,4 +139,13 @@ </exclusions> </dependency> </dependencies> + + + <build> + <plugins> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + </plugins> + </build> </project> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7a67138a/zeppelin-plugins/notebookrepo/git/pom.xml ---------------------------------------------------------------------- diff --git a/zeppelin-plugins/notebookrepo/git/pom.xml b/zeppelin-plugins/notebookrepo/git/pom.xml index 6f4ce8c..6f75502 100644 --- a/zeppelin-plugins/notebookrepo/git/pom.xml +++ b/zeppelin-plugins/notebookrepo/git/pom.xml @@ -68,4 +68,12 @@ </exclusions> </dependency> </dependencies> + + <build> + <plugins> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + </plugins> + </build> </project> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7a67138a/zeppelin-plugins/notebookrepo/github/pom.xml ---------------------------------------------------------------------- diff --git a/zeppelin-plugins/notebookrepo/github/pom.xml b/zeppelin-plugins/notebookrepo/github/pom.xml index 3673efb..5d14003 100644 --- a/zeppelin-plugins/notebookrepo/github/pom.xml +++ b/zeppelin-plugins/notebookrepo/github/pom.xml @@ -47,4 +47,13 @@ <version>${project.version}</version> </dependency> </dependencies> + + <build> + <plugins> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + </plugins> + </build> + </project> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7a67138a/zeppelin-plugins/notebookrepo/mongodb/pom.xml ---------------------------------------------------------------------- diff --git a/zeppelin-plugins/notebookrepo/mongodb/pom.xml b/zeppelin-plugins/notebookrepo/mongodb/pom.xml index 2e0f90f..9df8f02 100644 --- a/zeppelin-plugins/notebookrepo/mongodb/pom.xml +++ b/zeppelin-plugins/notebookrepo/mongodb/pom.xml @@ -52,4 +52,12 @@ <version>3.4.1</version> </dependency> </dependencies> + + <build> + <plugins> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + </plugins> + </build> </project> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7a67138a/zeppelin-plugins/notebookrepo/s3/pom.xml ---------------------------------------------------------------------- diff --git a/zeppelin-plugins/notebookrepo/s3/pom.xml b/zeppelin-plugins/notebookrepo/s3/pom.xml index ee533f2..cf20d54 100644 --- a/zeppelin-plugins/notebookrepo/s3/pom.xml +++ b/zeppelin-plugins/notebookrepo/s3/pom.xml @@ -48,4 +48,12 @@ <version>${aws.sdk.s3.version}</version> </dependency> </dependencies> + + <build> + <plugins> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + </plugins> + </build> </project> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7a67138a/zeppelin-plugins/notebookrepo/vfs/pom.xml ---------------------------------------------------------------------- diff --git a/zeppelin-plugins/notebookrepo/vfs/pom.xml b/zeppelin-plugins/notebookrepo/vfs/pom.xml index ab414f6..e23d7bb 100644 --- a/zeppelin-plugins/notebookrepo/vfs/pom.xml +++ b/zeppelin-plugins/notebookrepo/vfs/pom.xml @@ -55,4 +55,12 @@ </dependency> </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + </plugins> + </build> + </project> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7a67138a/zeppelin-plugins/notebookrepo/zeppelin-hub/pom.xml ---------------------------------------------------------------------- diff --git a/zeppelin-plugins/notebookrepo/zeppelin-hub/pom.xml b/zeppelin-plugins/notebookrepo/zeppelin-hub/pom.xml index af2c73e..cbfacec 100644 --- a/zeppelin-plugins/notebookrepo/zeppelin-hub/pom.xml +++ b/zeppelin-plugins/notebookrepo/zeppelin-hub/pom.xml @@ -78,4 +78,13 @@ </exclusions> </dependency> </dependencies> + + <build> + <plugins> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + </plugins> + </build> + </project> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7a67138a/zeppelin-plugins/pom.xml ---------------------------------------------------------------------- diff --git a/zeppelin-plugins/pom.xml b/zeppelin-plugins/pom.xml index f436411..abbb602 100644 --- a/zeppelin-plugins/pom.xml +++ b/zeppelin-plugins/pom.xml @@ -77,48 +77,49 @@ </dependencies> <build> - <plugins> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-plugin-dependencies</id> - <phase>package</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/../../../../plugins/${plugin.name}</outputDirectory> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>false</overWriteSnapshots> - <overWriteIfNewer>true</overWriteIfNewer> - <includeScope>runtime</includeScope> - </configuration> - </execution> - <execution> - <id>copy-plugin-artifact</id> - <phase>package</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/../../../../plugins/${plugin.name}</outputDirectory> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>false</overWriteSnapshots> - <overWriteIfNewer>true</overWriteIfNewer> - <artifactItems> - <artifactItem> - <groupId>${project.groupId}</groupId> - <artifactId>${project.artifactId}</artifactId> - <version>${project.version}</version> - <type>${project.packaging}</type> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - - </plugins> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-plugin-dependencies</id> + <phase>package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/../../../../plugins/${plugin.name}</outputDirectory> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>false</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + <includeScope>runtime</includeScope> + </configuration> + </execution> + <execution> + <id>copy-plugin-artifact</id> + <phase>package</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/../../../../plugins/${plugin.name}</outputDirectory> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>false</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + <artifactItems> + <artifactItem> + <groupId>${project.groupId}</groupId> + <artifactId>${project.artifactId}</artifactId> + <version>${project.version}</version> + <type>${project.packaging}</type> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> </build> </project>
