[maven] branch MNG-6414-apache-license updated (480821a -> ce6cc5d)

[sl...@apache.org]

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.


 discard 480821a  [MNG-6414] Add more Apache license headers to the matcher
     add 8bc3c20  [MNG-6311] Implement class-level ModelCache in DefaultProjectBuilder to solve slow pom resolutions
     add 10388b3  [MNG-6478] upgraded parent to 33 for sha512 checksum on release
     new ce6cc5d  [MNG-6414] Add more Apache license header patterns to skip downloading Apache license

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (480821a)
            \
             N -- N -- N   refs/heads/MNG-6414-apache-license (ce6cc5d)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

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.


Summary of changes:
 apache-maven/pom.xml                               | 27 ++++++++++++++++++++++
 .../main/appended-resources/META-INF/LICENSE.vm    |  6 ++---
 .../maven/project/DefaultProjectBuilder.java       | 21 ++++++++++-------
 .../apache/maven/project/ReactorModelCache.java    |  8 +++----
 pom.xml                                            |  2 +-
 5 files changed, 48 insertions(+), 16 deletions(-)

[maven] 01/01: [MNG-6414] Add more Apache license header patterns to skip downloading Apache license

[sl...@apache.org]

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