[
https://issues.apache.org/jira/browse/MNG-6414?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16616735#comment-16616735
]
ASF GitHub Bot commented on MNG-6414:
-------------------------------------
asfgit closed pull request #167: MNG-6414 Add more Apache license headers to
skip downloading license …
URL: https://github.com/apache/maven/pull/167
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
b/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
index 390fa42530..9b2f74f761 100644
--- a/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
+++ b/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
@@ -21,11 +21,11 @@ Apache Maven includes a number of components and libraries
with separate
copyright notices and license terms. Your use of those components are
subject to the terms and conditions of the following licenses.
-#set ( $apacheTxt = "The Apache Software License, Version 2.0" )
-
+#set ( $apacheLicTexts = [ "Apache License, Version 2.0", "The Apache Software
License, Version 2.0",
+ "ASLv2", "Apache Public License 2.0", "Apache 2.0" ] )
#foreach ( $project in $projects )
#foreach ( $license in $project.licenses)
-#if ( ! ($apacheTxt == $license.name) )
+#if ( ! ($apacheLicTexts.contains( $license.name) ) )
#set ( $artId = $project.artifact.artifactId)
#set ( $lf = $locator )
#set ( $url = $license.url )
@@ -33,7 +33,7 @@ subject to the terms and conditions of the following licenses.
#if ($url == "https://glassfish.dev.java.net/public/CDDLv1.0.html";)
#set ( $url = 'https://glassfish.java.net/public/CDDLv1.0.html' )
#end
-#if ($url)
+#if ($url)
#set ( $licFile = 'lib/' + $artId + '.license' )
#set ( $downloaded = $lf.getResourceAsFile($url, "licenses/${licFile}") )
#end
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> Add more Apache license header patterns to skip downloading Apache license
> --------------------------------------------------------------------------
>
> Key: MNG-6414
> URL: https://issues.apache.org/jira/browse/MNG-6414
> Project: Maven
> Issue Type: Improvement
> Affects Versions: 3.2.1, 3.3.9, 3.5.4
> Reporter: Sylwester Lachiewicz
> Assignee: Sylwester Lachiewicz
> Priority: Minor
> Fix For: 3.6.0
>
>
> While preparing Maven distribution, maven-remote-resources-plugin try to
> download licenses for all dependencies that are not Apache licensed (see
> resulting {{lib/*.license}} in Maven binary distribution, since Maven 3.2.1
> MNG-5494).
> License file is not downloaded only when project/license/name is strictly
> equal to "The Apache Software License, Version 2.0": this is too restrictive,
> as we see Apache license downloaded many times from https://www.apache.org/
> (causing some issues with https: MNG-6358).
> After debugging these cases, additional patterns for Apache license exist and
> need to be added to exception list in
> {{appended-resources/META-INF/LICENSE.vm}}:
> - "Apache License, Version 2.0"
> - "The Apache Software License, Version 2.0"
> - "ASLv2"
> - "Apache Public License 2.0"
>
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
