[maven-war-plugin] 25/28: Merge tag 'upstream/2.2'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Dec 9 13:41:36 UTC 2015
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 c5dccc728c80734973845eb284131ccb2e5793b0
Merge: 962d433 31168c3
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Dec 9 14:28:28 2015 +0100
Merge tag 'upstream/2.2'
Upstream version 2.2
pom.xml | 194 ++++
src/it/MWAR-129/goals.txt | 1 +
src/it/MWAR-129/pom.xml | 121 +++
src/it/MWAR-129/src/main/webapp/WEB-INF/web.xml | 24 +
src/it/MWAR-129/src/main/webapp/index.jsp | 23 +
src/it/MWAR-129/src/main/webapp/param.jsp | 27 +
src/it/MWAR-129/verify.bsh | 66 ++
src/it/MWAR-131/goals.txt | 1 +
src/it/MWAR-131/mwar131-test/pom.xml | 32 +
.../src/main/java/com/example/App.java | 13 +
.../src/test/java/com/example/AppTest.java | 43 +
src/it/MWAR-131/mwar131-webapp/pom.xml | 41 +
.../src/main/java/com/example/Util.java | 9 +
.../mwar131-webapp/src/main/webapp/WEB-INF/web.xml | 7 +
.../mwar131-webapp/src/main/webapp/index.jsp | 5 +
src/it/MWAR-131/mwar131-webapp2/pom.xml | 37 +
.../src/main/webapp/WEB-INF/web.xml | 7 +
.../mwar131-webapp2/src/main/webapp/index.jsp | 5 +
src/it/MWAR-131/pom.xml | 23 +
src/it/MWAR-131/verify.bsh | 77 ++
src/it/MWAR-133/goals.txt | 1 +
src/it/MWAR-133/pom.xml | 58 ++
src/it/MWAR-133/src/main/webapp/WEB-INF/web.xml | 24 +
.../src/main/webresources/filtered.properties | 4 +
src/it/MWAR-133/verify.bsh | 66 ++
src/it/MWAR-139/pom.xml | 48 +
src/it/MWAR-139/src/main/webapp/WEB-INF/web.xml | 24 +
src/it/MWAR-139/src/main/webresources/filterme.xml | 5 +
src/it/MWAR-139/verify.bsh | 72 ++
src/it/MWAR-143/goals.txt | 1 +
src/it/MWAR-143/pom.xml | 58 ++
src/it/MWAR-143/verify.bsh | 124 +++
src/it/MWAR-143/war-common/pom.xml | 52 ++
.../war-common/src/main/images/duke-beer.jpg | Bin 0 -> 246218 bytes
.../src/main/resources/filter.properties | 4 +
.../war-common/src/main/webapp/WEB-INF/web.xml | 7 +
src/it/MWAR-143/war-filter-overlay/pom.xml | 65 ++
.../src/main/webapp/WEB-INF/web.xml | 8 +
src/it/MWAR-240/goals.txt | 1 +
src/it/MWAR-240/pom.xml | 43 +
.../java/org/apache/maven/plugin/war/it/Dummy.java | 29 +
src/it/MWAR-240/verify.bsh | 59 ++
src/it/MWAR-62/goals.txt | 1 +
src/it/MWAR-62/pom.xml | 50 ++
src/it/MWAR-62/src/main/webapp/dev.properties | 1 +
src/it/MWAR-62/src/main/webapp/test.properties | 1 +
src/it/MWAR-62/src/main/webapp/web.xml | 24 +
src/it/MWAR-62/verify.bsh | 61 ++
src/it/MWAR-96/pom.xml | 51 ++
src/it/MWAR-96/src/main/filters/filter.properties | 19 +
src/it/MWAR-96/src/main/webapp/WEB-INF/web.xml | 24 +
src/it/MWAR-96/src/main/webapp/index.jsp | 22 +
src/it/MWAR-96/verify.bsh | 74 ++
src/it/default/pom.xml | 66 ++
.../main/java/org/apache/maven/it0016/Person.java | 16 +
src/it/default/src/main/webapp/WEB-INF/web.xml | 5 +
src/it/default/src/main/webapp/index.html | 5 +
src/it/default/verify.bsh | 78 ++
src/it/manifest-content/pom.xml | 50 ++
src/it/manifest-content/src/main/webapp/index.jsp | 20 +
src/it/manifest-content/verify.bsh | 109 +++
src/it/scoped-dependency-same-artifact/goals.txt | 1 +
src/it/scoped-dependency-same-artifact/pom.xml | 53 ++
.../src/main/webapp/WEB-INF/web.xml | 29 +
.../src/main/webapp/index.jsp | 20 +
src/it/scoped-dependency-same-artifact/verify.bsh | 88 ++
src/it/settings.xml | 55 ++
src/it/simple-war-no-webxml/goals.txt | 1 +
src/it/simple-war-no-webxml/pom.xml | 47 +
.../simple-war-no-webxml/src/main/webapp/index.jsp | 20 +
src/it/simple-war-no-webxml/verify.bsh | 82 ++
src/it/simple-war-project/goals.txt | 1 +
src/it/simple-war-project/pom.xml | 49 +
.../src/main/webapp/WEB-INF/web.xml | 29 +
.../simple-war-project/src/main/webapp/index.jsp | 20 +
src/it/simple-war-project/verify.bsh | 96 ++
src/it/web-resources-filtering/parent/pom.xml | 62 ++
src/it/web-resources-filtering/pom.xml | 44 +
src/it/web-resources-filtering/verify.bsh | 67 ++
src/it/web-resources-filtering/web/pom.xml | 66 ++
.../web/src/main/webapp/WEB-INF/web.xml | 26 +
.../web/src/main/webapp/index.jsp | 23 +
.../src/main/webresources/WEB-INF/jetty-env.xml | 15 +
.../apache/maven/plugin/war/AbstractWarMojo.java | 901 +++++++++++++++++++
.../java/org/apache/maven/plugin/war/Overlay.java | 300 +++++++
.../apache/maven/plugin/war/WarExplodedMojo.java | 45 +
.../apache/maven/plugin/war/WarInPlaceMojo.java | 43 +
.../apache/maven/plugin/war/WarManifestMojo.java | 99 ++
.../java/org/apache/maven/plugin/war/WarMojo.java | 440 +++++++++
.../maven/plugin/war/overlay/DefaultOverlay.java | 64 ++
.../InvalidOverlayConfigurationException.java | 46 +
.../maven/plugin/war/overlay/OverlayManager.java | 268 ++++++
.../war/packaging/AbstractWarPackagingTask.java | 366 ++++++++
.../war/packaging/ArtifactsPackagingTask.java | 170 ++++
.../plugin/war/packaging/ClassesPackagingTask.java | 121 +++
.../DependenciesAnalysisPackagingTask.java | 232 +++++
.../plugin/war/packaging/OverlayPackagingTask.java | 157 ++++
.../SaveWebappStructurePostPackagingTask.java | 71 ++
.../plugin/war/packaging/WarPackagingContext.java | 198 ++++
.../plugin/war/packaging/WarPackagingTask.java | 48 +
.../plugin/war/packaging/WarPostPackagingTask.java | 47 +
.../war/packaging/WarProjectPackagingTask.java | 385 ++++++++
.../maven/plugin/war/util/ClassesPackager.java | 105 +++
.../maven/plugin/war/util/DependencyInfo.java | 107 +++
.../apache/maven/plugin/war/util/MappingUtils.java | 128 +++
.../org/apache/maven/plugin/war/util/PathSet.java | 297 ++++++
.../org/apache/maven/plugin/war/util/WarUtils.java | 156 ++++
.../maven/plugin/war/util/WebappStructure.java | 662 ++++++++++++++
.../plugin/war/util/WebappStructureSerializer.java | 118 +++
.../examples/adding-filtering-webresources.apt.vm | 396 ++++++++
src/site/apt/examples/file-name-mapping.apt | 60 ++
.../including-excluding-files-from-war.apt.vm | 94 ++
.../apt/examples/rapid-testing-jetty6-plugin.apt | 75 ++
src/site/apt/examples/skinny-wars.apt.vm | 164 ++++
src/site/apt/examples/war-manifest-guide.apt.vm | 102 +++
src/site/apt/index.apt | 94 ++
src/site/apt/overlays.apt.vm | 394 ++++++++
src/site/apt/usage.apt.vm | 229 +++++
src/site/fml/faq.fml.vm | 141 +++
src/site/site.xml | 45 +
.../plugin/war/AbstractWarExplodedMojoTest.java | 317 +++++++
.../maven/plugin/war/AbstractWarMojoTest.java | 329 +++++++
.../plugin/war/WarDependenciesAnalysisTest.java | 189 ++++
.../plugin/war/WarExplodedMojoFilteringTest.java | 210 +++++
.../maven/plugin/war/WarExplodedMojoTest.java | 997 +++++++++++++++++++++
.../maven/plugin/war/WarInPlaceMojoTest.java | 93 ++
.../maven/plugin/war/WarManifestMojoTest.java | 187 ++++
.../org/apache/maven/plugin/war/WarMojoTest.java | 467 ++++++++++
.../apache/maven/plugin/war/WarOverlaysTest.java | 614 +++++++++++++
.../org/apache/maven/plugin/war/WarZipTest.java | 184 ++++
.../plugin/war/overlay/OverlayManagerTest.java | 228 +++++
.../maven/plugin/war/stub/AarArtifactStub.java | 80 ++
.../plugin/war/stub/AbstractArtifactStub.java | 162 ++++
.../maven/plugin/war/stub/EJBArtifactStub.java | 79 ++
.../war/stub/EJBArtifactStubWithClassifier.java | 90 ++
.../plugin/war/stub/EJBClientArtifactStub.java | 84 ++
.../war/stub/IncludeExcludeWarArtifactStub.java | 42 +
.../maven/plugin/war/stub/JarArtifactStub.java | 141 +++
.../maven/plugin/war/stub/MarArtifactStub.java | 78 ++
.../war/stub/MavenProject4CopyConstructor.java | 60 ++
.../plugin/war/stub/MavenProjectArtifactsStub.java | 89 ++
.../plugin/war/stub/MavenProjectBasicStub.java | 111 +++
.../maven/plugin/war/stub/MavenZipProject.java | 59 ++
.../apache/maven/plugin/war/stub/ModelStub.java | 94 ++
.../maven/plugin/war/stub/PARArtifactStub.java | 46 +
.../maven/plugin/war/stub/ProjectHelperStub.java | 79 ++
.../apache/maven/plugin/war/stub/ResourceStub.java | 52 ++
.../maven/plugin/war/stub/TLDArtifactStub.java | 46 +
.../maven/plugin/war/stub/WarArtifact4CCStub.java | 57 ++
.../maven/plugin/war/stub/WarArtifactStub.java | 115 +++
.../maven/plugin/war/stub/WarOverlayStub.java | 76 ++
.../maven/plugin/war/stub/ZipArtifactStub.java | 92 ++
.../maven/plugin/war/util/MappingUtilsTest.java | 186 ++++
.../apache/maven/plugin/war/util/PathSetTest.java | 278 ++++++
.../apache/maven/plugin/war/util/WarUtilsTest.java | 65 ++
.../maven/plugin/war/util/WebappStructureTest.java | 305 +++++++
.../resources/overlays/overlay-one/WEB-INF/web.xml | 3 +
src/test/resources/overlays/overlay-one/index.jsp | 7 +
src/test/resources/overlays/overlay-one/login.jsp | 3 +
.../resources/overlays/overlay-two/WEB-INF/web.xml | 3 +
src/test/resources/overlays/overlay-two/admin.jsp | 3 +
src/test/resources/overlays/overlay-two/index.jsp | 7 +
src/test/resources/unit/dependencies/default.xml | 33 +
.../manifest/basic-manifest-test/plugin-config.xml | 33 +
.../manifest-with-classpath/plugin-config.xml | 39 +
.../maven-artifact1-1.0-SNAPSHOT.jar | 0
.../maven-artifact2-1.0-SNAPSHOT.jar | 0
.../manifest-with-custom-attrs/plugin-config.xml | 44 +
.../manifest-with-main-class/plugin-config.xml | 38 +
.../manifest-with-other-attrs/plugin-config.xml | 41 +
src/test/resources/unit/sample_wars/ejb.jar | Bin 0 -> 753 bytes
src/test/resources/unit/sample_wars/ejbclient.jar | Bin 0 -> 753 bytes
.../resources/unit/sample_wars/include-exclude.war | Bin 0 -> 1255 bytes
src/test/resources/unit/sample_wars/sample.par | 0
.../resources/unit/sample_wars/simple-updated.war | Bin 0 -> 995 bytes
src/test/resources/unit/sample_wars/simple.aar | Bin 0 -> 969 bytes
src/test/resources/unit/sample_wars/simple.jar | Bin 0 -> 969 bytes
src/test/resources/unit/sample_wars/simple.mar | 0
src/test/resources/unit/sample_wars/simple.war | Bin 0 -> 969 bytes
src/test/resources/unit/sample_wars/tld.jar | 0
.../unit/warexplodedinplacemojo/plugin-config.xml | 31 +
.../unit/warexplodedmojo/plugin-config.xml | 31 +
.../unit/warmojotest/not-primary-artifact.xml | 32 +
.../warmojotest/plugin-config-primary-artifact.xml | 32 +
src/test/resources/unit/waroverlays/default.xml | 32 +
src/test/resources/unit/warziptest/foobar.zip | Bin 0 -> 453 bytes
.../resources/unit/warziptest/war-with-zip.xml | 31 +
187 files changed, 17272 insertions(+)
--
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