[MNG-6414] Add more Apache license header patterns to skip downloadin…

…g 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 apache#167

apache-maven/src/main/appended-resources/META-INF/LICENSE.vm

@@ -21,27 +21,27 @@ 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) ) 
-#set ( $artId = $project.artifact.artifactId)
-#set ( $lf = $locator )
-#set ( $url = $license.url )
-## glass fish URL is now invalid, use a fixed one
-#if ($url == "https://glassfish.dev.java.net/public/CDDLv1.0.html")
-#set ( $url = 'https://glassfish.java.net/public/CDDLv1.0.html' )
-#end
-#if ($url) 
-#set ( $licFile = 'lib/' + $artId + '.license' )
-#set ( $downloaded = $lf.getResourceAsFile($url, "licenses/${licFile}") )
-#end
+  #foreach ( $license in $project.licenses)
+    #if ( !($apacheLicTexts.contains( $license.name)) )
+     #set ( $artId = $project.artifact.artifactId)
+     #set ( $lf = $locator )
+     #set ( $url = $license.url )
+     ## glass fish URL is now invalid, use a fixed one
+     #if ($url == "https://glassfish.dev.java.net/public/CDDLv1.0.html")
+       #set ( $url = 'https://glassfish.java.net/public/CDDLv1.0.html' )
+     #end
+     #if ($url)
+       #set ( $licFile = 'lib/' + $artId + '.license' )
+       #set ( $downloaded = $lf.getResourceAsFile($url, "licenses/${licFile}") )
+     #end
 
 $project.name #if ($project.url)($project.url)#end $project.artifact
     License: $license.name #if ($url) $url ($licFile)#end
 
-#end
-#end
+   #end
+  #end
 #end