This is an automated email from the ASF dual-hosted git repository.
dennisl pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-war-plugin.git
from 35cec22 Merge pull request #20 from apache/update-plugin
add f3aead9 [MWAR-450] ISO-8859-1 properties files get changed into UTF-8
when filtered.
add f0ccbbf Fix suggestions from code review by @michael-o.
add 136f2df Update maven-shared-utils to version 3.3.4.
add 41f4875 Merge remote-tracking branch 'origin/update-plugin'
new 6abd29b Merge branch 'master' into master
The 1 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:
pom.xml | 4 +-
.../{MWAR-352_custom-webXml => MWAR-450}/pom.xml | 15 ++++--
.../src/main/webapp/WEB-INF/classes/log4j.xml} | 16 ++++--
.../src/main/webapp}/WEB-INF/classes/my.properties | 0
.../src/main/webapp/WEB-INF/classes/myfile.txt} | 2 +-
.../src/main/webapp/WEB-INF/web.xml | 0
.../web => MWAR-450}/src/main/webapp/index.jsp | 0
.../verify.bsh | 62 +++++++++-------------
.../apache/maven/plugins/war/AbstractWarMojo.java | 25 +++++++--
.../war/packaging/AbstractWarPackagingTask.java | 32 ++++++++++-
.../plugins/war/packaging/WarPackagingContext.java | 8 +++
11 files changed, 111 insertions(+), 53 deletions(-)
copy src/it/{MWAR-352_custom-webXml => MWAR-450}/pom.xml (72%)
copy src/it/{MWAR-311/src/main/webapp/WEB-INF/web.xml =>
MWAR-450/src/main/webapp/WEB-INF/classes/log4j.xml} (59%)
copy src/it/{web-resources-filtering-delimiter/web/src/main/webresources =>
MWAR-450/src/main/webapp}/WEB-INF/classes/my.properties (100%)
copy src/it/{MWAR-167/invoker.properties =>
MWAR-450/src/main/webapp/WEB-INF/classes/myfile.txt} (94%)
copy src/it/{web-resources-filtering-delimiter/web =>
MWAR-450}/src/main/webapp/WEB-INF/web.xml (100%)
copy src/it/{web-resources-filtering-delimiter/web =>
MWAR-450}/src/main/webapp/index.jsp (100%)
mode change 100755 => 100644
copy src/it/{web-resources-filtering-delimiter => MWAR-450}/verify.bsh (69%)
