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 wa...@apache.org on 2017/01/31 19:38:39 UTC
hadoop git commit: HADOOP-14018. shaded jars of hadoop-client modules
are missing hadoop's root LICENSE and NOTICE files. Contributed by Elek,
Marton.
Repository: hadoop
Updated Branches:
refs/heads/trunk 4c6bae5a2 -> 258991dc5
HADOOP-14018. shaded jars of hadoop-client modules are missing hadoop's root LICENSE and NOTICE files. Contributed by Elek, Marton.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/258991dc
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/258991dc
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/258991dc
Branch: refs/heads/trunk
Commit: 258991dc5a3b13640834d1c8803f2eb840f8afea
Parents: 4c6bae5
Author: Andrew Wang <wa...@apache.org>
Authored: Tue Jan 31 11:38:34 2017 -0800
Committer: Andrew Wang <wa...@apache.org>
Committed: Tue Jan 31 11:38:34 2017 -0800
----------------------------------------------------------------------
hadoop-client-modules/hadoop-client-api/pom.xml | 12 +++++++++--
.../hadoop-client-minicluster/pom.xml | 22 ++++++++++++++++++--
.../hadoop-client-runtime/pom.xml | 16 ++++++++++++--
3 files changed, 44 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/258991dc/hadoop-client-modules/hadoop-client-api/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-client-modules/hadoop-client-api/pom.xml b/hadoop-client-modules/hadoop-client-api/pom.xml
index 4c8bcc6..76610cd 100644
--- a/hadoop-client-modules/hadoop-client-api/pom.xml
+++ b/hadoop-client-modules/hadoop-client-api/pom.xml
@@ -204,8 +204,16 @@
<!-- Needed until MSHADE-182 -->
<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.ApacheNoticeResourceTransformer">
- <addHeader>false</addHeader>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
+ <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>
</transformers>
</configuration>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/258991dc/hadoop-client-modules/hadoop-client-minicluster/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-client-modules/hadoop-client-minicluster/pom.xml b/hadoop-client-modules/hadoop-client-minicluster/pom.xml
index 83d2748..c58ac38 100644
--- a/hadoop-client-modules/hadoop-client-minicluster/pom.xml
+++ b/hadoop-client-modules/hadoop-client-minicluster/pom.xml
@@ -731,8 +731,26 @@
<!-- Needed until MSHADE-182 -->
<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.ApacheNoticeResourceTransformer">
- <addHeader>false</addHeader>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
+ <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>
</transformers>
</configuration>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/258991dc/hadoop-client-modules/hadoop-client-runtime/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-client-modules/hadoop-client-runtime/pom.xml b/hadoop-client-modules/hadoop-client-runtime/pom.xml
index cff3329..151191c 100644
--- a/hadoop-client-modules/hadoop-client-runtime/pom.xml
+++ b/hadoop-client-modules/hadoop-client-runtime/pom.xml
@@ -292,8 +292,20 @@
<!-- Needed until MSHADE-182 -->
<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.ApacheNoticeResourceTransformer">
- <addHeader>false</addHeader>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
+ <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 implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
<resource>META-INF/jboss-beans.xml</resource>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org