You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2022/04/29 13:18:44 UTC

[maven-war-plugin] branch MWAR-453 updated (a73af6f -> bbe269e)

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

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


    from a73af6f  [MWAR-453] Require Java 8
     add bf5a235  Update plugin
     add 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'
     add 6abd29b  Merge branch 'master' into master
     add f8fd1a2  [MWAR-454] Upgrade Parent to 36
     add e10a0e6  [MWAR-452] One page about Skinny WARs
     add bbe269e  Merge branch 'master' into MWAR-453

No new revisions were added by this update.

Summary of changes:
 pom.xml                                            | 107 ++++++--------------
 src/it/MWAR-128/{prebuild.groovy => setup.groovy}  |   0
 .../{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 ++
 src/site/apt/examples/skinny-wars.apt.vm           | 112 ---------------------
 src/site/apt/index.apt.vm                          |   2 +-
 src/site/site.xml                                  |   2 +-
 15 files changed, 144 insertions(+), 239 deletions(-)
 rename src/it/MWAR-128/{prebuild.groovy => setup.groovy} (100%)
 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%)
 delete mode 100644 src/site/apt/examples/skinny-wars.apt.vm