[maven-resources-plugin] 19/24: Merge tag 'upstream/2.6'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Dec 9 14:43:52 UTC 2015
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 384ccab00ae02b0cd6648de1d578a54065f10efa
Merge: 42fba39 92c41c1
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Dec 9 10:57:52 2015 +0100
Merge tag 'upstream/2.6'
Upstream version 2.6
pom.xml | 248 ++++++++
src/it/MRESOURCES-104/pom.xml | 42 ++
.../src/main/resources/test.properties | 3 +
src/it/MRESOURCES-104/verify.groovy | 25 +
src/it/MRESOURCES-105/my.properties | 2 +
src/it/MRESOURCES-105/pom.xml | 55 ++
.../src/main/resources/test.properties | 5 +
src/it/MRESOURCES-106/pom.xml | 48 ++
src/it/MRESOURCES-106/src/main/resources/file.txt | 1 +
.../src/main/resources/filter.properties | 2 +
src/it/MRESOURCES-106/verify.bsh | 73 +++
src/it/MRESOURCES-110/pom.xml | 54 ++
.../src/main/resources/mresources-110.xml | 7 +
src/it/MRESOURCES-110/verify.groovy | 25 +
src/it/MRESOURCES-131/pom.xml | 51 ++
.../org/apache/maven/plugins/resources/it/App.java | 32 +
.../apache/maven/plugins/resources/it/AppTest.java | 57 ++
.../MRESOURCES-131/src/test/resources/skipped.txt | 1 +
src/it/MRESOURCES-131/verify.groovy | 22 +
src/it/MRESOURCES-166/pom.xml | 55 ++
.../MRESOURCES-166/src/main/resources/resource.txt | 4 +
src/it/MRESOURCES-166/verify.groovy | 25 +
src/it/MRESOURCES-18/invoker.properties | 1 +
src/it/MRESOURCES-18/pom.xml | 73 +++
.../src/main/resources/test.properties | 3 +
.../java/org/apache/maven/it0105/FilterTest.java | 49 ++
src/it/MRESOURCES-18/test.properties | 1 +
src/it/MRESOURCES-20/pom.xml | 45 ++
.../MRESOURCES-20/src/main/resources/resource.txt | 1 +
src/it/MRESOURCES-20/verify.bsh | 58 ++
src/it/MRESOURCES-77/pom.xml | 89 +++
.../src/main/filters/custom-filters.properties | 3 +
.../src/main/filters/filter2.properties | 2 +
.../src/main/filters/filter3.properties | 1 +
src/it/MRESOURCES-77/src/main/filters/my.filter | 6 +
.../src/main/resources/SomeResource.txt | 17 +
src/it/MRESOURCES-77/verify.bsh | 132 +++++
src/it/MRESOURCES-78/pom.xml | 54 ++
.../src/main/filtered/filtered.properties | 16 +
.../src/main/resources/unfiltered.properties | 16 +
src/it/MRESOURCES-78/verify.groovy | 27 +
src/it/binaries-filtering/pom.xml | 56 ++
.../src/main/resources/duke-beerjpg.img | Bin 0 -> 749914 bytes
.../binaries-filtering/src/main/resources/file.txt | 1 +
.../src/main/resources/happy_duke.gif | Bin 0 -> 36092 bytes
src/it/binaries-filtering/verify.bsh | 95 +++
src/it/copy-resources-it/pom.xml | 68 +++
.../configuration.properties | 2 +
src/it/copy-resources-it/verify.bsh | 65 +++
src/it/custom-delimiter/pom.xml | 72 +++
.../src/main/filters/filter2.properties | 3 +
src/it/custom-delimiter/src/main/filters/my.filter | 6 +
.../src/main/resources/SomeResource.txt | 15 +
src/it/custom-delimiter/verify.bsh | 124 ++++
src/it/escapeInterpolation/pom.xml | 77 +++
.../escapeInterpolation/src/main/filters/my.filter | 6 +
.../src/main/resources/SomeResource.txt | 15 +
.../escapeInterpolation/src/test/filters/my.filter | 4 +
.../src/test/resources/SomeResource.txt | 11 +
src/it/escapeInterpolation/verify.bsh | 197 +++++++
src/it/filter-test-resources/pom.xml | 68 +++
.../src/test/filters/my.filter | 4 +
.../src/test/resources/SomeResource.txt | 10 +
src/it/filter-test-resources/verify.bsh | 101 ++++
src/it/filter/pom.xml | 70 +++
src/it/filter/src/main/filters/filter2.properties | 2 +
src/it/filter/src/main/filters/filter3.properties | 1 +
src/it/filter/src/main/filters/my.filter | 6 +
src/it/filter/src/main/resources/SomeResource.txt | 15 +
src/it/filter/verify.bsh | 124 ++++
src/it/includeEmptyDirs/pom.xml | 80 +++
src/it/includeEmptyDirs/src/main/filters/my.filter | 6 +
.../src/main/resources/SomeResource.txt | 13 +
.../resources/empty-dir-child/child/.gitattributes | 0
.../src/main/resources/empty-dir/.gitattributes | 0
src/it/includeEmptyDirs/verify.bsh | 162 ++++++
src/it/profile-override/invoker.properties | 1 +
src/it/profile-override/pom.xml | 61 ++
src/it/profile-override/prebuild.bsh | 27 +
.../main/resources/production/config.properties | 1 +
.../src/main/resources/test/config.properties | 1 +
src/it/profile-override/verify.bsh | 60 ++
src/it/settings.xml | 65 +++
src/it/user-filters/invoker.properties | 1 +
src/it/user-filters/pom.xml | 70 +++
.../src/main/filtered/filtered.properties | 16 +
.../src/main/resources/unfiltered.properties | 16 +
src/it/user-filters/test.properties | 1 +
src/it/user-filters/verify.groovy | 26 +
.../maven/plugin/resources/CopyResourcesMojo.java | 86 +++
.../maven/plugin/resources/PropertyUtils.java | 202 +++++++
.../plugin/resources/ReflectionProperties.java | 76 +++
.../apache/maven/plugin/resources/Resource.java | 32 +
.../maven/plugin/resources/ResourcesMojo.java | 462 +++++++++++++++
.../maven/plugin/resources/TestResourcesMojo.java | 97 ++++
src/site/apt/examples/binaries-filtering.apt.vm | 61 ++
src/site/apt/examples/copy-resources.apt.vm | 67 +++
.../apt/examples/custom-resource-filters.apt.vm | 122 ++++
src/site/apt/examples/encoding.apt.vm | 57 ++
src/site/apt/examples/escape-filtering.apt.vm | 58 ++
src/site/apt/examples/filter.apt | 199 +++++++
src/site/apt/examples/include-exclude.apt | 173 ++++++
src/site/apt/examples/resource-directory.apt | 98 ++++
src/site/apt/index.apt | 103 ++++
src/site/apt/usage.apt.vm | 77 +++
src/site/fml/faq.fml | 83 +++
src/site/site.xml | 52 ++
.../resources/AbstractPropertyUtilsTest.java | 106 ++++
.../plugin/resources/AdvancePropertyUtilsTest.java | 119 ++++
.../plugin/resources/BasicPropertyUtilsTest.java | 141 +++++
.../plugin/resources/CopyResourcesMojoTest.java | 79 +++
.../resources/EnhancedPropertyUtilsTest.java | 118 ++++
.../plugin/resources/ReflectionPropertiesTest.java | 80 +++
.../maven/plugin/resources/ResourcesMojoTest.java | 645 +++++++++++++++++++++
.../maven/plugin/resources/TestResourcesTest.java | 95 +++
.../maven/plugin/resources/filters/ItFilter.java | 106 ++++
.../resources/stub/MavenProjectBasicStub.java | 111 ++++
.../resources/stub/MavenProjectBuildStub.java | 314 ++++++++++
.../resources/stub/MavenProjectResourcesStub.java | 125 ++++
.../unit/propertiesutils-test/advance.properties | 6 +
.../advance_validation.properties | 6 +
.../unit/propertiesutils-test/basic.properties | 5 +
.../basic_validation.properties | 5 +
.../unit/propertiesutils-test/enhanced.properties | 8 +
.../enhanced_validation.properties | 8 +
.../reflectionproperties-test/plugin-config.xml | 34 ++
.../validation.properties | 4 +
.../validation_escapebackslashinpath.properties | 4 +
.../resources-test/plugin-config-absolute-path.xml | 47 ++
.../resources-test/plugin-config-relative-path.xml | 47 ++
.../unit/resources-test/plugin-config.xml | 48 ++
.../unit/resources-test/validation.properties | 3 +
.../copy-resources-test/filter-files/filter.txt | 1 +
.../no-filter/config.properties | 1 +
134 files changed, 7627 insertions(+)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-resources-plugin.git
More information about the pkg-java-commits
mailing list