[maven-war-plugin] 04/12: Updated version 3.1.0 from 'upstream/3.1.0'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Jul 26 14:07:36 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository maven-war-plugin.
commit 5f0fdf8c0b2767258c27484d310a420cef96f7a8
Merge: 1f467e0 8147578
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon Jul 17 00:46:00 2017 +0200
Updated version 3.1.0 from 'upstream/3.1.0'
with Debian dir def536de8ccfcffb73606bc3c1ed15aa45a3d3a7
deploySite.sh | 23 +
pom.xml | 265 +++--
.../plugin-config.xml => it/MWAR-128/pom.xml} | 22 +-
.../MWAR-128/prebuild.groovy} | 31 +-
.../MWAR-128/src/main/webapp/WEB-INF/web.xml} | 17 +-
.../MWAR-128/verify.groovy} | 30 +-
src/it/MWAR-129/goals.txt | 1 -
src/it/MWAR-129/invoker.properties | 18 +
src/it/MWAR-131/goals.txt | 1 -
src/it/MWAR-131/invoker.properties | 19 +
src/it/MWAR-131/mwar131-test/pom.xml | 24 +-
.../src/main/java/com/example/App.java | 19 +
.../src/test/java/com/example/AppTest.java | 19 +
src/it/MWAR-131/mwar131-webapp/pom.xml | 18 +
.../src/main/java/com/example/Util.java | 19 +
.../mwar131-webapp/src/main/webapp/WEB-INF/web.xml | 18 +
.../mwar131-webapp/src/main/webapp/index.jsp | 18 +
src/it/MWAR-131/mwar131-webapp2/pom.xml | 24 +-
.../src/main/webapp/WEB-INF/web.xml | 18 +
.../mwar131-webapp2/src/main/webapp/index.jsp | 18 +
src/it/MWAR-131/pom.xml | 18 +
src/it/MWAR-133/goals.txt | 1 -
src/it/MWAR-133/invoker.properties | 18 +
.../src/main/webresources/filtered.properties | 17 +
src/it/MWAR-139/src/main/webresources/filterme.xml | 18 +
src/it/MWAR-143/goals.txt | 1 -
src/it/MWAR-143/invoker.properties | 18 +
.../src/main/resources/filter.properties | 17 +
.../war-common/src/main/webapp/WEB-INF/web.xml | 18 +
.../src/main/webapp/WEB-INF/web.xml | 18 +
src/it/MWAR-167/invoker.properties | 18 +
.../plugin-config.xml => it/MWAR-167/pom.xml} | 37 +-
src/it/MWAR-167/src/main/resources/MANIFEST.MF | 5 +
src/it/MWAR-167/verify.bsh | 74 ++
src/it/MWAR-240/goals.txt | 1 -
src/it/MWAR-240/invoker.properties | 18 +
src/it/MWAR-240/pom.xml | 2 +-
src/it/MWAR-306/pom.xml | 45 +
.../MWAR-306/src/main/webapp/index.html} | 59 +-
.../MWAR-306/verify.groovy} | 31 +-
src/it/MWAR-311/pom.xml | 64 ++
src/it/MWAR-311/src/main/resources/app.properties | 19 +
.../MWAR-311/src/main/resources/default.properties | 18 +
.../MWAR-311/src/main/webapp/WEB-INF/web.xml} | 23 +-
.../MWAR-311/verify.groovy} | 33 +-
src/it/MWAR-326/invoker.properties | 19 +
src/it/{MWAR-240 => MWAR-326}/pom.xml | 35 +-
.../MWAR-326/src/main/java/A.java} | 71 +-
.../MWAR-326/verify.bsh} | 40 +-
.../web => MWAR-350}/pom.xml | 51 +-
.../main/java/org/apache/maven/it0016/Person.java} | 29 +-
.../MWAR-350/src/main/webapp/WEB-INF/web.xml} | 20 +-
.../MWAR-350/src/main/webapp/index.html} | 22 +-
.../MWAR-350/verify.bsh} | 43 +-
src/it/MWAR-396_no-servlet30/invoker.properties | 18 +
.../web => MWAR-396_no-servlet30}/pom.xml | 52 +-
.../web => MWAR-396_servlet30}/pom.xml | 52 +-
.../MWAR-396_servlet30/verify.bsh} | 43 +-
src/it/MWAR-404/pom.xml | 52 +
.../src/main/java/org/apache/mwar404/Foo.java} | 70 +-
.../src/main/webapp/WEB-INF/geronimo-web.xml | 49 +
src/it/MWAR-404/src/main/webapp/WEB-INF/web.xml | 24 +
src/it/MWAR-404/src/main/webapp/index.jsp | 23 +
src/it/MWAR-404/src/main/webapp/jsp/foo.jsp | 18 +
.../MWAR-404/verify.groovy} | 37 +-
src/it/MWAR-62/goals.txt | 1 -
src/it/MWAR-62/invoker.properties | 18 +
src/it/MWAR-62/src/main/webapp/dev.properties | 17 +
src/it/MWAR-62/src/main/webapp/test.properties | 17 +
.../main/java/org/apache/maven/it0016/Person.java | 19 +
src/it/default/src/main/webapp/WEB-INF/web.xml | 18 +
src/it/default/src/main/webapp/index.html | 18 +
src/it/default/verify.bsh | 19 +
src/it/manifest-content/verify.bsh | 2 +-
src/it/overlay-excludes/invoker.properties | 18 +
src/it/overlay-excludes/pom.xml | 44 +
.../overlay-excludes/verify.bsh} | 29 +-
.../war-exclude-overlay}/pom.xml | 61 +-
.../src/main/webapp/WEB-INF/web.xml} | 23 +-
.../overlay-excludes/war-overlay/pom.xml} | 27 +-
.../war-overlay/src/main/webapp/WEB-INF/web.xml} | 22 +-
.../src/main/webapp/lib/js/something/else.js} | 28 +-
src/it/overlay-keeps-contextxml/invoker.properties | 18 +
src/it/overlay-keeps-contextxml/pom.xml | 44 +
.../overlay-keeps-contextxml/verify.bsh} | 29 +-
.../war1-with-contextxml/pom.xml} | 32 +-
.../src/main/webapp/META-INF/context.xml} | 18 +-
.../src/main/webapp/WEB-INF/web.xml} | 22 +-
.../overlay-keeps-contextxml/war2-result/pom.xml | 40 +
.../war2-result/src/main/webapp/WEB-INF/web.xml} | 22 +-
src/it/scoped-dependency-same-artifact/goals.txt | 1 -
.../invoker.properties | 18 +
src/it/simple-war-no-webxml/goals.txt | 1 -
src/it/simple-war-no-webxml/invoker.properties | 19 +
src/it/simple-war-project/goals.txt | 1 -
src/it/simple-war-project/invoker.properties | 18 +
.../parent/pom.xml | 62 +
.../pom.xml | 40 +-
.../web-resources-filtering-delimiter/verify.bsh | 108 ++
.../web/pom.xml | 6 +
.../web/src/main/webapp/WEB-INF/web.xml} | 23 +-
.../web/src/main/webapp/index.jsp} | 35 +-
.../webresources/WEB-INF/classes/my.properties | 18 +
.../src/main/webresources/WEB-INF/jetty-env.xml | 40 +
src/it/web-resources-filtering/verify.bsh | 49 +-
src/it/web-resources-filtering/web/pom.xml | 2 +
.../webresources/WEB-INF/classes/my.properties | 18 +
.../src/main/webresources/WEB-INF/jetty-env.xml | 27 +-
.../apache/maven/plugin/war/AbstractWarMojo.java | 901 ---------------
.../apache/maven/plugin/war/WarManifestMojo.java | 99 --
.../war/packaging/AbstractWarPackagingTask.java | 366 ------
.../war/packaging/ArtifactsPackagingTask.java | 170 ---
.../apache/maven/plugin/war/util/MappingUtils.java | 128 ---
.../apache/maven/plugins/war/AbstractWarMojo.java | 1198 ++++++++++++++++++++
.../maven/{plugin => plugins}/war/Overlay.java | 147 ++-
.../{plugin => plugins}/war/WarExplodedMojo.java | 19 +-
.../{plugin => plugins}/war/WarInPlaceMojo.java | 13 +-
.../maven/{plugin => plugins}/war/WarMojo.java | 306 +++--
.../war/overlay/DefaultOverlay.java | 11 +-
.../InvalidOverlayConfigurationException.java | 19 +-
.../war/overlay/OverlayManager.java | 118 +-
.../war/packaging/AbstractWarPackagingTask.java | 497 ++++++++
.../war/packaging/ArtifactsPackagingTask.java | 190 ++++
.../war/packaging/ClassesPackagingTask.java | 51 +-
.../war/packaging/CopyUserManifestTask.java} | 58 +-
.../DependenciesAnalysisPackagingTask.java | 84 +-
.../war/packaging/OverlayPackagingTask.java | 27 +-
.../SaveWebappStructurePostPackagingTask.java | 14 +-
.../war/packaging/WarPackagingContext.java | 73 +-
.../war/packaging/WarPackagingTask.java | 12 +-
.../war/packaging/WarPostPackagingTask.java | 11 +-
.../war/packaging/WarProjectPackagingTask.java | 136 +--
.../war/util/ClassesPackager.java | 16 +-
.../war/util/DependencyInfo.java | 14 +-
.../{plugin => plugins}/war/util/PathSet.java | 89 +-
.../{plugin => plugins}/war/util/WarUtils.java | 45 +-
.../war/util/WebappStructure.java | 257 ++---
.../war/util/WebappStructureSerializer.java | 55 +-
.../META-INF/plexus/components.xml | 89 ++
.../examples/adding-filtering-webresources.apt.vm | 13 +-
src/site/apt/examples/skinny-wars.apt.vm | 76 +-
src/site/apt/{index.apt => index.apt.vm} | 72 +-
src/site/apt/overlays.apt.vm | 4 +-
src/site/resources/download.cgi | 22 +
src/site/site.xml | 7 +-
src/site/xdoc/download.xml.vm | 126 ++
.../maven/plugin/war/WarManifestMojoTest.java | 187 ---
.../maven/plugin/war/util/MappingUtilsTest.java | 186 ---
.../war/AbstractWarExplodedMojoTest.java | 89 +-
.../war/AbstractWarMojoTest.java | 96 +-
.../war/WarDependenciesAnalysisTest.java | 44 +-
.../war/WarExplodedMojoFilteringTest.java | 32 +-
.../war/WarExplodedMojoTest.java | 284 +++--
.../war/WarInPlaceMojoTest.java | 18 +-
.../maven/{plugin => plugins}/war/WarMojoTest.java | 258 +++--
.../{plugin => plugins}/war/WarOverlaysTest.java | 173 ++-
.../maven/{plugin => plugins}/war/WarZipTest.java | 23 +-
.../war/overlay/OverlayManagerTest.java | 32 +-
.../war/stub/AarArtifactStub.java | 4 +-
.../war/stub/AbstractArtifactStub.java | 10 +-
.../war/stub/EJBArtifactStub.java | 2 +-
.../war/stub/EJBArtifactStubWithClassifier.java | 2 +-
.../war/stub/EJBClientArtifactStub.java | 2 +-
.../war/stub/IncludeExcludeWarArtifactStub.java | 2 +-
.../war/stub/JarArtifactStub.java | 14 +-
.../war/stub/MarArtifactStub.java | 2 +-
.../war/stub/MavenProject4CopyConstructor.java | 28 +-
.../war/stub/MavenProjectArtifactsStub.java | 39 +-
.../war/stub/MavenProjectBasicStub.java | 31 +-
.../war/stub/MavenZipProject.java | 14 +-
.../{plugin => plugins}/war/stub/ModelStub.java | 16 +-
.../war/stub/PARArtifactStub.java | 2 +-
.../war/stub/ProjectHelperStub.java | 4 +-
.../{plugin => plugins}/war/stub/ResourceStub.java | 17 +-
.../war/stub/TLDArtifactStub.java | 2 +-
.../war/stub/WarArtifact4CCStub.java | 2 +-
.../war/stub/WarArtifactStub.java | 2 +-
.../war/stub/WarOverlayStub.java | 2 +-
.../war/stub/XarArtifactStub.java} | 18 +-
.../war/stub/ZipArtifactStub.java | 10 +-
.../{plugin => plugins}/war/util/PathSetTest.java | 90 +-
.../{plugin => plugins}/war/util/WarUtilsTest.java | 5 +-
.../war/util/WebappStructureTest.java | 21 +-
.../resources/overlays/overlay-one/WEB-INF/web.xml | 18 +
src/test/resources/overlays/overlay-one/index.jsp | 18 +
src/test/resources/overlays/overlay-one/login.jsp | 18 +
.../resources/overlays/overlay-two/WEB-INF/web.xml | 18 +
src/test/resources/overlays/overlay-two/admin.jsp | 18 +
src/test/resources/overlays/overlay-two/index.jsp | 18 +
.../maven-artifact2-1.0-SNAPSHOT.jar | 0
.../manifest-with-other-attrs/plugin-config.xml | 41 -
.../unit/sample_wars/javax.servlet-api-3.0.1.jar | Bin 0 -> 85353 bytes
.../simple.xar} | 0
193 files changed, 6142 insertions(+), 4376 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-war-plugin.git
More information about the pkg-java-commits
mailing list