[maven] 06/07: [MNG-6771] Plexus Classworlds is in boot/ instead of lib/

[hb...@apache.org]

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

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

commit 99242179d63224eda7bde4fa07576ad0aba1ac6a
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sat Nov 16 22:50:35 2019 +0100

    [MNG-6771] Plexus Classworlds is in boot/ instead of lib/
---
 apache-maven/src/main/appended-resources/META-INF/LICENSE.vm | 10 ++++++++--
 apache-maven/src/main/assembly/component.xml                 |  7 +++++++
 2 files changed, 15 insertions(+), 2 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 9bcb20d..e1df162 100644
--- a/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
+++ b/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
@@ -28,6 +28,7 @@ subject to the terms and conditions of the following licenses:
 #foreach ( $project in $projects )
 #**##foreach ( $license in $project.licenses)
 #*  *##set ( $groupId = $project.artifact.groupId )
+#*  *##set ( $directory = 'lib' )
 #*  *##if ( !$apacheMavenGroupIds.contains( $groupId ) )
 #*    *### advertise about each non-Maven dependency
 #*    *###
@@ -54,12 +55,17 @@ subject to the terms and conditions of the following licenses:
 #*      *##set ( $project.url = 'https://github.com/google/guice/' )
 #*    *##end
 #*    *###
+#*    *### Classworlds is in boot directory, not in lib
+#*    *##if ( $project.artifact.artifactId == "plexus-classworlds" )
+#*      *##set ( $directory = 'boot' )
+#*    *##end
+#*    *###
 #*    *### copy license file to lib/$artifactId.license
-#*    *##set ( $licFile = 'lib/' + $project.artifact.artifactId + '.license' )
+#*    *##set ( $licFile = $directory + '/' + $project.artifact.artifactId + '.license' )
 #*    *##set ( $downloaded = $locator.getResourceAsFile( "licenses/${spdx}.txt", "licenses/${licFile}" ) )
 #*    *### add dependency info to output
 
-- lib/${project.artifact.artifactId}-${project.artifact.version}.jar: $project.artifact.toString().replace( ':eclipse-plugin:', ':jar:' )
+- $directory/${project.artifact.artifactId}-${project.artifact.version}.jar: $project.artifact.toString().replace( ':eclipse-plugin:', ':jar:' )
     $project.name
     #if ( $project.url )Project URL: ${project.url}#end
 
diff --git a/apache-maven/src/main/assembly/component.xml b/apache-maven/src/main/assembly/component.xml
index 56b3f0b..fab2c55 100644
--- a/apache-maven/src/main/assembly/component.xml
+++ b/apache-maven/src/main/assembly/component.xml
@@ -56,6 +56,13 @@ under the License.
       </includes>
     </fileSet>
     <fileSet>
+      <directory>target/licenses/boot</directory>
+      <outputDirectory>boot</outputDirectory>
+      <includes>
+        <include>**</include>
+      </includes>
+    </fileSet>
+    <fileSet>
       <directory>target/dependency/META-INF/native</directory>
       <outputDirectory>lib/jansi-native</outputDirectory>
       <includes>