Skip to content

Commit

Permalink
[MNG-6771] Plexus Classworlds is in boot/ instead of lib/
Browse files Browse the repository at this point in the history
  • Loading branch information
hboutemy committed Nov 16, 2019
1 parent 8abb9e3 commit 9924217
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 2 deletions.
10 changes: 8 additions & 2 deletions apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
Expand Up @@ -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
#* *###
Expand All @@ -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

Expand Down
7 changes: 7 additions & 0 deletions apache-maven/src/main/assembly/component.xml
Expand Up @@ -55,6 +55,13 @@ under the License.
<include>**</include>
</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>
Expand Down

0 comments on commit 9924217

Please sign in to comment.