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 e79a7b26ab018ff05bcde2fb736771b0b3a32dfd Merge: 2c0d7d6 a362397 Author: Emmanuel Bourg <[email protected]> Date: Tue Aug 29 00:44:13 2017 +0200 Updated version 3.6 from 'upstream/3.6' with Debian dir 85e0bc71931702c45554c914bc4dd1d6afba046c pom.xml | 31 ++++++++------ src/it/MSITE-705-debug/invoker.properties | 19 ++++++++ src/it/MSITE-705-debug/pom.xml | 50 ++++++++++++++++++++++ .../verify.groovy | 23 +--------- src/it/MSITE-705-no-debug/invoker.properties | 19 ++++++++ src/it/MSITE-705-no-debug/pom.xml | 50 ++++++++++++++++++++++ .../verify.groovy | 23 +--------- src/it/doxia-formats/invoker.properties | 18 ++++++++ src/it/doxia-formats/pom.xml | 15 ++++++- .../maven/plugins/site/it/CustomVelocityTool.java} | 30 +++++-------- .../main/resources/META-INF/maven/site-tools.xml} | 22 +++------- .../src/site/apt/velocity-context.apt.vm | 14 ++++-- src/it/doxia-formats/verify.groovy | 4 +- src/it/site-attach-descriptor/child/pom.xml | 2 +- .../{child => no-descriptor}/pom.xml | 6 +-- src/it/site-attach-descriptor/pom.xml | 36 ++++------------ .../maven/plugins/site/AbstractSiteMojo.java | 8 +++- .../plugins/site/deploy/AbstractDeployMojo.java | 11 +++-- .../plugins/site/descriptor/EffectiveSiteMojo.java | 5 ++- .../descriptor/SiteDescriptorArtifactMetadata.java | 4 +- .../site/descriptor/SiteDescriptorAttachMojo.java | 25 ++++++++--- .../site/render/AbstractSiteRenderingMojo.java | 11 ++--- .../site/render/ReportDocumentRenderer.java | 16 +++++-- .../maven/plugins/site/render/SiteJarMojo.java | 4 +- .../apache/maven/plugins/site/render/SiteMojo.java | 37 ++++++++-------- .../apache/maven/plugins/site/run/SiteRunMojo.java | 6 ++- src/site/apt/maven-3.apt.vm | 8 ++-- src/site/fml/faq.fml | 4 +- src/site/site.xml | 2 +- .../plugins/site/stubs/SiteMavenProjectStub.java | 4 +- 30 files changed, 326 insertions(+), 181 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
