This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-site-plugin.
commit 31aa81445ff47f46107782b76ed79f0006e15e97 Merge: 1314e5d efc9f1f Author: Emmanuel Bourg <[email protected]> Date: Thu Jul 27 19:25:55 2017 +0200 Updated version 2.3 from 'upstream/2.3' with Debian dir 1c82aca457d95869972de6616ec644ec810b2d60 pom.xml | 124 ++--- src/it/MSITE-159/invoker.properties | 1 + src/it/MSITE-159/pom.xml | 50 ++ src/it/MSITE-159/src/site/apt/index.apt | 18 + src/it/MSITE-159/src/site/site.xml | 19 + src/it/MSITE-159/verify.bsh | 59 +++ src/it/MSITE-265/src/site/site.xml | 1 - src/it/MSITE-265/verify.bsh | 21 +- src/it/MSITE-304/goals.txt | 1 - src/it/MSITE-304/invoker.properties | 3 +- src/it/MSITE-304/verify.bsh | 18 +- src/it/MSITE-312/child/pom.xml | 20 + src/it/MSITE-312/child/src/site/site.xml | 17 + .../{site-deploy => MSITE-312}/invoker.properties | 0 src/it/MSITE-312/pom.xml | 49 ++ src/it/MSITE-312/src/site/site.xml | 17 + src/it/MSITE-312/verify.bsh | 94 ++++ src/it/MSITE-322/invoker.properties | 2 + src/it/MSITE-322/mymodule/pom.xml | 14 + .../mymodule/src/main/java/test/Test.java | 6 + .../MSITE-322/mymodule/src/site/fr/xdoc/index.xml | 16 + src/it/MSITE-322/mymodule/src/site/site.xml | 15 + src/it/MSITE-322/mymodule/src/site/site_fr.xml | 15 + .../MSITE-322/mymodule/src/site/xdoc/contact.xml | 23 + src/it/MSITE-322/mymodule/src/site/xdoc/index.xml | 16 + src/it/MSITE-322/pom.xml | 54 ++ src/it/MSITE-322/src/site/fr/xdoc/index.xml | 16 + .../src/site/resources/css/maven-base.css | 143 ++++++ .../src/site/resources/css/maven-theme.css | 214 ++++++++ src/it/MSITE-322/src/site/resources/css/print.css | 7 + src/it/MSITE-322/src/site/resources/css/site.css | 5 + src/it/MSITE-322/src/site/site.xml | 19 + src/it/MSITE-322/src/site/site_fr.xml | 19 + src/it/MSITE-322/src/site/xdoc/index.xml | 16 + src/it/MSITE-322/verify.bsh | 125 +++++ src/it/MSITE-354/goals.txt | 1 + .../{site-attach-descriptor => MSITE-354}/pom.xml | 48 +- .../verify.bsh | 23 +- src/it/MSITE-456/child/pom.xml | 36 ++ src/it/{site-jar => MSITE-456}/invoker.properties | 0 .../{site-attach-descriptor => MSITE-456}/pom.xml | 146 +++--- src/it/MSITE-456/verify.bsh | 93 ++++ src/it/MSITE-537/invoker.properties | 2 + src/it/MSITE-537/parent/pom.xml | 49 ++ src/it/MSITE-537/pom.xml | 16 + src/it/MSITE-537/verify.bsh | 49 ++ src/it/MSITE-548/invoker.properties | 2 + src/it/MSITE-548/module1/pom.xml | 16 + src/it/MSITE-548/module2/pom.xml | 16 + src/it/MSITE-548/pom.xml | 50 ++ src/it/MSITE-548/root/pom.xml | 53 ++ src/it/MSITE-548/verify.bsh | 69 +++ src/it/MSITE-566/invoker.properties | 1 + src/it/MSITE-566/pom.xml | 30 ++ src/it/MSITE-566/src/site/apt/index.apt | 18 + src/it/MSITE-566/src/site/site.xml | 11 + .../verify.bsh | 41 +- .../org/apache/maven/plugins/site/its/App.java | 19 + src/it/inheritedMenus/README | 5 + .../invoker.properties | 0 .../parentAsRef/childAsRef/grandChildAsRef/pom.xml | 33 ++ .../childAsRef/grandChildAsRef/src/site/site.xml | 15 + .../inheritedMenus/parentAsRef/childAsRef/pom.xml | 37 ++ .../parentAsRef/childAsRef/src/site/site.xml | 15 + src/it/inheritedMenus/parentAsRef/pom.xml | 54 ++ .../inheritedMenus/parentAsRef/src/site/site.xml | 27 + .../childNotAsRef/grandChildNotAsRef/pom.xml | 33 ++ .../grandChildNotAsRef/src/site/site.xml | 15 + .../parentNotAsRef/childNotAsRef/pom.xml | 37 ++ .../parentNotAsRef/childNotAsRef/src/site/site.xml | 15 + src/it/inheritedMenus/parentNotAsRef/pom.xml | 54 ++ .../parentNotAsRef/src/site/site.xml | 27 + src/it/inheritedMenus/pom.xml | 33 ++ src/it/inheritedMenus/verify.bsh | 219 ++++++++ src/it/site-attach-descriptor/pom.xml | 4 + src/it/site-attach-descriptor/src/site/site.xml | 1 - src/it/site-attach-descriptor/src/site/site_sv.xml | 1 - src/it/site-attach-descriptor/verify.bsh | 6 +- src/it/site-deploy/src/site/site.xml | 2 +- src/it/site-deploy/verify.bsh | 17 +- src/it/site-inheritance/aggregator/pom.xml | 56 ++ src/it/site-inheritance/child_and_module/pom.xml | 26 + .../child_and_module/src/site/apt/index.apt | 11 + .../child_and_module/src/site/site.xml | 25 + src/it/site-inheritance/inheriting_child/pom.xml | 21 + .../inheriting_child/src/site/apt/index.apt | 11 + .../inheriting_child/src/site/site.xml | 25 + src/it/site-inheritance/invoker.properties | 3 + src/it/site-inheritance/module/pom.xml | 55 ++ .../site-inheritance/module/src/site/apt/index.apt | 11 + src/it/site-inheritance/module/src/site/site.xml | 26 + src/it/site-inheritance/parent/pom.xml | 50 ++ .../site-inheritance/parent/src/site/apt/index.apt | 11 + src/it/site-inheritance/parent/src/site/site.xml | 25 + src/it/site-inheritance/pom.xml | 54 ++ src/it/site-inheritance/sub_module/pom.xml | 15 + .../sub_module/src/site/apt/index.apt | 11 + .../site-inheritance/sub_module/src/site/site.xml | 25 + src/it/site-inheritance/verify.bsh | 569 +++++++++++++++++++++ src/it/site-jar/src/site/site.xml | 2 +- src/it/site-jar/verify.bsh | 6 +- src/it/site-stage-deploy/invoker.properties | 2 + .../plugins/maven-rocks-plugin/pom.xml | 18 + src/it/site-stage-deploy/plugins/plugins/pom.xml | 20 + src/it/site-stage-deploy/plugins/pom.xml | 31 ++ src/it/site-stage-deploy/pom.xml | 51 ++ src/it/site-stage-deploy/pom/pom.xml | 32 ++ src/it/site-stage-deploy/verify.bsh | 115 +++++ src/it/top-parent-no-site/invoker.properties | 2 + src/it/top-parent-no-site/module1/pom.xml | 16 + src/it/top-parent-no-site/pom.xml | 31 ++ src/it/top-parent-no-site/root/pom.xml | 39 ++ src/it/top-parent-no-site/verify.bsh | 54 ++ ...SiteDeployMojo.java => AbstractDeployMojo.java} | 407 ++++++++++++--- .../maven/plugins/site/AbstractSiteMojo.java | 95 ++-- .../plugins/site/AbstractSiteRenderingMojo.java | 175 +++++-- .../site/CategorySummaryDocumentRenderer.java | 14 +- .../maven/plugins/site/EffectiveSiteMojo.java | 6 +- .../maven/plugins/site/ReportDocumentRenderer.java | 81 ++- .../apache/maven/plugins/site/SiteDeployMojo.java | 352 +------------ .../site/SiteDescriptorArtifactMetadata.java | 11 +- .../plugins/site/SiteDescriptorAttachMojo.java | 121 ++--- .../org/apache/maven/plugins/site/SiteJarMojo.java | 9 +- .../org/apache/maven/plugins/site/SiteMap.java | 26 +- .../org/apache/maven/plugins/site/SiteMojo.java | 24 +- .../org/apache/maven/plugins/site/SiteRunMojo.java | 8 +- .../maven/plugins/site/SiteStageDeployMojo.java | 279 +++------- .../apache/maven/plugins/site/SiteStageMojo.java | 196 ++----- .../apache/maven/plugins/site/wagon/PathUtils.java | 8 +- .../plugins/site/wagon/repository/Repository.java | 7 +- src/main/resources/site-plugin_gl.properties | 26 + src/site/apt/examples/moduleexcludes.apt.vm | 11 +- src/site/apt/examples/multimodule.apt | 96 ++++ .../examples/site-deploy-to-sourceforge.net.apt | 4 +- src/site/apt/examples/sitedescriptor.apt | 30 +- src/site/apt/migrate.apt | 7 + src/site/apt/usage.apt | 20 +- src/site/fml/faq.fml | 1 + src/site/site.xml | 1 + .../maven/plugins/site/SiteDeployMojoTest.java | 12 +- .../apache/maven/plugins/site/SiteMojoTest.java | 7 +- 141 files changed, 4808 insertions(+), 1351 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-site-plugin.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
