HADOOP-13298. Fix the leftover L&N files in hadoop-build-tools/src/main/resources/META-INF/. (ozawa)
(cherry picked from commit ea9f43781e5a9a4a6121dd3be106ced6b811754d) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/18a7623b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/18a7623b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/18a7623b Branch: refs/heads/YARN-5355-branch-2 Commit: 18a7623bc763f27cc8fcfb193d12ef78974fc813 Parents: 66a501b Author: Tsuyoshi Ozawa <oz...@apache.org> Authored: Sat Jul 16 08:01:16 2016 +0900 Committer: Tsuyoshi Ozawa <oz...@apache.org> Committed: Sat Jul 16 08:03:28 2016 +0900 ---------------------------------------------------------------------- hadoop-build-tools/pom.xml | 42 +++++++++++++++++++++++++++++++++++++++++ pom.xml | 26 ------------------------- 2 files changed, 42 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/18a7623b/hadoop-build-tools/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-build-tools/pom.xml b/hadoop-build-tools/pom.xml index a559441..b2cee9e 100644 --- a/hadoop-build-tools/pom.xml +++ b/hadoop-build-tools/pom.xml @@ -29,6 +29,19 @@ <failIfNoTests>false</failIfNoTests> </properties> <build> + <resources> + <resource> + <directory>${project.basedir}/target/extra-resources</directory> + <targetPath>META-INF</targetPath> + <includes> + <include>LICENSE.txt</include> + <include>NOTICE.txt</include> + </includes> + </resource> + <resource> + <directory>${project.basedir}/src/main/resources</directory> + </resource> + </resources> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -37,17 +50,46 @@ <skip>true</skip> </configuration> </plugin> + <!-- copy L&N files to target/extra-resources --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <id>copy-resources</id> + <phase>validate</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.basedir}/target/extra-resources</outputDirectory> + <resources> + <resource> + <directory>../</directory> + <includes> + <include>LICENSE.txt</include> + <include>NOTICE.txt</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <!-- add entries for L&N files to remote-resources.xml in jar file --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-remote-resources-plugin</artifactId> <executions> <execution> + <phase>process-resources</phase> <goals> <goal>bundle</goal> </goals> </execution> </executions> <configuration> + <resourcesDirectory>${project.build.outputDirectory}</resourcesDirectory> <includes> <include>META-INF/LICENSE.txt</include> <include>META-INF/NOTICE.txt</include> http://git-wip-us.apache.org/repos/asf/hadoop/blob/18a7623b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 5f49a2c..683d9f3 100644 --- a/pom.xml +++ b/pom.xml @@ -304,32 +304,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs <artifactId>dependency-check-maven</artifactId> <version>${dependency-check-maven.version}</version> </plugin> - <plugin> - <!-- Copy license and notice files into hadoop-build-tools' - metadata, which will then be bundled into jars. - --> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>copy-files</id> - <phase>process-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target> - <copy todir="${project.build.directory}/../hadoop-build-tools/src/main/resources/META-INF/"> - <fileset dir="${project.build.directory}/../"> - <include name="LICENSE.txt"/> - <include name="NOTICE.txt"/> - </fileset> - </copy> - </target> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
