This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-resources-plugin.
commit 4c91148f140b85984f9e2ba20563736ef59382f3 Merge: df07cca ac25cb6 Author: Emmanuel Bourg <[email protected]> Date: Mon Jul 17 22:07:28 2017 +0200 Updated version 2.7 from 'upstream/2.7' with Debian dir f9780dba08d98607d6161d35afd49d2e9411d29e deploySite.sh | 23 ++++ pom.xml | 57 ++++------ .../src/main/resources/test.properties | 17 +++ src/it/MRESOURCES-105/my.properties | 17 +++ .../src/main/resources/test.properties | 17 +++ src/it/MRESOURCES-106/src/main/resources/file.txt | 17 +++ .../src/main/resources/filter.properties | 17 +++ .../src/main/resources/mresources-110.xml | 20 ++++ .../MRESOURCES-131/src/test/resources/skipped.txt | 17 +++ .../MRESOURCES-166/src/main/resources/resource.txt | 17 +++ src/it/MRESOURCES-18/invoker.properties | 17 +++ .../src/main/resources/test.properties | 17 +++ .../java/org/apache/maven/it0105/FilterTest.java | 20 ++++ src/it/MRESOURCES-18/test.properties | 17 +++ .../MRESOURCES-20/src/main/resources/resource.txt | 17 +++ .../src/main/filters/custom-filters.properties | 17 +++ .../src/main/filters/filter2.properties | 17 +++ .../src/main/filters/filter3.properties | 17 +++ src/it/MRESOURCES-77/src/main/filters/my.filter | 16 +++ .../src/main/resources/SomeResource.txt | 16 +++ .../src/main/filtered/filtered.properties | 17 +++ .../src/main/resources/unfiltered.properties | 17 +++ .../binaries-filtering/src/main/resources/file.txt | 17 +++ .../configuration.properties | 17 +++ .../src/main/filters/filter2.properties | 17 +++ src/it/custom-delimiter/src/main/filters/my.filter | 16 +++ .../src/main/resources/SomeResource.txt | 16 +++ .../escapeInterpolation/src/main/filters/my.filter | 16 +++ .../src/main/resources/SomeResource.txt | 16 +++ .../escapeInterpolation/src/test/filters/my.filter | 16 +++ .../src/test/resources/SomeResource.txt | 16 +++ .../src/test/filters/my.filter | 16 +++ .../src/test/resources/SomeResource.txt | 16 +++ src/it/filter/src/main/filters/filter2.properties | 17 +++ src/it/filter/src/main/filters/filter3.properties | 17 +++ src/it/filter/src/main/filters/my.filter | 16 +++ src/it/filter/src/main/resources/SomeResource.txt | 16 +++ src/it/includeEmptyDirs/src/main/filters/my.filter | 16 +++ .../src/main/resources/SomeResource.txt | 16 +++ src/it/profile-override/invoker.properties | 17 +++ .../main/resources/production/config.properties | 17 +++ .../src/main/resources/test/config.properties | 17 +++ src/it/user-filters/invoker.properties | 17 +++ .../src/main/filtered/filtered.properties | 17 +++ .../src/main/resources/unfiltered.properties | 17 +++ src/it/user-filters/test.properties | 17 +++ .../maven/plugin/resources/CopyResourcesMojo.java | 20 ++-- .../maven/plugin/resources/PropertyUtils.java | 10 +- .../maven/plugin/resources/ResourcesMojo.java | 10 +- .../maven/plugin/resources/TestResourcesMojo.java | 1 + .../apt/examples/custom-resource-filters.apt.vm | 19 ++-- src/site/apt/{index.apt => index.apt.vm} | 4 +- src/site/resources/download.cgi | 22 ++++ src/site/site.xml | 6 +- src/site/xdoc/download.xml.vm | 126 +++++++++++++++++++++ .../resources/AbstractPropertyUtilsTest.java | 13 ++- .../plugin/resources/CopyResourcesMojoTest.java | 4 +- .../maven/plugin/resources/ResourcesMojoTest.java | 14 ++- .../maven/plugin/resources/filters/ItFilter.java | 6 +- .../resources/stub/MavenProjectBuildStub.java | 34 +++--- .../unit/propertiesutils-test/advance.properties | 17 +++ .../advance_validation.properties | 17 +++ .../unit/propertiesutils-test/basic.properties | 17 +++ .../basic_validation.properties | 17 +++ .../unit/propertiesutils-test/enhanced.properties | 17 +++ .../enhanced_validation.properties | 17 +++ .../validation.properties | 17 +++ .../validation_escapebackslashinpath.properties | 17 +++ .../unit/resources-test/validation.properties | 17 +++ .../copy-resources-test/filter-files/filter.txt | 17 +++ .../no-filter/config.properties | 17 +++ 71 files changed, 1195 insertions(+), 101 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-resources-plugin.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
