This is an automated email from the ASF dual-hosted git repository.
dennisl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-war-plugin.git
commit 6abd29bfa95cd2c78ae206bac9595328201e4a77
Merge: 35cec22 41f4875
Author: Dennis Lundberg <denn...@apache.org>
AuthorDate: Mon Apr 25 15:32:28 2022 +0200
Merge branch 'master' into master
pom.xml | 4 +-
src/it/MWAR-450/pom.xml | 55 +++++++++++++
.../src/main/webapp/WEB-INF/classes/log4j.xml | 30 +++++++
.../src/main/webapp/WEB-INF/classes/my.properties | 18 +++++
.../src/main/webapp/WEB-INF/classes/myfile.txt | 18 +++++
src/it/MWAR-450/src/main/webapp/WEB-INF/web.xml | 26 ++++++
src/it/MWAR-450/src/main/webapp/index.jsp | 23 ++++++
src/it/MWAR-450/verify.bsh | 94 ++++++++++++++++++++++
.../apache/maven/plugins/war/AbstractWarMojo.java | 25 +++++-
.../war/packaging/AbstractWarPackagingTask.java | 32 +++++++-
.../plugins/war/packaging/WarPackagingContext.java | 8 ++
11 files changed, 327 insertions(+), 6 deletions(-)
