Repository: hadoop Updated Branches: refs/heads/YARN-5355 ba39d10e2 -> 065e33584 (forced update)
HADOOP-8500. Fix javadoc jars to not contain entire target directory. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7ba74bef Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7ba74bef Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7ba74bef Branch: refs/heads/YARN-5355 Commit: 7ba74befcff2f1836c2d5123d64e92a3c7a8898c Parents: 733aa99 Author: Andrew Wang <w...@apache.org> Authored: Mon Oct 31 16:37:25 2016 -0700 Committer: Andrew Wang <w...@apache.org> Committed: Mon Oct 31 16:37:25 2016 -0700 ---------------------------------------------------------------------- hadoop-dist/pom.xml | 45 +++++++++++++++++++++++++++++++++++++++++++++ hadoop-project/pom.xml | 3 --- 2 files changed, 45 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7ba74bef/hadoop-dist/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-dist/pom.xml b/hadoop-dist/pom.xml index 4a7feaa..ad30db9 100644 --- a/hadoop-dist/pom.xml +++ b/hadoop-dist/pom.xml @@ -68,6 +68,51 @@ <configuration> </configuration> </plugin> + + <!-- + The "dist" profile automatically attaches many artifacts + to the module. + + Disable these, since we are only concerned with assembling + the dist layout. + --> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>default-jar</id> + <phase>never</phase> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>hadoop-java-sources</id> + <phase>never</phase> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <id>module-javadocs</id> + <phase>never</phase> + </execution> + </executions> + </plugin> + <!-- Disable install plugin too, since we disabled all the artifacts --> + <plugin> + <artifactId>maven-install-plugin</artifactId> + <executions> + <execution> + <id>default-install</id> + <phase>never</phase> + </execution> + </executions> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/hadoop/blob/7ba74bef/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 7e3b1cc..ca567c5 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -1568,9 +1568,6 @@ <goals> <goal>jar</goal> </goals> - <configuration> - <destDir>${project.build.directory}</destDir> - </configuration> </execution> </executions> </plugin> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org