This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-resources-plugin.git


    from a312a30  Document that $ shadows ${*} in the delimiters parameter
     new f684756  Move 20 filtering and copy ITs to unit tests
     new 2d755ec  Assert the skip log line in testSkipCopiesNothing

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/it/MRESOURCES-104/pom.xml                      |  42 ---
 src/it/MRESOURCES-104/verify.groovy                |  25 --
 src/it/MRESOURCES-110/pom.xml                      |  54 ---
 src/it/MRESOURCES-110/verify.groovy                |  25 --
 src/it/MRESOURCES-131/pom.xml                      |  42 ---
 .../org/apache/maven/plugins/resources/it/App.java |  32 --
 src/it/MRESOURCES-131/verify.groovy                |  22 --
 src/it/MRESOURCES-166/pom.xml                      |  55 ---
 src/it/MRESOURCES-166/verify.groovy                |  25 --
 src/it/MRESOURCES-171/pom.xml                      |  50 ---
 src/it/MRESOURCES-171/verify.groovy                |  25 --
 src/it/MRESOURCES-20/pom.xml                       |  45 ---
 src/it/MRESOURCES-20/verify.groovy                 |  58 ---
 src/it/MRESOURCES-257/pom.xml                      |  75 ----
 src/it/MRESOURCES-257/verify.groovy                |  24 --
 src/it/MRESOURCES-77/pom.xml                       |  89 -----
 src/it/MRESOURCES-77/verify.groovy                 | 132 -------
 src/it/MRESOURCES-78/pom.xml                       |  54 ---
 src/it/MRESOURCES-78/verify.groovy                 |  27 --
 src/it/binaries-filtering/pom.xml                  |  56 ---
 src/it/binaries-filtering/verify.groovy            |  95 -----
 src/it/copy-resources-it/pom.xml                   |  68 ----
 src/it/copy-resources-it/verify.groovy             |  65 ----
 src/it/custom-delimiter/pom.xml                    |  72 ----
 .../src/main/filters/filter2.properties            |  20 -
 src/it/custom-delimiter/src/main/filters/my.filter |  22 --
 src/it/custom-delimiter/verify.groovy              | 124 -------
 src/it/escapeInterpolation/pom.xml                 |  77 ----
 .../escapeInterpolation/src/main/filters/my.filter |  22 --
 src/it/escapeInterpolation/verify.groovy           | 197 ----------
 src/it/filter-filenames/pom.xml                    |  48 ---
 src/it/filter-filenames/verify.groovy              |  36 --
 src/it/filter-test-resources/pom.xml               |  68 ----
 .../src/test/filters/my.filter                     |  20 -
 src/it/filter-test-resources/verify.groovy         | 101 ------
 src/it/filter/pom.xml                              |  70 ----
 src/it/filter/src/main/filters/filter2.properties  |  19 -
 src/it/filter/src/main/filters/filter3.properties  |  18 -
 src/it/filter/src/main/filters/my.filter           |  22 --
 src/it/filter/verify.groovy                        | 124 -------
 src/it/gh-444/pom.xml                              |  59 ---
 src/it/gh-444/verify.groovy                        |  28 --
 src/it/include-git-ignore/pom.xml                  |  57 ---
 src/it/include-git-ignore/setup.groovy             |  93 -----
 src/it/include-git-ignore/verify.groovy            |  73 ----
 src/it/includeEmptyDirs/README.md                  |   3 -
 src/it/includeEmptyDirs/pom.xml                    |  80 ----
 src/it/includeEmptyDirs/src/main/filters/my.filter |  22 --
 .../resources/empty-dir-child/child/._placeholder  |   0
 .../src/main/resources/empty-dir/._placeholder     |   0
 src/it/includeEmptyDirs/verify.groovy              | 162 ---------
 src/it/skip-yes/pom.xml                            |  48 ---
 src/it/skip-yes/verify.groovy                      |  22 --
 .../plugins/resources/CopyResourcesMojoTest.java   |  59 +++
 .../resources/ResourcesMojoFilteringTest.java      | 402 +++++++++++++++++++++
 .../maven/plugins/resources/ResourcesMojoTest.java | 106 ++++++
 .../maven/plugins/resources/TestResourcesTest.java |  61 ++++
 .../resources/unit/MRESOURCES-104}/test.properties |   0
 .../unit/MRESOURCES-110}/mresources-110.xml        |   0
 .../resources/unit/MRESOURCES-131}/skipped.txt     |   0
 .../resources/unit/MRESOURCES-166}/resource.txt    |   0
 .../resources/unit/MRESOURCES-171}/test.properties |   0
 .../resources/unit/MRESOURCES-171}/test.txt        |   0
 .../resources/unit/MRESOURCES-20}/resource.txt     |   0
 .../resources/unit/MRESOURCES-257}/test.txt        |   0
 .../MRESOURCES-78}/filtered/filtered.properties    |   0
 .../unfiltered}/unfiltered.properties              |   0
 .../unit/binaries-filtering}/duke-beerjpg.img      | Bin
 .../resources/unit/binaries-filtering}/file.txt    |   0
 .../unit/binaries-filtering}/happy_duke.gif        | Bin
 .../copy-resources-it}/configuration.properties    |   0
 .../filter-filenames}/${project.artifactId}.txt    |   0
 .../unit/filter-filenames}/${project.version}.txt  |   0
 .../filters/custom-filters.properties              |   0
 .../unit/filter-matrix}/filters/filter2.properties |   0
 .../unit/filter-matrix}/filters/filter3.properties |   0
 .../unit/filter-matrix}/filters/my.filter          |   0
 .../unit/filter-matrix/filters/test.filter}        |   0
 .../resources/MRESOURCES-77}/SomeResource.txt      |   0
 .../resources/custom-delimiter}/SomeResource.txt   |   0
 .../resources/escape-main}/SomeResource.txt        |   0
 .../resources/escape-test}/SomeResource.txt        |   0
 .../resources/filter}/SomeResource.txt             |   0
 .../resources/test-resources}/SomeResource.txt     |   0
 .../resources/unit/gh-444}/test.properties         |   0
 .../java => test/resources/unit/gh-444}/test.txt   |   0
 .../java => test/resources/unit/gh-444}/test.xml   |   0
 .../unit/include-empty-dirs}/SomeResource.txt      |   0
 .../resources/unit/skip-yes}/test-resource.txt     |   0
 89 files changed, 628 insertions(+), 2892 deletions(-)
 delete mode 100644 src/it/MRESOURCES-104/pom.xml
 delete mode 100644 src/it/MRESOURCES-104/verify.groovy
 delete mode 100644 src/it/MRESOURCES-110/pom.xml
 delete mode 100644 src/it/MRESOURCES-110/verify.groovy
 delete mode 100644 src/it/MRESOURCES-131/pom.xml
 delete mode 100644 
