You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2019/11/16 21:51:57 UTC
[maven] branch MNG-6771 updated (eb33027 -> a126cdf)
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a change to branch MNG-6771
in repository https://gitbox.apache.org/repos/asf/maven.git.
from eb33027 revert output file mapping
new 242d62b [MNG-6771] simplified and documented script
new a126cdf [MNG-6771] Plexus Classworlds is in boot/ instead of lib/
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/appended-resources/META-INF/LICENSE.vm | 49 ++++++++++++----------
apache-maven/src/main/assembly/component.xml | 7 ++++
2 files changed, 34 insertions(+), 22 deletions(-)
[maven] 01/02: [MNG-6771] simplified and documented script
Posted by 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 242d62bf530fedcdcdf524bbe1dde951205a6fc4
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sat Nov 16 22:35:34 2019 +0100
[MNG-6771] simplified and documented script
---
.../main/appended-resources/META-INF/LICENSE.vm | 41 +++++++++++-----------
1 file changed, 20 insertions(+), 21 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 1374cf8..6bda526 100644
--- a/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
+++ b/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
@@ -30,43 +30,42 @@ subject to the terms and conditions of the following licenses:
#**##foreach ( $license in $project.licenses)
#* *##set ( $groupId = $project.artifact.groupId )
#* *##if ( !$apacheMavenGroupIds.contains( $groupId ) )
-#* *##set ( $artId = $project.artifact.artifactId )
-#* *##set ( $url = $license.url )
-#* *##set ( $spdx = false )
-#* *##set ( $includeLicense = true )
+#* *### advertise about each non-Maven dependency
#* *###
+#* *### infer SPDX license code
#* *##if ( $license.name == "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0" )
#* *##set ( $spdx = 'CDDL-1.0' )
-#* *##end
-#* *##if ( $MITLicenseNames.contains( $license.name ) )
+#* *##elseif ( $MITLicenseNames.contains( $license.name ) )
#* *##set ( $spdx = 'MIT' )
-#* *##end
-#* *##if ( $license.name == "Eclipse Public License, Version 1.0" )
+#* *##elseif ( $license.name == "Eclipse Public License, Version 1.0" )
#* *##set ( $spdx = 'EPL-1.0' )
-#* *##end
-#* *##if ( $license.url.contains( "www.apache.org/licenses/LICENSE-2.0" ) )
+#* *##elseif ( $license.url.contains( "www.apache.org/licenses/LICENSE-2.0" ) )
#* *##set ( $spdx = 'ASL-2.0' )
+#* *##else
+#* *### unrecognized license will require analysis to know obligations
+#* *##set ( $spdx = 'unrecognized' )
#* *##end
+#* *###
+#* *### fix project urls that are wrong in pom
#* *##if ( $project.url.startsWith( "http://www.eclipse.org/sisu/" ) )
#* *##set ( $project.url = 'https://www.eclipse.org/sisu/' )
+#* *##elseif ( $project.url.startsWith( "https://github.com/google/guava/" ) )
+#* *##set ( $project.url = 'https://github.com/google/guava/' )
+#* *##elseif ( $project.url.startsWith( "https://github.com/google/guice/" ) )
+#* *##set ( $project.url = 'https://github.com/google/guice/' )
#* *##end
-#* *##if ( $includeLicense )
-#* *##if ( $url || $spdx )
-#* *##set ( $licFile = 'lib/' + $artId + '.license' )
-#* *##if ( $spdx )
-#* *##set ( $downloaded = $locator.getResourceAsFile( "licenses/${spdx}.txt", "licenses/${licFile}" ) )
-#* *##else
-#* *##set ( $downloaded = $locator.getResourceAsFile( $url, "licenses/${licFile}" ) )
-#* *##end
-#* *##end
+#* *###
+#* *### copy license file to lib/$artifactId.license
+#* *##set ( $licFile = 'lib/' + $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:' )
$project.name
#if ( $project.url )Project URL: ${project.url}#end
- License: $license.name#if ( $spdx ) ($spdx)#end#if ( $url ) $url ($licFile)#end
+ License: $license.name#if ( $spdx ) ($spdx)#end $license.url ($licFile)
-#* *##end
#* *##end
#**##end
#end
[maven] 02/02: [MNG-6771] Plexus Classworlds is in boot/ instead of
lib/
Posted by 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 a126cdfc284cb05fe1776f860956e171e2ab8d6e
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 6bda526..f60047e 100644
--- a/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
+++ b/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
@@ -29,6 +29,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
#* *###
@@ -55,12 +56,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 47c4d4d..f2dc97d 100644
--- a/apache-maven/src/main/assembly/component.xml
+++ b/apache-maven/src/main/assembly/component.xml
@@ -58,6 +58,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>