You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2020/06/27 12:28:33 UTC
[maven-shade-plugin] 01/02: [MSHADE-371] add .md support to
transformers
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MSHADE-371
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git
commit b2802a009a8513fc52830c2cc5b7ca8ba9cea19c
Author: John Millner <mi...@gmail.com>
AuthorDate: Sun Jun 7 16:52:00 2020 -0400
[MSHADE-371] add .md support to transformers
---
.../plugins/shade/resource/ApacheLicenseResourceTransformer.java | 5 ++++-
.../plugins/shade/resource/ApacheNoticeResourceTransformer.java | 6 +++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugins/shade/resource/ApacheLicenseResourceTransformer.java b/src/main/java/org/apache/maven/plugins/shade/resource/ApacheLicenseResourceTransformer.java
index 524ffdd..85a1652 100644
--- a/src/main/java/org/apache/maven/plugins/shade/resource/ApacheLicenseResourceTransformer.java
+++ b/src/main/java/org/apache/maven/plugins/shade/resource/ApacheLicenseResourceTransformer.java
@@ -35,11 +35,14 @@ public class ApacheLicenseResourceTransformer
private static final String LICENSE_PATH = "META-INF/LICENSE";
private static final String LICENSE_TXT_PATH = "META-INF/LICENSE.txt";
+
+ private static final String LICENSE_MD_PATH = "META-INF/LICENSE.md";
public boolean canTransformResource( String resource )
{
return LICENSE_PATH.equalsIgnoreCase( resource )
- || LICENSE_TXT_PATH.regionMatches( true, 0, resource, 0, LICENSE_TXT_PATH.length() );
+ || LICENSE_TXT_PATH.regionMatches( true, 0, resource, 0, LICENSE_TXT_PATH.length()
+ || LICENSE_MD_PATH.regionMatches( true, 0, resource, 0, LICENSE_MD_PATH.length());
}
public void processResource( String resource, InputStream is, List<Relocator> relocators, long time )
diff --git a/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java b/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java
index e75062b..b7bdc4c 100644
--- a/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java
+++ b/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java
@@ -80,10 +80,14 @@ public class ApacheNoticeResourceTransformer
private static final String NOTICE_PATH = "META-INF/NOTICE";
private static final String NOTICE_TXT_PATH = "META-INF/NOTICE.txt";
+
+ private static final String NOTICE_MD_PATH = "META-INF/NOTICE.md";
public boolean canTransformResource( String resource )
{
- return NOTICE_PATH.equalsIgnoreCase( resource ) || NOTICE_TXT_PATH.equalsIgnoreCase( resource );
+ return NOTICE_PATH.equalsIgnoreCase( resource )
+ || NOTICE_TXT_PATH.equalsIgnoreCase( resource )
+ || NOTICE_MD_PATH.equalsIgnoreCase( resource );
}