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 2018/09/16 13:14:18 UTC
[maven] 01/01: [MNG-6414] Add more Apache license header patterns
to skip downloading Apache license
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MNG-6414-apache-license
in repository https://gitbox.apache.org/repos/asf/maven.git
commit ce6cc5d0088a222f23e33340a88ab2d818d3cde1
Author: Sylwester Lachiewicz <sl...@gmail.com>
AuthorDate: Sun Sep 16 14:55:41 2018 +0200
[MNG-6414] Add more Apache license header patterns to skip downloading Apache license
Additional patterns for the Apache license exception list:
"Apache License, Version 2.0"
"The Apache Software License, Version 2.0"
"ASLv2"
"Apache Public License 2.0"
Fixes #167
---
apache-maven/src/main/appended-resources/META-INF/LICENSE.vm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
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 390fa42..9b2f74f 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