You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by su...@apache.org on 2016/07/19 21:41:42 UTC
[42/50] hadoop git commit: HADOOP-13298. Fix the leftover L&N files
in hadoop-build-tools/src/main/resources/META-INF/. (ozawa)
HADOOP-13298. Fix the leftover L&N files in hadoop-build-tools/src/main/resources/META-INF/. (ozawa)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/84501bf2
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/84501bf2
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/84501bf2
Branch: refs/heads/YARN-2915
Commit: 84501bf29c4107522e0ec78d37f8883df1b88d99
Parents: 46e3985
Author: Tsuyoshi Ozawa <oz...@apache.org>
Authored: Sat Jul 16 08:01:16 2016 +0900
Committer: Subru Krishnan <su...@apache.org>
Committed: Tue Jul 19 14:39:32 2016 -0700
----------------------------------------------------------------------
hadoop-build-tools/pom.xml | 44 ++++++++++++++++++++++++++++++++++++++++-
pom.xml | 26 ------------------------
2 files changed, 43 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/84501bf2/hadoop-build-tools/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-build-tools/pom.xml b/hadoop-build-tools/pom.xml
index e84c94f..b80cf57 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>
@@ -69,4 +111,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/84501bf2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6e66f8b..ac3bec6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -413,32 +413,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-resource-bundle's
- 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-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org