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 4945fa7dfe9e90a0efdaf337c7b9bef0fecdda07 Merge: 33b56e3 230ec78 Author: Emmanuel Bourg <[email protected]> Date: Fri Jul 28 13:34:26 2017 +0200 Updated version 3.3 from 'upstream/3.3' with Debian dir fc903900ba14c09f0369d8e45ef003e769ff4c16 pom.xml | 65 ++++++-- src/it/MSITE-304/verify.bsh | 77 --------- src/it/MSITE-658/invoker.properties | 1 + src/it/MSITE-658/pom.xml | 50 ++++++ src/it/MSITE-658/src/site/site.xml | 10 ++ src/it/MSITE-658/src/site/site_de.xml | 10 ++ src/it/MSITE-658/verify.bsh | 81 ++++++++++ src/it/effective-site/invoker.properties | 2 + .../{MSITE-537/parent => effective-site}/pom.xml | 37 ++--- .../src/site/site.xml | 8 +- .../prebuild.bsh => effective-site/verify.groovy} | 19 +-- src/it/inheritedReports/invoker.properties | 5 +- .../{MSITE-537/parent => markdown-format}/pom.xml | 17 +- .../src/site/markdown/index.md} | 19 +-- .../verify.bsh => markdown-format/verify.groovy} | 18 +-- src/it/{MSITE-322 => site-sd-2}/invoker.properties | 0 .../plugins/maven-rocks-plugin/pom.xml | 0 .../plugins/plugins/pom.xml | 0 .../plugins/pom.xml | 2 +- src/it/{site-stage-deploy => site-sd-2}/pom.xml | 5 +- .../{site-stage-deploy => site-sd-2}/pom/pom.xml | 2 +- src/it/site-sd-2/verify.groovy | 49 ++++++ .../invoker.properties | 0 .../{MSITE-322 => site-sd-lang}/mymodule/pom.xml | 0 .../mymodule/src/main/java/test/Test.java | 0 .../mymodule/src/site/fr/xdoc/index.xml | 0 .../mymodule/src/site/site.xml | 0 .../mymodule/src/site/site_fr.xml | 0 .../mymodule/src/site/xdoc/contact.xml | 0 .../mymodule/src/site/xdoc/index.xml | 0 src/it/{MSITE-322 => site-sd-lang}/pom.xml | 5 +- .../src/site/fr/xdoc/index.xml | 0 .../src/site/resources/css/maven-base.css | 0 .../src/site/resources/css/maven-theme.css | 0 .../src/site/resources/css/print.css | 0 .../src/site/resources/css/site.css | 0 .../{MSITE-322 => site-sd-lang}/src/site/site.xml | 0 .../src/site/site_fr.xml | 0 .../src/site/xdoc/index.xml | 0 src/it/{MSITE-322 => site-sd-lang}/verify.bsh | 0 .../goals.txt | 0 .../parent/pom.xml | 0 .../{MSITE-649 => site-sd-stagingSiteURL}/pom.xml | 0 .../verify.groovy} | 33 +--- .../invoker.properties | 0 .../parent/pom.xml | 2 +- src/it/{MSITE-537 => site-sd-submodule}/pom.xml | 1 + .../verify.groovy} | 22 +-- .../invoker.properties | 0 .../module1/pom.xml | 0 .../pom.xml | 7 +- .../root/pom.xml | 0 .../verify.groovy} | 31 ++-- .../invoker.properties | 0 .../module1/pom.xml | 0 .../pom.xml | 7 +- .../root/pom.xml | 0 .../verify.groovy} | 31 ++-- .../invoker.properties | 0 .../module1/pom.xml | 72 ++++----- .../root => site-sd-top-parent-same-site}/pom.xml | 116 +++++++------ .../root/pom.xml | 108 +++++++------ .../verify.groovy} | 31 ++-- src/it/{MSITE-304 => site-sd}/child/pom.xml | 0 src/it/{MSITE-304 => site-sd}/invoker.properties | 0 src/it/{MSITE-304 => site-sd}/pom.xml | 3 +- src/it/{MSITE-304 => site-sd}/src/site/site.xml | 0 .../verify.bsh => site-sd/verify.groovy} | 28 ++-- src/it/site-stage-deploy/verify.bsh | 115 ------------- src/it/top-parent-different-site/verify.bsh | 75 --------- src/it/top-parent-no-site/verify.bsh | 54 ------- .../maven/plugins/site/AbstractDeployMojo.java | 180 +++++++++------------ .../plugins/site/AbstractSiteRenderingMojo.java | 17 +- .../maven/plugins/site/AbstractStagingMojo.java | 58 +++++++ .../maven/plugins/site/EffectiveSiteMojo.java | 5 +- .../apache/maven/plugins/site/SiteDeployMojo.java | 32 ++-- .../plugins/site/SiteDescriptorAttachMojo.java | 4 +- .../org/apache/maven/plugins/site/SiteMojo.java | 4 +- .../org/apache/maven/plugins/site/SiteRunMojo.java | 4 +- .../maven/plugins/site/SiteStageDeployMojo.java | 113 ++++++------- .../apache/maven/plugins/site/SiteStageMojo.java | 123 +++++++++----- .../Repository.java => BugFixedRepository.java} | 21 +-- .../apache/maven/plugins/site/wagon/PathUtils.java | 30 ++-- src/main/resources/site-plugin_nl.properties | 4 + src/site/apt/examples/configuring-reports.apt | 79 +++++++-- src/site/apt/examples/creating-content.apt.vm | 2 +- src/site/apt/examples/multimodule.apt | 67 ++++++-- src/site/apt/examples/siterun.apt.vm | 2 +- src/site/apt/{index.apt => index.apt.vm} | 7 +- src/site/apt/maven-3.apt.vm | 64 ++++---- src/site/fml/faq.fml | 8 +- 91 files changed, 1037 insertions(+), 1005 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
