This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch agent/spdx-license-mappings
in repository
https://gitbox.apache.org/repos/asf/maven-remote-resources-plugin.git
discard 731de00 Document licenseMappings on the usage page
discard 988bbce Reject a licenseMapping whose spdxId is not an SPDX ID or
expression
discard 775ff6a Map project-specific licenses to SPDX IDs with
licenseMappings (#316)
add a2a25e5 Fix the Velocity link on the usage page
add 3ab7e00 Keep a dependency's URLs when a supplemental model is merged
(#326)
add e864cd6 Document how a supplemental model is merged (#323)
add d886fa2 Map project-specific licenses to SPDX IDs with
licenseMappings (#316)
add 0c289f5 Reject a licenseMapping whose spdxId is not an SPDX ID or
expression
add 3069cbd Document licenseMappings on the usage page
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 (731de00)
\
N -- N -- N refs/heads/agent/spdx-license-mappings (3069cbd)
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.
No new revisions were added by this update.
Summary of changes:
.../remote/AbstractProcessRemoteResourcesMojo.java | 3 +-
src/site/markdown/supplemental-models.md.vm | 25 ++++++++++
src/site/markdown/usage.md.vm | 2 +-
.../resources/remote/SupplementMergeTest.java | 53 ++++++++++++++++++++++
4 files changed, 81 insertions(+), 2 deletions(-)
create mode 100644
src/test/java/org/apache/maven/plugin/resources/remote/SupplementMergeTest.java
