This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch fix/issue-267-use-project-files-velocity
in repository
https://gitbox.apache.org/repos/asf/maven-remote-resources-plugin.git
omit 58fc806 Render project .vm overrides with Velocity when
useProjectFiles is set (#267)
add 2ada135 Update javadoc of velocityFilterInMemoryThreshold (#276)
(#278)
add 1e03663 Verify the build against Maven 4 as well
add 69481c8 Rename the site documents ahead of converting them
add d20981b Port the site documentation from APT to Markdown
add b67be22 Restore the document metadata dropped when the pages were
ported
add ba78e6e Inherit the maven-invoker-plugin version from the parent
add 6dfa174 Migrate legacy plugin Javadoc annotations
add bdb0e5b Remove maven-compat without moving the consumer baseline
add 894aac4 Migrate the AbstractIT-based integration test classes to
JUnit 5
add d360eb5 Rename the FAQ ahead of converting it
add 330445c Convert the FAQ from FML to Markdown
add 4281045 Stop the Maven runtime pin from freezing maven-archiver
add 3f25445 Bump org.apache.maven:maven-archiver from 3.6.3 to 3.6.6
add 5e66aa9 Bump org.codehaus.plexus:plexus-resources from 1.3.1 to 1.4.0
add b70380f Fail clearly when configureLocator has no project POM #275
add bc01621 Migrate the site descriptor to the v2 model
add a561d63 Add tag-template to release-drafter.yml
add 67cf743 Drop Hamcrest from tests
add f47eafa Migrate integration tests from maven-verifier to
maven-executor
add c648fca Fork Maven for the integration tests
add 49ed0d4 Bump org.apache.maven.plugins:maven-plugins from 49 to 50
add 91af632 Use inputExcludes instead of the deprecated excludes
add 403e6a9 Bump org.apache.commons:commons-lang3 from 3.20.0 to 3.21.0
(#309)
add 770d8ab Simplify GH PR template boilerplate
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 2402a36 Render project .vm overrides with Velocity when
useProjectFiles is set (#267)
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 (58fc806)
\
N -- N -- N refs/heads/fix/issue-267-use-project-files-velocity
(2402a36)
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 | 19 +-
.github/pull_request_template.md | 24 +-
.github/release-drafter.yml | 1 +
.github/workflows/maven-verify.yml | 2 +
.github/workflows/pr-automation.yml | 6 +-
.../workflows/{maven-verify.yml => pr-check.yml} | 13 +-
.../workflows/{maven-verify.yml => pr-signal.yml} | 17 +-
pom.xml | 70 +--
.../MRRESOURCES-121-dependencies-ignored/pom.xml | 6 +
.../src/main/java/org/apache/maven/MyMojo.java | 11 +-
src/it/maven-remote-resources-test/pom.xml | 6 +
.../src/main/java/org/apache/maven/MyMojo.java | 11 +-
.../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 | 112 +++-
.../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/apt/examples/sharing-resources.apt.vm | 170 ------
src/site/apt/index.apt.vm | 83 ---
src/site/apt/supplemental-models.apt.vm | 211 --------
src/site/apt/usage.apt.vm | 253 ---------
src/site/fml/faq.fml | 82 ---
src/site/markdown/examples/sharing-resources.md.vm | 158 ++++++
src/site/markdown/faq.md | 74 +++
src/site/markdown/index.md.vm | 58 +++
src/site/markdown/supplemental-models.md.vm | 206 ++++++++
src/site/markdown/usage.md.vm | 302 +++++++++++
src/site/site.xml | 6 +-
.../resources/remote/RemoteResourcesMojoTest.java | 157 +++++-
.../plugin/resources/remote/SpdxLicensesTest.java | 253 +++++++++
.../resources/remote/SupplementMergeTest.java | 53 ++
.../plugin/resources/remote/it/AbstractIT.java | 4 +-
.../resources/remote/it/ITBadDependencyPoms.java | 11 +-
.../remote/it/ITCustomFilterDelimiter.java | 11 +-
.../resources/remote/it/ITFilterLocalOverride.java | 11 +-
.../resources/remote/it/ITGenerateFromBundle.java | 11 +-
.../ITGenerateFromBundleWithTypeAndClassifier.java | 11 +-
.../remote/it/ITGenerateFromOverride.java | 11 +-
.../remote/it/ITGetDependencyProjects.java | 11 +-
.../remote/it/ITRunOnlyAtExecutionRoot.java | 15 +-
.../resources/remote/it/ITSpdxLicenseId.java | 86 +++
.../remote/it/ITSupplementalArtifact.java | 11 +-
.../remote/it/support/BootstrapInstaller.java | 7 +-
.../resources/remote/it/support/MavenRunner.java | 124 +++++
.../resources/remote/it/support/TestUtils.java | 7 +-
55 files changed, 2802 insertions(+), 1077 deletions(-)
copy .github/workflows/{maven-verify.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
delete mode 100644 src/site/apt/examples/sharing-resources.apt.vm
delete mode 100644 src/site/apt/index.apt.vm
delete mode 100644 src/site/apt/supplemental-models.apt.vm
delete mode 100644 src/site/apt/usage.apt.vm
delete mode 100644 src/site/fml/faq.fml
create mode 100644 src/site/markdown/examples/sharing-resources.md.vm
create mode 100644 src/site/markdown/faq.md
create mode 100644 src/site/markdown/index.md.vm
create mode 100644 src/site/markdown/supplemental-models.md.vm
create mode 100644 src/site/markdown/usage.md.vm
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
create mode 100644
src/test/java/org/apache/maven/plugin/resources/remote/it/support/MavenRunner.java
