You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by eo...@apache.org on 2018/12/28 14:11:51 UTC

[maven-war-plugin] branch master updated (0b48f8b -> 5869cce)

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

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


    from 0b48f8b  upgraded parent POM from 32 to 33
     add 5869cce  [MWAR-371] Overlays break first-win rule for web resource with target path ending with '/'

No new revisions were added by this update.

Summary of changes:
 src/it/{MWAR-306 => MWAR-371/custom}/pom.xml       | 44 ++++++++---
 .../custom/src/main/custom/a1.txt}                 |  2 +-
 .../custom/src/main/custom/a2.txt}                 |  2 +-
 .../war-overlay => MWAR-371/generic}/pom.xml       | 11 ++-
 .../generic/src/main/webapp/x/a1.txt}              |  2 +-
 .../generic/src/main/webapp/x/a2.txt}              |  2 +-
 .../generic/src/main/webapp/x/a3.txt}              |  2 +-
 src/it/{MWAR-306 => MWAR-371}/pom.xml              | 48 ++++++------
 src/it/MWAR-371/verify.groovy                      | 74 +++++++++++++++++++
 .../org/apache/maven/plugins/war/util/PathSet.java | 86 +++++++---------------
 .../apache/maven/plugins/war/util/PathSetTest.java | 70 ++++++++----------
 11 files changed, 200 insertions(+), 143 deletions(-)
 copy src/it/{MWAR-306 => MWAR-371/custom}/pom.xml (61%)
 copy src/it/{MWAR-62/src/main/webapp/test.properties => MWAR-371/custom/src/main/custom/a1.txt} (98%)
 copy src/it/{MWAR-62/src/main/webapp/test.properties => MWAR-371/custom/src/main/custom/a2.txt} (98%)
 copy src/it/{overlay-excludes/war-overlay => MWAR-371/generic}/pom.xml (78%)
 copy src/it/{MWAR-62/src/main/webapp/test.properties => MWAR-371/generic/src/main/webapp/x/a1.txt} (98%)
 copy src/it/{MWAR-62/src/main/webapp/test.properties => MWAR-371/generic/src/main/webapp/x/a2.txt} (98%)
 copy src/it/{MWAR-62/src/main/webapp/test.properties => MWAR-371/generic/src/main/webapp/x/a3.txt} (98%)
 copy src/it/{MWAR-306 => MWAR-371}/pom.xml (60%)
 create mode 100644 src/it/MWAR-371/verify.groovy