big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HADOOP-13298. Fix the leftover L&N files in hadoop-build-tools/src/main/resources/META-INF/. (ozawa)

Browse Source
This commit is contained in:
Tsuyoshi Ozawa 2016-07-16 08:01:16 +09:00
parent f5f1c81e7d
commit ea9f43781e
2 changed files with 43 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
hadoop-build-tools/pom.xml
View File

@ -29,6 +29,19 @@
<failIfNoTests>false</failIfNoTests> <failIfNoTests>false</failIfNoTests>
</properties> </properties>
<build> <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> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -37,17 +50,46 @@
<skip>true</skip> <skip>true</skip>
</configuration> </configuration>
</plugin> </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> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId> <artifactId>maven-remote-resources-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<phase>process-resources</phase>
<goals> <goals>
<goal>bundle</goal> <goal>bundle</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
<resourcesDirectory>${project.build.outputDirectory}</resourcesDirectory>
<includes> <includes>
<include>META-INF/LICENSE.txt</include> <include>META-INF/LICENSE.txt</include>
<include>META-INF/NOTICE.txt</include> <include>META-INF/NOTICE.txt</include>
@ -69,4 +111,4 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

26
pom.xml
View File

@ -413,32 +413,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<artifactId>dependency-check-maven</artifactId> <artifactId>dependency-check-maven</artifactId>
<version>${dependency-check-maven.version}</version> <version>${dependency-check-maven.version}</version>
</plugin> </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> </plugins>
</build> </build>