src/it/MRESOURCES-131/src/main/java/org/apache/maven/plugins/resources/it/App.java
 delete mode 100644 src/it/MRESOURCES-131/verify.groovy
 delete mode 100644 src/it/MRESOURCES-166/pom.xml
 delete mode 100644 src/it/MRESOURCES-166/verify.groovy
 delete mode 100644 src/it/MRESOURCES-171/pom.xml
 delete mode 100644 src/it/MRESOURCES-171/verify.groovy
 delete mode 100644 src/it/MRESOURCES-20/pom.xml
 delete mode 100644 src/it/MRESOURCES-20/verify.groovy
 delete mode 100644 src/it/MRESOURCES-257/pom.xml
 delete mode 100644 src/it/MRESOURCES-257/verify.groovy
 delete mode 100644 src/it/MRESOURCES-77/pom.xml
 delete mode 100644 src/it/MRESOURCES-77/verify.groovy
 delete mode 100644 src/it/MRESOURCES-78/pom.xml
 delete mode 100644 src/it/MRESOURCES-78/verify.groovy
 delete mode 100644 src/it/binaries-filtering/pom.xml
 delete mode 100644 src/it/binaries-filtering/verify.groovy
 delete mode 100644 src/it/copy-resources-it/pom.xml
 delete mode 100644 src/it/copy-resources-it/verify.groovy
 delete mode 100644 src/it/custom-delimiter/pom.xml
 delete mode 100644 src/it/custom-delimiter/src/main/filters/filter2.properties
 delete mode 100644 src/it/custom-delimiter/src/main/filters/my.filter
 delete mode 100644 src/it/custom-delimiter/verify.groovy
 delete mode 100644 src/it/escapeInterpolation/pom.xml
 delete mode 100644 src/it/escapeInterpolation/src/main/filters/my.filter
 delete mode 100644 src/it/escapeInterpolation/verify.groovy
 delete mode 100644 src/it/filter-filenames/pom.xml
 delete mode 100644 src/it/filter-filenames/verify.groovy
 delete mode 100644 src/it/filter-test-resources/pom.xml
 delete mode 100644 src/it/filter-test-resources/src/test/filters/my.filter
 delete mode 100644 src/it/filter-test-resources/verify.groovy
 delete mode 100644 src/it/filter/pom.xml
 delete mode 100644 src/it/filter/src/main/filters/filter2.properties
 delete mode 100644 src/it/filter/src/main/filters/filter3.properties
 delete mode 100644 src/it/filter/src/main/filters/my.filter
 delete mode 100644 src/it/filter/verify.groovy
 delete mode 100644 src/it/gh-444/pom.xml
 delete mode 100644 src/it/gh-444/verify.groovy
 delete mode 100644 src/it/include-git-ignore/pom.xml
 delete mode 100644 src/it/include-git-ignore/setup.groovy
 delete mode 100644 src/it/include-git-ignore/verify.groovy
 delete mode 100644 src/it/includeEmptyDirs/README.md
 delete mode 100644 src/it/includeEmptyDirs/pom.xml
 delete mode 100644 src/it/includeEmptyDirs/src/main/filters/my.filter
 delete mode 100644 
