This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch fix/issue-266-supplement-npe
in repository
https://gitbox.apache.org/repos/asf/maven-remote-resources-plugin.git
discard f07e273 Merge remote-tracking branch 'origin/master' into
fix/issue-266-supplement-npe
discard 8c50d3f Fail with MojoExecutionException on malformed supplemental
model (#266)
discard b5e5ab9 Skip malformed supplemental model entries instead of failing
with NPE (#266)
add 46ef86e Use push for PR Automation and add PR Check
add f658573 Avoid deprecated FilteringUtils.copyFile overload (#311)
add de58dab Ignore SLF4J 2.x in Dependabot
add cb096cf Update ATR metadata
add 2e71148 Require Maven 3.9.0 and take 3.9.x updates from Dependabot
add c87a512 Expose SPDX license IDs to resource templates (#316)
add 523b95a Ignore line endings in ITSpdxLicenseId
add 4234095 Resolve more declared license names and JBoss-hosted license
URLs
add 43783cc Reject malformed SPDX expressions and accept LicenseRef IDs
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 068cc15 Map project-specific licenses to SPDX IDs with
licenseMappings (#316)
add 205a0cd Reject a licenseMapping whose spdxId is not an SPDX ID or
expression
add b035836 Document licenseMappings on the usage page
add b6b5a0d Group dependencies by SPDX license so templates list each
license once (#316)
add 6c945b9 Show SPDX license groups within each organization
add c2ab5ad Group dependencies by the license an ASF distribution would
choose
add 5798119 Name the ASF-specific and per-ID helpers asfCategory and
licenseIds
add 2b1951f Prevent remote resource path traversal (#308)
add 596e834 Skip malformed supplemental model entries instead of failing
with NPE (#266)
add 06f5894 Fail with MojoExecutionException on malformed supplemental
model (#266)
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 (f07e273)
\
N -- N -- N refs/heads/fix/issue-266-supplement-npe (06f5894)
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:
.asf.yaml | 33 ++
.github/dependabot.yml | 11 +-
.github/workflows/pr-automation.yml | 6 +-
.github/workflows/{stale.yml => pr-check.yml} | 13 +-
.../workflows/{maven-verify.yml => pr-signal.yml} | 19 +-
pom.xml | 2 +-
.../release => spdx-license-id/a-name}/pom.xml | 25 +-
.../release => spdx-license-id/b-url}/pom.xml | 24 +-
.../c-expression}/pom.xml | 25 +-
.../release => spdx-license-id/d-unknown}/pom.xml | 23 +-
.../e-dual}/pom.xml | 22 +-
.../release => spdx-license-id/f-mapped}/pom.xml | 24 +-
.../pom.xml | 13 +-
.../project}/pom.xml | 65 ++-
.../project/src/main/resources/DEPENDENCIES.vm | 44 ++
.../remote/AbstractProcessRemoteResourcesMojo.java | 97 +++-
.../plugin/resources/remote/LicenseMapping.java | 67 +++
.../plugin/resources/remote/SpdxLicenses.java | 577 +++++++++++++++++++++
.../plugin/resources/remote/license-aliases.txt | 175 +++++++
.../plugin/resources/remote/license-categories.txt | 67 +++
src/site/markdown/supplemental-models.md.vm | 25 +
src/site/markdown/usage.md.vm | 70 ++-
.../resources/remote/RemoteResourcesMojoTest.java | 123 +++++
.../plugin/resources/remote/SpdxLicensesTest.java | 253 +++++++++
.../resources/remote/SupplementMergeTest.java | 53 ++
.../resources/remote/it/ITSpdxLicenseId.java | 86 +++
26 files changed, 1807 insertions(+), 135 deletions(-)
copy .github/workflows/{stale.yml => pr-check.yml} (82%)
copy .github/workflows/{maven-verify.yml => pr-signal.yml} (74%)
copy src/it/resources/{get-dependency-projects/release =>
spdx-license-id/a-name}/pom.xml (74%)
copy src/it/resources/{get-dependency-projects/release =>
spdx-license-id/b-url}/pom.xml (74%)
copy src/it/resources/{get-dependency-projects/release =>
spdx-license-id/c-expression}/pom.xml (74%)
copy src/it/resources/{get-dependency-projects/release =>
spdx-license-id/d-unknown}/pom.xml (74%)
copy src/it/resources/{get-dependency-projects =>
spdx-license-id/e-dual}/pom.xml (73%)
copy src/it/resources/{get-dependency-projects/release =>
spdx-license-id/f-mapped}/pom.xml (74%)
copy src/it/resources/{get-dependency-projects => spdx-license-id}/pom.xml
(83%)
copy src/it/resources/{bad-dependency-poms => spdx-license-id/project}/pom.xml
(57%)
create mode 100644
src/it/resources/spdx-license-id/project/src/main/resources/DEPENDENCIES.vm
create mode 100644
src/main/java/org/apache/maven/plugin/resources/remote/LicenseMapping.java
create mode 100644
src/main/java/org/apache/maven/plugin/resources/remote/SpdxLicenses.java
create mode 100644
src/main/resources/org/apache/maven/plugin/resources/remote/license-aliases.txt
create mode 100644
src/main/resources/org/apache/maven/plugin/resources/remote/license-categories.txt
create mode 100644
src/test/java/org/apache/maven/plugin/resources/remote/SpdxLicensesTest.java
create mode 100644
src/test/java/org/apache/maven/plugin/resources/remote/SupplementMergeTest.java
create mode 100644
src/test/java/org/apache/maven/plugin/resources/remote/it/ITSpdxLicenseId.java
