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 6292db23d18b78d55761b5b4717f1433d15dfc9f Merge: f0dcf95 56fb426 Author: Emmanuel Bourg <[email protected]> Date: Fri Jul 28 13:33:37 2017 +0200 Updated version 3.1 from 'upstream/3.1' with Debian dir fc903900ba14c09f0369d8e45ef003e769ff4c16 pom.xml | 154 ++------- src/it/MSITE-159/pom.xml | 21 ++ src/it/MSITE-265/pom.xml | 2 + src/it/MSITE-304/child/pom.xml | 3 + src/it/MSITE-304/pom.xml | 3 + src/it/MSITE-312/child/pom.xml | 20 ++ src/it/MSITE-312/pom.xml | 70 ++-- src/it/MSITE-322/mymodule/pom.xml | 21 ++ src/it/MSITE-322/pom.xml | 23 +- src/it/MSITE-354/pom.xml | 3 + src/it/MSITE-458/first/pom.xml | 22 +- src/it/MSITE-458/pom.xml | 21 ++ src/it/MSITE-458/second/pom.xml | 22 +- src/it/MSITE-484/parent-usage-test/pom.xml | 23 +- src/it/MSITE-484/pom.xml | 23 +- src/it/MSITE-497/apps/app/pom.xml | 22 +- src/it/MSITE-497/apps/pom.xml | 22 +- src/it/MSITE-497/pom.xml | 22 +- src/it/MSITE-504/maven-plugin-consumer/pom.xml | 22 +- src/it/MSITE-504/maven-plugin/pom.xml | 22 +- src/it/MSITE-504/pom.xml | 22 +- src/it/MSITE-506/pom.xml | 23 +- src/it/MSITE-507/pom.xml | 31 +- src/it/MSITE-512/parent-usage-test/pom.xml | 23 +- src/it/MSITE-512/pom.xml | 23 +- src/it/MSITE-537/parent/pom.xml | 21 ++ src/it/MSITE-537/pom.xml | 21 ++ src/it/MSITE-548/module1/pom.xml | 24 +- src/it/MSITE-548/module2/pom.xml | 24 +- src/it/MSITE-548/pom.xml | 24 +- src/it/MSITE-550/pom.xml | 36 +- src/it/MSITE-550/src/site/apt/index.apt | 1 + src/it/MSITE-550/src/site/apt/{ => sub}/index.apt | 1 + src/it/MSITE-550/src/site/site.vm | 33 +- src/it/MSITE-566/pom.xml | 21 ++ src/it/{MSITE-304 => MSITE-582}/child/pom.xml | 10 +- .../pom.xml => MSITE-582/child/src/site/site.xml} | 26 +- src/it/{MSITE-304 => MSITE-582}/pom.xml | 16 +- .../child/pom.xml => MSITE-582/src/site/site.xml} | 28 +- src/it/MSITE-582/verify.groovy | 26 ++ src/it/MSITE-604/goals.txt | 1 + src/it/MSITE-604/invoker.properties | 1 + src/it/{site-jar => MSITE-604}/pom.xml | 14 +- src/it/MSITE-604/verify.bsh | 48 +++ src/it/MSITE-609/goals.txt | 1 + src/it/{site-jar => MSITE-609}/pom.xml | 10 +- src/it/MSITE-609/src/main/java/foo/App.java | 32 ++ src/it/MSITE-609/src/site/apt/download.apt.vm | 36 ++ src/it/MSITE-609/src/site/site.xml | 44 +++ .../pom.xml => MSITE-609/src/site/xdoc/index.xml} | 23 +- .../src/site/xdoc/releases/release1.6.3.xml} | 23 +- .../src/site/xdoc/releases/release1.6.xml} | 23 +- src/it/MSITE-609/verify.bsh | 81 +++++ src/it/MSITE-627/invoker.properties | 4 + src/it/{MSITE-304 => MSITE-627}/pom.xml | 59 ++-- .../java/org/apache/maven/plugins/it/MyReport.java | 74 ++++ src/it/MSITE-627/verify.bsh | 57 +++ src/it/emma-plugin-it/a/pom.xml | 20 ++ src/it/emma-plugin-it/b/pom.xml | 20 ++ src/it/emma-plugin-it/pom.xml | 20 ++ src/it/full-reporting/pom.xml | 21 ++ src/it/full-reporting/src/site/apt/index.apt.vm | 101 ++++++ .../parentAsRef/childAsRef/grandChildAsRef/pom.xml | 20 ++ .../inheritedMenus/parentAsRef/childAsRef/pom.xml | 20 ++ src/it/inheritedMenus/parentAsRef/pom.xml | 20 ++ .../childNotAsRef/grandChildNotAsRef/pom.xml | 20 ++ .../parentNotAsRef/childNotAsRef/pom.xml | 20 ++ src/it/inheritedMenus/parentNotAsRef/pom.xml | 20 ++ src/it/inheritedMenus/pom.xml | 20 ++ src/it/inheritedReports/child/pom.xml | 20 ++ src/it/inheritedReports/pom.xml | 20 ++ src/it/interpolation/parent/pom.xml | 2 + src/it/interpolation/pom.xml | 2 + src/it/it-plugin-test/pom.xml | 21 ++ src/it/new-configuration/pom.xml | 21 ++ src/it/no-version/pom.xml | 21 ++ src/it/report-changes-generation/pom.xml | 1 + src/it/settings.xml | 16 + src/it/site-attach-descriptor/child/pom.xml | 2 + src/it/site-attach-descriptor/pom.xml | 2 + src/it/site-deploy/pom.xml | 2 + src/it/site-inheritance/aggregator/pom.xml | 21 ++ src/it/site-inheritance/child_and_module/pom.xml | 21 ++ src/it/site-inheritance/inheriting_child/pom.xml | 21 ++ src/it/site-inheritance/module/pom.xml | 21 ++ src/it/site-inheritance/parent/pom.xml | 21 ++ src/it/site-inheritance/pom.xml | 21 ++ src/it/site-inheritance/sub_module/pom.xml | 21 ++ src/it/site-jar/pom.xml | 2 + src/it/site-skip/pom.xml | 21 ++ src/it/site-skip/site/pom.xml | 21 ++ src/it/site-skip/skip-site-deploy/pom.xml | 37 +- src/it/site-skip/skip-site/pom.xml | 41 ++- .../plugins/maven-rocks-plugin/pom.xml | 20 ++ src/it/site-stage-deploy/plugins/plugins/pom.xml | 20 ++ src/it/site-stage-deploy/plugins/pom.xml | 20 ++ src/it/site-stage-deploy/pom.xml | 20 ++ src/it/site-stage-deploy/pom/pom.xml | 20 ++ src/it/surefire-report/pom.xml | 21 ++ .../top-parent-different-site/invoker.properties | 2 + .../module1}/pom.xml | 69 ++-- .../child => top-parent-different-site}/pom.xml | 84 +++-- .../root}/pom.xml | 122 +++---- src/it/top-parent-different-site/verify.bsh | 75 ++++ src/it/top-parent-no-site/module1/pom.xml | 24 +- src/it/top-parent-no-site/pom.xml | 24 +- src/it/top-parent-no-site/root/pom.xml | 24 +- src/it/{interpolation/parent => validate}/pom.xml | 37 +- src/it/validate/src/site/fml/faq.fml | 27 ++ src/it/validate/src/site/site.xml | 27 ++ src/it/validate/src/site/xdoc/xdoc.xml | 17 + .../maven/plugins/site/AbstractDeployMojo.java | 265 ++++++++------ .../maven/plugins/site/AbstractSiteMojo.java | 4 +- .../plugins/site/AbstractSiteRenderingMojo.java | 15 +- .../apache/maven/plugins/site/SiteDeployMojo.java | 14 +- .../plugins/site/SiteDescriptorAttachMojo.java | 10 +- .../org/apache/maven/plugins/site/SiteJarMojo.java | 95 ++++- .../maven/plugins/site/SiteStageDeployMojo.java | 153 ++++++++- .../apache/maven/plugins/site/SiteStageMojo.java | 6 +- .../apt/examples/adding-deploy-protocol.apt.vm | 26 +- src/site/apt/examples/creating-content.apt.vm | 20 +- src/site/apt/examples/sitedescriptor.apt | 159 ++++++++- src/site/apt/maven-3.apt.vm | 15 +- src/site/apt/usage.apt | 26 +- src/site/fml/faq.fml | 18 +- src/site/xdoc/i18n.xml | 381 +-------------------- .../plugins/site/AbstractSiteDeployWebDavTest.java | 84 ++--- 127 files changed, 3089 insertions(+), 1082 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
