slachiewicz closed pull request #160: Fix links to Apache/CDDL/MIT licenses URL: https://github.com/apache/maven/pull/160
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): 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 390fa42530..065c613ac4 100644 --- a/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm +++ b/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 +## jcl-over-slf4j - redirect +#if ($url == "http://www.opensource.org/licenses/mit-license.php";) +#set ( $url = 'https://spdx.org/licenses/MIT.txt' ) #end -#if ($url) +#if ($url) #set ( $licFile = 'lib/' + $artId + '.license' ) #set ( $downloaded = $lf.getResourceAsFile($url, "licenses/${licFile}") ) #end ---------------------------------------------------------------- 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: [email protected] With regards, Apache Git Services
