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 9bbb9ffcb965a397e9e2bc481980772a9eb8e052 Merge: c2a612e 4a9fe14 Author: Emmanuel Bourg <[email protected]> Date: Mon Aug 28 22:38:55 2017 +0200 Updated version 3.5 from 'upstream/3.5' with Debian dir de9c24c2bb0954fc0608b2eb79288f77556b59b0 pom.xml | 183 ++++++------------- src/it/MSITE-265/src/site/site.xml | 2 +- src/it/MSITE-312/pom.xml | 69 ------- src/it/MSITE-312/verify.bsh | 94 ---------- src/it/MSITE-604/invoker.properties | 3 + src/it/{interpolation => MSITE-604}/parent/pom.xml | 13 +- src/it/MSITE-604/pom.xml | 10 +- src/it/MSITE-604/verify.groovy | 20 +- src/it/MSITE-609/src/site/site.xml | 2 +- .../src/site/apt/sub => MSITE-723}/index.apt | 25 +-- .../invoker.properties | 2 +- src/it/{interpolation => MSITE-723}/pom.xml | 48 +++-- .../{markdown-format => MSITE-723}/verify.groovy | 4 +- src/it/{markdown-format => doxia-formats}/pom.xml | 38 ++-- .../src/site/apt/apt-macro.apt} | 40 ++-- .../src/site/apt/ignore.txt} | 24 +-- src/it/doxia-formats/src/site/apt/index.apt | 57 ++++++ .../src/site/apt/velocity-context.apt.vm | 146 +++++++++++++++ src/it/doxia-formats/src/site/fml/faq-macro.fml | 60 ++++++ src/it/doxia-formats/src/site/fml/faq.fml | 59 ++++++ .../src/site/fml/ignore.txt} | 24 +-- .../src/site/markdown/ignore.txt} | 24 +-- .../src/site/markdown/markdown-macro.md} | 29 ++- .../src/site/markdown/markdown.md} | 4 + .../src/site/markdown/markdown2-macro.markdown} | 30 ++- .../src/site/markdown/markdown2.markdown} | 4 + .../src/site/site.xml | 18 +- .../src/site/xdoc/ignore.txt} | 24 +-- .../src/site/xdoc/xdoc-macro.xml} | 53 +++--- src/it/doxia-formats/src/site/xdoc/xdoc.xml | 137 ++++++++++++++ .../src/site/xhtml/ignore.txt} | 24 +-- .../src/site/xhtml/xhtml-macro.xhtml} | 41 +++-- src/it/doxia-formats/src/site/xhtml/xhtml.xhtml | 150 +++++++++++++++ .../verify.groovy | 16 +- src/it/effective-site/invoker.properties | 3 +- src/it/effective-site/pom.xml | 6 + src/it/effective-site/src/site/site.xml | 2 +- src/it/effective-site/verify.groovy | 5 +- src/it/failure/invoker.properties | 8 +- src/it/full-reporting/invoker.properties | 3 +- src/it/full-reporting/src/site/apt/index.apt.vm | 2 +- src/it/full-reporting/verify.groovy | 7 +- .../child}/pom.xml | 30 +-- .../child/src/site/apt}/index.apt | 32 ++-- .../child/src/site/apt/pom.apt.vm | 91 ++++++++++ .../invoker.properties | 7 +- .../pom.xml | 25 +-- .../reactor-parent}/pom.xml | 24 +-- .../reactor-parent/src/site/apt}/index.apt | 33 ++-- .../relative-parent}/pom.xml | 24 +-- .../repo-parent}/pom.xml | 41 +++-- .../repo-parent}/src/site/site.xml | 16 +- src/it/inheritance-interpolation/verify.groovy | 48 +++++ src/it/interpolation/verify.bsh | 58 ------ .../invoker.properties | 3 +- src/it/{markdown-format => resources}/pom.xml | 49 +++-- .../src/site/resources/css/maven-base.css} | 4 +- .../src/site/resources/src-site-resources.txt} | 12 -- .../verify.groovy | 16 +- src/it/settings.xml | 3 +- src/it/site-attach-descriptor/src/site/site.xml | 1 + src/it/site-attach-descriptor/src/site/site_sv.xml | 1 + src/it/site-deploy/src/site/site.xml | 2 +- src/it/site-jar/pom.xml | 7 + src/it/site-jar/src/site/site.xml | 2 +- src/it/site-sd-stagingSiteURL/invoker.properties | 1 + src/it/site-sd-stagingSiteURL/verify.groovy | 6 +- src/it/site-skip/skip-site/pom.xml | 3 +- .../invoker.properties | 4 +- src/it/{markdown-format => template-skin}/pom.xml | 60 ++++-- .../src/main/resources/META-INF/maven}/site.vm | 77 ++++++-- .../src/site/apt/index.apt | 0 .../{MSITE-550 => template-skin}/src/site/site.xml | 6 + src/it/{MSITE-550 => template-skin}/verify.bsh | 2 +- .../maven/plugins/site/AbstractSiteMojo.java | 78 +++----- .../plugins/site/deploy/AbstractDeployMojo.java | 28 ++- .../plugins/site/deploy/AbstractStagingMojo.java | 18 +- .../plugins/site/deploy/SiteStageDeployMojo.java | 6 +- .../maven/plugins/site/deploy/SiteStageMojo.java | 19 +- .../site/deploy/wagon/BugFixedRepository.java | 5 +- .../maven/plugins/site/deploy/wagon/PathUtils.java | 5 +- .../descriptor/AbstractSiteDescriptorMojo.java | 123 +++++++++++++ .../site/{ => descriptor}/EffectiveSiteMojo.java | 53 ++---- .../SiteDescriptorArtifactMetadata.java | 4 +- .../{ => descriptor}/SiteDescriptorAttachMojo.java | 15 +- .../site/render/AbstractSiteRenderingMojo.java | 202 ++++++++++----------- .../render/CategorySummaryDocumentRenderer.java | 5 + .../site/render/ReportDocumentRenderer.java | 7 +- .../maven/plugins/site/render/SiteJarMojo.java | 11 +- .../apache/maven/plugins/site/render/SiteMojo.java | 35 ++-- .../apache/maven/plugins/site/run/DoxiaBean.java | 17 +- .../apache/maven/plugins/site/run/DoxiaFilter.java | 33 ++-- .../apache/maven/plugins/site/run/SiteRunMojo.java | 26 ++- src/site/apt/developer-overview.odg | Bin 0 -> 33881 bytes src/site/apt/examples/creating-content.apt.vm | 29 ++- src/site/apt/examples/creatingskins.apt | 16 +- src/site/apt/examples/sitedescriptor.apt | 28 +-- src/site/apt/maven-3.apt.vm | 9 +- src/site/apt/migrate.apt | 35 +++- src/site/fml/faq.fml | 4 +- src/site/site.xml | 4 +- src/site/xdoc/download.xml.vm | 2 +- .../site/deploy/AbstractSiteDeployWebDavTest.java | 17 +- .../site/deploy/SimpleDavServerHandler.java | 4 +- .../plugins/site/deploy/SiteDeployWebDavTest.java | 6 +- .../maven/plugins/site/render/SiteMojoTest.java | 82 --------- .../apache/maven/plugins/site/run/WebXmlTest.java | 65 +++++++ .../plugins/site/stubs/SiteMavenProjectStub.java | 40 ++-- src/test/resources/unit/interpolated-site/pom.xml | 80 -------- .../unit/interpolated-site/src/site/apt/test.apt | 29 --- .../unit/interpolated-site/src/site/site.xml | 43 ----- 111 files changed, 1953 insertions(+), 1431 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
