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

HADOOP-14018. shaded jars of hadoop-client modules are missing hadoop's root LICENSE and NOTICE files. Contributed by Elek, Marton.

Browse Source
This commit is contained in:
Andrew Wang 2017-01-31 11:38:34 -08:00
parent 4c6bae5a22
commit 258991dc5a
3 changed files with 44 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hadoop-client-modules/hadoop-client-api/pom.xml
View File

@ -204,8 +204,16 @@
<!-- Needed until MSHADE-182 --> <!-- Needed until MSHADE-182 -->
<transformer implementation="org.apache.hadoop.maven.plugin.shade.resource.ServicesResourceTransformer"/> <transformer implementation="org.apache.hadoop.maven.plugin.shade.resource.ServicesResourceTransformer"/>
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/> <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"> <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
<addHeader>false</addHeader> <resource>NOTICE.txt</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
<resource>META-INF/LICENSE.txt</resource>
<file>${basedir}/../../LICENSE.txt</file>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
<resource>META-INF/NOTICE.txt</resource>
<file>${basedir}/../../NOTICE.txt</file>
</transformer> </transformer>
</transformers> </transformers>
</configuration> </configuration>

22
hadoop-client-modules/hadoop-client-minicluster/pom.xml
View File

@ -731,8 +731,26 @@
<!-- Needed until MSHADE-182 --> <!-- Needed until MSHADE-182 -->
<transformer implementation="org.apache.hadoop.maven.plugin.shade.resource.ServicesResourceTransformer"/> <transformer implementation="org.apache.hadoop.maven.plugin.shade.resource.ServicesResourceTransformer"/>
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/> <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"> <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
<addHeader>false</addHeader> <resources>
<resource>LICENSE</resource>
<resource>LICENSE.txt</resource>
<resource>NOTICE</resource>
<resource>NOTICE.txt</resource>
<resource>Grizzly_THIRDPARTYLICENSEREADME.txt</resource>
<resource>LICENSE.dom-documentation.txt</resource>
<resource>LICENSE.dom-software.txt</resource>
<resource>LICENSE.dom-documentation.txt</resource>
<resource>LICENSE.sax.txt</resource>
</resources>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
<resource>META-INF/LICENSE.txt</resource>
<file>${basedir}/../../LICENSE.txt</file>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
<resource>META-INF/NOTICE.txt</resource>
<file>${basedir}/../../NOTICE.txt</file>
</transformer> </transformer>
</transformers> </transformers>
</configuration> </configuration>

16
hadoop-client-modules/hadoop-client-runtime/pom.xml
View File

@ -292,8 +292,20 @@
<!-- Needed until MSHADE-182 --> <!-- Needed until MSHADE-182 -->
<transformer implementation="org.apache.hadoop.maven.plugin.shade.resource.ServicesResourceTransformer"/> <transformer implementation="org.apache.hadoop.maven.plugin.shade.resource.ServicesResourceTransformer"/>
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/> <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"> <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
<addHeader>false</addHeader> <resources>
<resource>NOTICE.txt</resource>
<resource>NOTICE</resource>
<resource>LICENSE</resource>
</resources>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
<resource>META-INF/LICENSE.txt</resource>
<file>${basedir}/../../LICENSE.txt</file>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
<resource>META-INF/NOTICE.txt</resource>
<file>${basedir}/../../NOTICE.txt</file>
</transformer> </transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer"> <transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
<resource>META-INF/jboss-beans.xml</resource> <resource>META-INF/jboss-beans.xml</resource>