[GitHub] michael-o commented on a change in pull request #160: Fix links to Apache/CDDL/MIT licenses

[GitBox <gi...@apache.org>]

michael-o commented on a change in pull request #160: Fix links to Apache/CDDL/MIT licenses
URL: https://github.com/apache/maven/pull/160#discussion_r186272200
 
 

 ##########
 File path: apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
 ##########
 @@ -21,19 +21,23 @@ 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 )
 ## 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' )
+#set ( $url = 'https://spdx.org/licenses/CDDL-1.0.txt' )
+#end
+## jcr-over-slf4j - redirect
 
 Review comment:
   I think it is JCL and nor JCR.

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services