You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2020/01/28 11:47:30 UTC
[maven] branch improve-license-handling updated (40e8d3e -> 45076f3)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch improve-license-handling
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard 40e8d3e Improve license handling
add cdb2cd0 [MNG-6071] Normalize relative paths for working directory
add 720e46d Revert "[MNG-5587] When the build fails emit any errors without the user having to specify -e or -X"
new 45076f3 Improve license handling
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (40e8d3e)
\
N -- N -- N refs/heads/improve-license-handling (45076f3)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 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:
maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java | 1 +
maven-embedder/src/main/java/org/apache/maven/cli/ResolveFile.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
[maven] 01/01: Improve license handling
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch improve-license-handling
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 45076f33a0f38e34c72f2493ae5be484f56466f1
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Wed Jan 22 09:25:24 2020 +0100
Improve license handling
* Stream line the output of the license listing
* Exclude jsoup from final distribution since we only need its license information
* Use proper SPDX ID for our license
This closes #317
---
apache-maven/pom.xml | 6 +++---
.../src/main/appended-resources/META-INF/LICENSE.vm | 19 +++++++++++--------
.../licenses/{ASL-2.0.txt => Apache-2.0.txt} | 0
apache-maven/src/main/assembly/component.xml | 1 +
4 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index d122ecb..53781a2 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -79,10 +79,10 @@ under the License.
</exclusion>
</exclusions>
</dependency>
+ <!-- This is included in Wagon HTTP.
+ We are just making the dependency explicit
+ in order to ease license attribution -->
<dependency>
- <!-- this is included in Wagon Http
- we are just making the dependency explicit
- in order to ease license attribution -->
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<scope>runtime</scope>
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 25ac46f..43357d1 100644
--- a/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
+++ b/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
@@ -18,21 +18,21 @@
##
-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:
+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 ( $apacheMavenGroupIds = [ "org.apache.maven", "org.apache.maven.wagon", "org.apache.maven.resolver",
"org.apache.maven.shared" ] )
#set ( $MITLicenseNames = [ "MIT License", "MIT license", "The MIT License" ] )
#foreach ( $project in $projects )
-#**##foreach ( $license in $project.licenses)
+#**##foreach ( $license in $project.licenses )
#* *##set ( $groupId = $project.artifact.groupId )
#* *##set ( $directory = 'lib' )
#* *##if ( !$apacheMavenGroupIds.contains( $groupId ) )
#* *### advertise about each non-Maven dependency
#* *###
-#* *### infer SPDX license code
+#* *### infer SPDX license id
#* *##if ( $license.name == "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0" )
#* *##set ( $spdx = 'CDDL-1.0' )
#* *##elseif ( $MITLicenseNames.contains( $license.name ) )
@@ -40,7 +40,7 @@ subject to the terms and conditions of the following licenses:
#* *##elseif ( $license.name == "Eclipse Public License, Version 1.0" )
#* *##set ( $spdx = 'EPL-1.0' )
#* *##elseif ( $license.url.contains( "www.apache.org/licenses/LICENSE-2.0" ) )
-#* *##set ( $spdx = 'ASL-2.0' )
+#* *##set ( $spdx = 'Apache-2.0' )
#* *##else
#* *### unrecognized license will require analysis to know obligations
#* *##set ( $spdx = 'unrecognized' )
@@ -68,13 +68,16 @@ subject to the terms and conditions of the following licenses:
#* *##else
#* *##set ( $downloaded = $locator.getResourceAsFile( "licenses/${spdx}.txt", "licenses/${licFile}" ) )
#* *##end
+
#* *### add dependency info to output
- $directory/${project.artifact.artifactId}-${project.artifact.version}.jar: $project.artifact.toString().replace( ':eclipse-plugin:', ':jar:' )
- $project.name
+ Project: $project.name
#if ( $project.url )Project URL: ${project.url}#end
- License: $license.name#if ( $spdx ) ($spdx)#end $license.url ($licFile)
+ License: $license.name#if ( $spdx ) ($spdx)#end
+
+ License URL: $license.url ($licFile)
#* *##end
#**##end
diff --git a/apache-maven/src/main/appended-resources/licenses/ASL-2.0.txt b/apache-maven/src/main/appended-resources/licenses/Apache-2.0.txt
similarity index 100%
rename from apache-maven/src/main/appended-resources/licenses/ASL-2.0.txt
rename to apache-maven/src/main/appended-resources/licenses/Apache-2.0.txt
diff --git a/apache-maven/src/main/assembly/component.xml b/apache-maven/src/main/assembly/component.xml
index fab2c55..14a297e 100644
--- a/apache-maven/src/main/assembly/component.xml
+++ b/apache-maven/src/main/assembly/component.xml
@@ -31,6 +31,7 @@ under the License.
<outputDirectory>lib</outputDirectory>
<excludes>
<exclude>org.codehaus.plexus:plexus-classworlds</exclude>
+ <exclude>org.jsoup:jsoup</exclude>
</excludes>
</dependencySet>
</dependencySets>