You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kw...@apache.org on 2024/08/05 15:21:32 UTC
(maven-filtering) branch feature/interpolator-customizer updated (b8318ee -> 9abcf84)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a change to branch feature/interpolator-customizer
in repository https://gitbox.apache.org/repos/asf/maven-filtering.git
omit b8318ee [MSHARED-1412] Allow to customize Interpolator used by filter
add 52bc7a7 [MSHARED-1200] Switch to the Maven 4 API (#46)
add 676ecc8 Cleanup dependencies (#105)
add 27f9ede Cleanup properties
add 6e21f5f Redirect test output to files (#109)
add a2f1d43 Build with JDK 17 and 21 in Jenkins (#111)
add 44bbf4c Fix license/notice (#110)
add 548c9a2 Bump org.codehaus.plexus:plexus-interpolation from 1.26 to 1.27 (#106)
add 4bc4dd0 Upgrade to maven-plugin-testing 4.0.0-beta-1
add cd786c3 Fix javadoc
add d235629 [maven-release-plugin] prepare release maven-filtering-4.0.0-beta-1
add ba2bf5a [maven-release-plugin] prepare for next development iteration
add 19ce0e4 Fix build broken by missing releases
add 9abcf84 [MSHARED-1412] Allow to customize Interpolator used by filter
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 (b8318ee)
\
N -- N -- N refs/heads/feature/interpolator-customizer (9abcf84)
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:
.github/workflows/maven-verify.yml | 6 +
Jenkinsfile | 2 +-
LICENSE | 202 ++++++++
NOTICE | 5 +
pom.xml | 139 ++---
.../filtering/AbstractMavenFilteringRequest.java | 23 +-
.../apache/maven/shared/filtering/BaseFilter.java | 84 ++--
.../maven/shared/filtering/DefaultFilterInfo.java | 8 +-
.../shared/filtering/DefaultMavenFileFilter.java | 47 +-
.../shared/filtering/DefaultMavenReaderFilter.java | 13 +-
.../filtering/DefaultMavenResourcesFiltering.java | 208 ++++----
.../maven/shared/filtering/FilteringUtils.java | 96 +---
.../maven/shared/filtering/MavenFileFilter.java | 43 +-
.../shared/filtering/MavenFileFilterRequest.java | 26 +-
.../maven/shared/filtering/MavenReaderFilter.java | 14 +-
.../shared/filtering/MavenReaderFilterRequest.java | 8 +-
.../shared/filtering/MavenResourcesExecution.java | 43 +-
.../maven/shared/filtering/PropertyUtils.java | 18 +-
.../apache/maven/shared/filtering/Resource.java | 101 ++++
.../META-INF/maven/org.apache.maven.api.di.Inject | 6 +-
...ractInterpolatorFilterReaderLineEndingTest.java | 21 +-
.../AbstractMavenFilteringRequestTest.java | 18 +-
.../maven/shared/filtering/BoundedReaderTest.java | 12 +-
.../maven/shared/filtering/ConsoleHolder.java | 88 ----
.../filtering/DefaultMavenFileFilterTest.java | 69 ++-
.../filtering/DefaultMavenReaderFilterTest.java | 17 +-
.../DefaultMavenResourcesFilteringTest.java | 557 ++++++++++-----------
.../maven/shared/filtering/EscapeStringTest.java | 57 +--
.../maven/shared/filtering/FilteringUtilsTest.java | 72 +--
.../{StubMavenProject.java => IOUtils.java} | 56 +--
.../IncrementalResourceFilteringTest.java | 117 ++---
.../maven/shared/filtering/InvalidMarkTest.java | 47 +-
.../MuliLinesMavenResourcesFilteringTest.java | 51 +-
...iterInterpolatorFilterReaderLineEndingTest.java | 19 +-
.../maven/shared/filtering/PropertyUtilsTest.java | 163 +++---
.../apache/maven/shared/filtering/Providers.java} | 23 +-
.../maven/shared/filtering/StubMavenSession.java | 91 ----
.../apache/maven/shared/filtering/StubSession.java | 389 ++++++++++++++
.../shared/filtering/TestReflectionProperties.java | 67 +--
.../META-INF/maven/org.apache.maven.api.di.Inject} | 5 +-
.../filtering/IncrementalResourceFilteringTest.xml | 27 -
41 files changed, 1669 insertions(+), 1389 deletions(-)
create mode 100644 LICENSE
create mode 100644 NOTICE
create mode 100644 src/main/java/org/apache/maven/shared/filtering/Resource.java
copy .git-blame-ignore-revs => src/main/resources/META-INF/maven/org.apache.maven.api.di.Inject (81%)
delete mode 100644 src/test/java/org/apache/maven/shared/filtering/ConsoleHolder.java
rename src/test/java/org/apache/maven/shared/filtering/{StubMavenProject.java => IOUtils.java} (53%)
copy src/{main/java/org/apache/maven/shared/filtering/FilterWrapper.java => test/java/org/apache/maven/shared/filtering/Providers.java} (72%)
delete mode 100644 src/test/java/org/apache/maven/shared/filtering/StubMavenSession.java
create mode 100644 src/test/java/org/apache/maven/shared/filtering/StubSession.java
copy src/test/{units-files/includeEmptyDirs/dir1/foo.txt => resources/META-INF/maven/org.apache.maven.api.di.Inject} (94%)
delete mode 100644 src/test/resources/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.xml