[maven] branch master updated: [MNG-6358] indented code for better understanding

[hb...@apache.org]

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

hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/master by this push:
     new 532eb24  [MNG-6358] indented code for better understanding
532eb24 is described below

commit 532eb24c3d2797eb628596f119cb76615a437811
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sun Sep 16 17:17:27 2018 +0200

    [MNG-6358] indented code for better understanding
---
 .../main/appended-resources/META-INF/LICENSE.vm    | 39 +++++++++++-----------
 1 file changed, 20 insertions(+), 19 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 9b2f74f..b85aaf0 100644
--- a/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
+++ b/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
@@ -17,31 +17,32 @@
 ## under the License.
 ##
 
+
 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. 
+subject to the terms and conditions of the following licenses: 
 
-#set ( $apacheLicTexts = [ "Apache License, Version 2.0", "The Apache Software License, Version 2.0",
+#set ( $apacheLicenseNames = [ "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 ( ! ($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
+#**##foreach ( $license in $project.licenses)
+#*  *##if ( !$apacheLicenseNames.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
+- $project.name#if ( $project.url ) ($project.url)#end $project.artifact
+    License: $license.name#if ( $url )  $url ($licFile)#end
 
-#end
-#end
+#*  *##end
+#**##end
 #end