[maven] branch MNG-6414-apache-license created (now 480821a)

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[maven] branch MNG-6414-apache-license created (now 480821a)

slachiewicz
This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a change to branch MNG-6414-apache-license
in repository https://gitbox.apache.org/repos/asf/maven.git.


      at 480821a  [MNG-6414] Add more Apache license headers to the matcher

This branch includes the following new commits:

     new 480821a  [MNG-6414] Add more Apache license headers to the matcher

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Reply | Threaded
Open this post in threaded view
|

[maven] 01/01: [MNG-6414] Add more Apache license headers to the matcher

slachiewicz
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 480821a1d7eb3a86fcab7d5246e006a0e850467a
Author: Sylwester Lachiewicz <[hidden email]>
AuthorDate: Tue May 22 07:51:01 2018 +0200

    [MNG-6414] Add more Apache license headers to the matcher
   
    Skip downloading license files if license description in pom matches text:
    - Apache License, Version 2.0
    - The Apache Software License, Version 2.0
    - ASLv2
    - Apache Public License 2.0
---
 apache-maven/src/main/appended-resources/META-INF/LICENSE.vm | 6 +++---
 1 file changed, 3 insertions(+), 3 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..168f70a 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" ] )
 #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 )