src/it/includeEmptyDirs/src/main/resources/empty-dir-child/child/._placeholder
 delete mode 100644 
src/it/includeEmptyDirs/src/main/resources/empty-dir/._placeholder
 delete mode 100644 src/it/includeEmptyDirs/verify.groovy
 delete mode 100644 src/it/skip-yes/pom.xml
 delete mode 100644 src/it/skip-yes/verify.groovy
 create mode 100644 
src/test/java/org/apache/maven/plugins/resources/ResourcesMojoFilteringTest.java
 rename src/{it/MRESOURCES-104/src/main/resources => 
test/resources/unit/MRESOURCES-104}/test.properties (100%)
 rename src/{it/MRESOURCES-110/src/main/resources => 
test/resources/unit/MRESOURCES-110}/mresources-110.xml (100%)
 rename src/{it/MRESOURCES-131/src/test/resources => 
test/resources/unit/MRESOURCES-131}/skipped.txt (100%)
 rename src/{it/MRESOURCES-166/src/main/resources => 
test/resources/unit/MRESOURCES-166}/resource.txt (100%)
 rename src/{it/MRESOURCES-171/src/main/resources => 
test/resources/unit/MRESOURCES-171}/test.properties (100%)
 rename src/{it/MRESOURCES-171/src/main/resources => 
test/resources/unit/MRESOURCES-171}/test.txt (100%)
 rename src/{it/MRESOURCES-20/src/main/resources => 
test/resources/unit/MRESOURCES-20}/resource.txt (100%)
 rename src/{it/MRESOURCES-257/src/main/resources => 
test/resources/unit/MRESOURCES-257}/test.txt (100%)
 rename src/{it/MRESOURCES-78/src/main => 
test/resources/unit/MRESOURCES-78}/filtered/filtered.properties (100%)
 rename src/{it/MRESOURCES-78/src/main/resources => 
test/resources/unit/MRESOURCES-78/unfiltered}/unfiltered.properties (100%)
 rename src/{it/binaries-filtering/src/main/resources => 
test/resources/unit/binaries-filtering}/duke-beerjpg.img (100%)
 rename src/{it/binaries-filtering/src/main/resources => 
test/resources/unit/binaries-filtering}/file.txt (100%)
 rename src/{it/binaries-filtering/src/main/resources => 
test/resources/unit/binaries-filtering}/happy_duke.gif (100%)
 rename src/{it/copy-resources-it/src/non-packaged-resources => 
test/resources/unit/copy-resources-it}/configuration.properties (100%)
 rename src/{it/filter-filenames/src/main/resources => 
test/resources/unit/filter-filenames}/${project.artifactId}.txt (100%)
 rename src/{it/filter-filenames/src/main/resources => 
test/resources/unit/filter-filenames}/${project.version}.txt (100%)
 rename src/{it/MRESOURCES-77/src/main => 
test/resources/unit/filter-matrix}/filters/custom-filters.properties (100%)
 rename src/{it/MRESOURCES-77/src/main => 
test/resources/unit/filter-matrix}/filters/filter2.properties (100%)
 rename src/{it/MRESOURCES-77/src/main => 
test/resources/unit/filter-matrix}/filters/filter3.properties (100%)
 rename src/{it/MRESOURCES-77/src/main => 
test/resources/unit/filter-matrix}/filters/my.filter (100%)
 rename src/{it/escapeInterpolation/src/test/filters/my.filter => 
test/resources/unit/filter-matrix/filters/test.filter} (100%)
 rename src/{it/MRESOURCES-77/src/main/resources => 
test/resources/unit/filter-matrix/resources/MRESOURCES-77}/SomeResource.txt 
(100%)
 rename src/{it/custom-delimiter/src/main/resources => 
test/resources/unit/filter-matrix/resources/custom-delimiter}/SomeResource.txt 
(100%)
 rename src/{it/escapeInterpolation/src/main/resources => 
test/resources/unit/filter-matrix/resources/escape-main}/SomeResource.txt (100%)
 rename src/{it/escapeInterpolation/src/test/resources => 
test/resources/unit/filter-matrix/resources/escape-test}/SomeResource.txt (100%)
 rename src/{it/filter/src/main/resources => 
test/resources/unit/filter-matrix/resources/filter}/SomeResource.txt (100%)
 rename src/{it/filter-test-resources/src/test/resources => 
test/resources/unit/filter-matrix/resources/test-resources}/SomeResource.txt 
(100%)
 rename src/{it/gh-444/src/main/java => 
test/resources/unit/gh-444}/test.properties (100%)
 rename src/{it/gh-444/src/main/java => test/resources/unit/gh-444}/test.txt 
(100%)
 rename src/{it/gh-444/src/main/java => test/resources/unit/gh-444}/test.xml 
(100%)
 rename src/{it/includeEmptyDirs/src/main/resources => 
test/resources/unit/include-empty-dirs}/SomeResource.txt (100%)
 rename src/{it/skip-yes/src/main/resources => 
test/resources/unit/skip-yes}/test-resource.txt (100%)

Reply via email to