This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch experiment/maven4-build-context
in repository https://gitbox.apache.org/repos/asf/maven-resources-plugin.git
omit d83e11d Experiment: remove dead plexus-build-api remnants
omit d6eac05 Experiment: fix test DI for BuildContext and
PathMatcherFactory
omit c0d445c Experiment: simplify mojo, delegate incremental processing to
maven-filtering
omit ccabc79 Experiment: add Maven 4 BuildContext API for incremental
resource processing
add 14d1a04 Bump
apache/maven-gh-actions-shared/.github/workflows/pr-automation.yml
add 3cf3fa2 Bump
apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml
add 72393b2 Bump
apache/maven-gh-actions-shared/.github/workflows/stale.yml
add 6b28b0b Bump
apache/maven-gh-actions-shared/.github/workflows/release-drafter.yml
add 122b1df Bump org.eclipse.sisu:org.eclipse.sisu.plexus from 1.0.1 to
1.1.0
add fa2d03d Pass siteMvn as a String so the site stage runs on Maven 4
add bf1acfe Build against Maven 4.0.0-rc-6, and honour <skip> on
testResources (#500)
add a2d0e6c Use maven4-build instead of hand-rolling the matrix
add 7cbc6d5 Rename the site documents ahead of converting them
add 1d6905b Port the site documentation from APT to Markdown
add 32a7d09 Restore the document metadata dropped when the pages were
ported
add 4db88d0 Drop backslash escapes that Markdown does not need
add 2fe740d Rename the FAQ ahead of converting it
add 0a913e5 Convert the FAQ from FML to Markdown
add ef21f99 Modernise the download page
add 746ffd0 Bump com.google.guava:guava from 33.6.0-jre to 33.7.0-jre
(#512)
add 81afd98 Bump com.google.guava:guava from 33.7.0-jre to 33.7.1-jre
add dcdcee9 configure ATR project
add 6bf5673 Rename the BeanShell IT scripts ahead of porting them
add 6344104 Port the IT scripts from BeanShell to Groovy
add f254c96 Bump org.apache.maven.plugins:maven-plugins from 49 to 50
(#517)
add 99a6603 chore: trigger Dependabot rescan for Maven 4.0.0-rc-7
add ddb1302 Disable Jenkins build until Maven 4.0.0-rc-7 is installed on
agents (#526)
add c40b01b Update GHA workflow to use Maven 4.0.0-rc-7 for ITs
add b42c96d Bump mavenVersion from 4.0.0-rc-6 to 4.0.0-rc-7 (#523)
add 857a8f6 Remove redundant project.build.sourceEncoding from IT POMs
(#522)
add 6a712de maintenance: trim runtime dependencies and switch to
maven-testing
add 1c9466a docs: document that outputDirectory must be scoped to an
execution
add 3759483 fix(MRESOURCES-301): skip binary file extensions during
filtering by default
add 37b68d2 feat(MRESOURCES-453): leverage ChangeDetection from
maven-filtering
add 3de1ef0 feat(MRESOURCES-311): skip resource filtering when no
resources are configured
add 8015375 fix: clarify error message when binary resource filtering
fails
add d72c005 [MRESOURCES-300] Document property precedence order for
filtering (#528)
add d6f8666 feat: add outputEncoding parameter to enable encoding
conversion (MRESOURCES-232)
add b1325c3 feat: add failOnMissingFilterValue parameter to fail on
unresolved filter tokens (MRESOURCES-162)
add 43cd612 feat: expose per-resource changeDetection strategy
(MRESOURCES-286)
add 71d4867 feat: expose gracefulBinaryHandling parameter
add 5de9522 feat(MRESOURCES-521): expose per-resource nonFilteredFiles
glob patterns
add 60f9900 Simplify GH PR template boilerplate
add 70898ff Bump com.google.guava:guava from 33.7.1-jre to 33.7.2-jre
(#538)
add b323985 Use released maven-filtering 4.0.0-beta-2
add 5c08057 [maven-release-plugin] prepare release
maven-resources-plugin-4.0.0-beta-2
add 2a13f22 [maven-release-plugin] prepare for next development iteration
add 5ca2189 Merge branch 'release'
add bf6d525 Use push for PR Automation and add PR Signal
add a1734ad Fix branch name in Release Drafter workflow
add 89c6218 Bump org.eclipse.sisu:org.eclipse.sisu.plexus from 1.1.0 to
1.1.1
add ba07bd9 Remove unused guiceVersion and mavenPluginTestingVersion
properties
add 67321a4 Bump org.slf4j:slf4j-simple from 2.0.13 to 2.0.20
add 257142f publish to LATEST-4.x
add 27b5520 Point ciManagement at GitHub Actions
add 55c82ff Remove default-branch-only configuration from the 4.x line
add 545767e Give code blocks a real language instead of unknown
add 225933e Run the tests on JUnit 6
add 82474ad Experiment: add Maven 4 BuildContext API for incremental
resource processing
add 98c12ec Experiment: simplify mojo, delegate incremental processing to
maven-filtering
add 74a4170 Experiment: fix test DI for BuildContext and
PathMatcherFactory
add 643a5a3 Experiment: remove dead plexus-build-api remnants
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 (d83e11d)
\
N -- N -- N refs/heads/experiment/maven4-build-context (643a5a3)
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 | 42 ----
.github/ISSUE_TEMPLATE/BUG.yml | 48 ----
.github/ISSUE_TEMPLATE/FEATURE.yml | 35 ---
.github/ISSUE_TEMPLATE/config.yml | 27 ---
.github/dependabot.yml | 43 ----
.github/pull_request_template.md | 23 --
.github/release-drafter-3.x.yml | 21 --
.github/workflows/maven-verify.yml | 6 +-
.github/workflows/pr-automation.yml | 8 +-
.github/workflows/{stale.yml => pr-signal.yml} | 19 +-
.github/workflows/release-drafter.yml | 4 +-
.mvn/maven.config | 1 +
Jenkinsfile => Jenkinsfile.disable | 2 +-
pom.xml | 88 ++++---
.../MRESOURCES-106/{verify.bsh => verify.groovy} | 0
src/it/MRESOURCES-110/pom.xml | 1 -
src/it/MRESOURCES-162-fail/invoker.properties | 1 +
.../pom.xml | 15 +-
.../src/main/resources/resource.txt | 2 +
.../verify.groovy | 10 +-
.../{MRESOURCES-99 => MRESOURCES-162-pass}/pom.xml | 12 +-
.../src/main/resources/resource.txt | 2 +
.../verify.groovy} | 17 +-
src/it/MRESOURCES-171/pom.xml | 4 -
src/it/MRESOURCES-18/pom.xml | 2 +-
src/it/MRESOURCES-20/{verify.bsh => verify.groovy} | 4 +-
src/it/MRESOURCES-231/pom.xml | 3 -
src/it/{MRESOURCES-171 => MRESOURCES-232}/pom.xml | 10 +-
.../MRESOURCES-232/src/main/resources/message.txt | 1 +
src/it/MRESOURCES-232/verify.groovy | 38 +++
src/it/MRESOURCES-257/pom.xml | 4 -
.../it/MRESOURCES-286/invoker.properties | 8 +-
src/it/{MRESOURCES-171 => MRESOURCES-286}/pom.xml | 31 ++-
.../prebuild.bsh => MRESOURCES-286/setup.groovy} | 15 +-
.../src/main/resources-always/always.txt | 1 +
.../src/main/resources-never/never.txt | 1 +
src/it/MRESOURCES-286/verify.groovy | 45 ++++
.../{binaries-filtering => MRESOURCES-301}/pom.xml | 22 +-
.../src/main/resources/lib/binary.jar | Bin 0 -> 20 bytes
src/it/MRESOURCES-301/verify.groovy | 48 ++++
.../it/MRESOURCES-453/invoker.properties | 8 +-
.../{include-git-ignore => MRESOURCES-453}/pom.xml | 16 +-
.../prebuild.bsh => MRESOURCES-453/setup.groovy} | 15 +-
.../MRESOURCES-453/src/main/resources/resource.txt | 1 +
src/it/{gh-312 => MRESOURCES-453}/verify.groovy | 20 +-
.../{includeEmptyDirs => MRESOURCES-521}/pom.xml | 56 ++---
.../src/main/resources/certs/keystore.p12 | Bin 0 -> 193 bytes
.../src/main/resources/config.properties | 2 +
src/it/MRESOURCES-521/verify.groovy | 67 ++++++
src/it/MRESOURCES-77/{verify.bsh => verify.groovy} | 0
.../MRESOURCES-graceful-binary/invoker.properties | 1 +
src/it/MRESOURCES-graceful-binary/pom.xml | 52 +++++
.../src/main/resources/certs/keystore.p12 | Bin 0 -> 76 bytes
.../src/main/resources/config.properties | 3 +
src/it/MRESOURCES-graceful-binary/verify.groovy | 24 ++
.../{verify.bsh => verify.groovy} | 2 +-
.../{verify.bsh => verify.groovy} | 2 +-
.../custom-delimiter/{verify.bsh => verify.groovy} | 0
.../invoker.properties} | 4 +-
src/it/{MRESOURCES-104 => empty-resources}/pom.xml | 20 +-
.../verify.groovy | 8 +-
.../{verify.bsh => verify.groovy} | 10 +-
.../{verify.bsh => verify.groovy} | 0
src/it/filter/{verify.bsh => verify.groovy} | 0
src/it/gh-312/pom.xml | 1 -
src/it/include-git-ignore/pom.xml | 4 -
.../include-git-ignore/{setup.bsh => setup.groovy} | 0
.../{verify.bsh => verify.groovy} | 0
.../includeEmptyDirs/{verify.bsh => verify.groovy} | 0
.../{prebuild.bsh => prebuild.groovy} | 0
.../profile-override/{verify.bsh => verify.groovy} | 0
.../maven/plugins/resources/ResourcesMojo.java | 247 +++++++++++++++++++-
.../maven/plugins/resources/TestResourcesMojo.java | 27 ++-
src/site/apt/examples/binaries-filtering.apt.vm | 60 -----
src/site/apt/examples/copy-resources.apt.vm | 67 ------
.../apt/examples/custom-resource-filters.apt.vm | 101 --------
src/site/apt/examples/encoding.apt.vm | 80 -------
src/site/apt/examples/escape-filtering.apt.vm | 58 -----
src/site/apt/examples/filter.apt | 203 ----------------
.../apt/examples/filtering-properties-files.apt.vm | 96 --------
src/site/apt/examples/resource-directory.apt | 102 --------
src/site/apt/index.apt.vm | 105 ---------
src/site/apt/usage.apt.vm | 77 -------
src/site/fml/faq.fml | 83 -------
.../markdown/examples/binaries-filtering.md.vm} | 47 ++--
src/site/markdown/examples/copy-resources.md.vm | 68 ++++++
.../examples/custom-resource-filters.md.vm | 96 ++++++++
src/site/markdown/examples/encoding.md.vm | 69 ++++++
.../markdown/examples/escape-filtering.md.vm} | 44 ++--
src/site/markdown/examples/filter.md | 256 +++++++++++++++++++++
.../examples/filtering-properties-files.md.vm | 76 ++++++
.../examples/include-exclude.md} | 89 ++++---
src/site/markdown/examples/resource-directory.md | 98 ++++++++
src/site/markdown/faq.md | 70 ++++++
src/site/markdown/index.md | 69 ++++++
src/site/markdown/usage.md.vm | 64 ++++++
src/site/xdoc/download.xml.vm | 112 +++------
.../maven/plugins/resources/ResourcesMojoTest.java | 15 ++
.../resources/stub/MavenProjectBuildStub.java | 10 +-
.../resources/stub/MavenProjectResourcesStub.java | 2 +-
100 files changed, 1806 insertions(+), 1665 deletions(-)
delete mode 100644 .asf.yaml
delete mode 100644 .github/ISSUE_TEMPLATE/BUG.yml
delete mode 100644 .github/ISSUE_TEMPLATE/FEATURE.yml
delete mode 100644 .github/ISSUE_TEMPLATE/config.yml
delete mode 100644 .github/dependabot.yml
delete mode 100644 .github/pull_request_template.md
delete mode 100644 .github/release-drafter-3.x.yml
rename .github/workflows/{stale.yml => pr-signal.yml} (72%)
create mode 100644 .mvn/maven.config
rename Jenkinsfile => Jenkinsfile.disable (95%)
rename src/it/MRESOURCES-106/{verify.bsh => verify.groovy} (100%)
create mode 100644 src/it/MRESOURCES-162-fail/invoker.properties
copy src/it/{MRESOURCES-166 => MRESOURCES-162-fail}/pom.xml (77%)
create mode 100644 src/it/MRESOURCES-162-fail/src/main/resources/resource.txt
copy src/it/{MRESOURCES-231 => MRESOURCES-162-fail}/verify.groovy (73%)
copy src/it/{MRESOURCES-99 => MRESOURCES-162-pass}/pom.xml (78%)
create mode 100644 src/it/MRESOURCES-162-pass/src/main/resources/resource.txt
copy src/it/{profile-override/prebuild.bsh =>
MRESOURCES-162-pass/verify.groovy} (60%)
rename src/it/MRESOURCES-20/{verify.bsh => verify.groovy} (91%)
copy src/it/{MRESOURCES-171 => MRESOURCES-232}/pom.xml (83%)
create mode 100644 src/it/MRESOURCES-232/src/main/resources/message.txt
create mode 100644 src/it/MRESOURCES-232/verify.groovy
copy deploySite.sh => src/it/MRESOURCES-286/invoker.properties (85%)
mode change 100755 => 100644
copy src/it/{MRESOURCES-171 => MRESOURCES-286}/pom.xml (57%)
copy src/it/{profile-override/prebuild.bsh => MRESOURCES-286/setup.groovy}
(62%)
create mode 100644 src/it/MRESOURCES-286/src/main/resources-always/always.txt
create mode 100644 src/it/MRESOURCES-286/src/main/resources-never/never.txt
create mode 100644 src/it/MRESOURCES-286/verify.groovy
copy src/it/{binaries-filtering => MRESOURCES-301}/pom.xml (66%)
create mode 100644 src/it/MRESOURCES-301/src/main/resources/lib/binary.jar
create mode 100644 src/it/MRESOURCES-301/verify.groovy
copy deploySite.sh => src/it/MRESOURCES-453/invoker.properties (85%)
mode change 100755 => 100644
copy src/it/{include-git-ignore => MRESOURCES-453}/pom.xml (81%)
copy src/it/{profile-override/prebuild.bsh => MRESOURCES-453/setup.groovy}
(66%)
create mode 100644 src/it/MRESOURCES-453/src/main/resources/resource.txt
copy src/it/{gh-312 => MRESOURCES-453}/verify.groovy (53%)
copy src/it/{includeEmptyDirs => MRESOURCES-521}/pom.xml (55%)
create mode 100644 src/it/MRESOURCES-521/src/main/resources/certs/keystore.p12
create mode 100644 src/it/MRESOURCES-521/src/main/resources/config.properties
create mode 100644 src/it/MRESOURCES-521/verify.groovy
rename src/it/MRESOURCES-77/{verify.bsh => verify.groovy} (100%)
create mode 100644 src/it/MRESOURCES-graceful-binary/invoker.properties
create mode 100644 src/it/MRESOURCES-graceful-binary/pom.xml
create mode 100644
src/it/MRESOURCES-graceful-binary/src/main/resources/certs/keystore.p12
create mode 100644
src/it/MRESOURCES-graceful-binary/src/main/resources/config.properties
create mode 100644 src/it/MRESOURCES-graceful-binary/verify.groovy
rename src/it/binaries-filtering/{verify.bsh => verify.groovy} (97%)
rename src/it/copy-resources-it/{verify.bsh => verify.groovy} (96%)
rename src/it/custom-delimiter/{verify.bsh => verify.groovy} (100%)
copy src/it/{binaries-filtering/src/main/resources/file.txt =>
empty-resources/invoker.properties} (89%)
copy src/it/{MRESOURCES-104 => empty-resources}/pom.xml (76%)
copy src/it/{MRESOURCES-131 => empty-resources}/verify.groovy (82%)
rename src/it/escapeInterpolation/{verify.bsh => verify.groovy} (93%)
rename src/it/filter-test-resources/{verify.bsh => verify.groovy} (100%)
rename src/it/filter/{verify.bsh => verify.groovy} (100%)
rename src/it/include-git-ignore/{setup.bsh => setup.groovy} (100%)
rename src/it/include-git-ignore/{verify.bsh => verify.groovy} (100%)
rename src/it/includeEmptyDirs/{verify.bsh => verify.groovy} (100%)
rename src/it/profile-override/{prebuild.bsh => prebuild.groovy} (100%)
rename src/it/profile-override/{verify.bsh => verify.groovy} (100%)
delete mode 100644 src/site/apt/examples/binaries-filtering.apt.vm
delete mode 100644 src/site/apt/examples/copy-resources.apt.vm
delete mode 100644 src/site/apt/examples/custom-resource-filters.apt.vm
delete mode 100644 src/site/apt/examples/encoding.apt.vm
delete mode 100644 src/site/apt/examples/escape-filtering.apt.vm
delete mode 100644 src/site/apt/examples/filter.apt
delete mode 100644 src/site/apt/examples/filtering-properties-files.apt.vm
delete mode 100644 src/site/apt/examples/resource-directory.apt
delete mode 100644 src/site/apt/index.apt.vm
delete mode 100644 src/site/apt/usage.apt.vm
delete mode 100644 src/site/fml/faq.fml
copy src/{it/MRESOURCES-231/pom.xml =>
site/markdown/examples/binaries-filtering.md.vm} (53%)
create mode 100644 src/site/markdown/examples/copy-resources.md.vm
create mode 100644 src/site/markdown/examples/custom-resource-filters.md.vm
create mode 100644 src/site/markdown/examples/encoding.md.vm
copy src/{it/MRESOURCES-104/pom.xml =>
site/markdown/examples/escape-filtering.md.vm} (56%)
create mode 100644 src/site/markdown/examples/filter.md
create mode 100644 src/site/markdown/examples/filtering-properties-files.md.vm
rename src/site/{apt/examples/include-exclude.apt =>
markdown/examples/include-exclude.md} (53%)
create mode 100644 src/site/markdown/examples/resource-directory.md
create mode 100644 src/site/markdown/faq.md
create mode 100644 src/site/markdown/index.md
create mode 100644 src/site/markdown/usage.md.vm