This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository doxia-sitetools.
commit 9c854c19c9f1b2c659b294338f3adc5d1940cbdc Merge: 835aea3 2c6d98f Author: Emmanuel Bourg <[email protected]> Date: Fri Jul 28 12:06:59 2017 +0200 Updated version 1.7.1 from 'upstream/1.7.1' with Debian dir ba9856c75271975a76f325ddbe7e998cf881a54b doxia-decoration-model/pom.xml | 11 +- ...DefaultDecorationModelInheritanceAssembler.java | 37 +- doxia-decoration-model/src/main/mdo/decoration.mdo | 22 +- ...> DecorationModelInheritanceAssemblerTest.java} | 44 +- ...ce.xml => inheritance-child-no-inheritance.xml} | 0 .../resources/{child.xml => inheritance-child.xml} | 0 .../{merged.xml => inheritance-expected.xml} | 0 .../{parent.xml => inheritance-parent.xml} | 0 doxia-doc-renderer/pom.xml | 6 +- doxia-integration-tools/pom.xml | 2 +- .../apache/maven/doxia/tools/DefaultSiteTool.java | 77 ++-- doxia-integration-tools/src/site/apt/index.apt | 35 +- doxia-integration-tools/src/site/site.xml | 4 + .../org/apache/maven/doxia/tools/SiteToolTest.java | 61 ++- .../tools/stubs/SiteToolMavenProjectStub.java | 37 +- .../unit/interpolation-child-test/pom.xml | 10 +- .../interpolation-child-test/src/site/site.xml | 6 +- .../unit/interpolation-parent-test/pom.xml | 9 +- .../interpolation-parent-test/src/site/site.xml | 20 +- doxia-site-renderer/pom.xml | 35 +- .../doxia/siterenderer/DefaultSiteRenderer.java | 24 +- .../doxia/siterenderer/SkinResourceLoader.java | 5 +- .../main/resources/META-INF/plexus/components.xml | 64 --- .../{default-site.vm => default-site-macros.vm} | 82 +--- .../doxia/siterenderer/resources/default-site.vm | 457 +-------------------- doxia-site-renderer/src/site/apt/index.apt.vm | 8 +- doxia-site-renderer/src/site/site.xml | 5 + .../siterenderer/DefaultSiteRendererTest.java | 38 +- .../maven/doxia/siterenderer/EntitiesVerifier.java | 38 +- .../maven/doxia/siterenderer/FaqVerifier.java | 97 +++-- .../maven/doxia/siterenderer/HeadVerifier.java | 30 +- .../doxia/siterenderer/JavascriptVerifier.java | 14 +- .../doxia/siterenderer/MultipleBlockVerifier.java | 21 +- .../doxia/siterenderer/NestedItemsVerifier.java | 131 +++--- doxia-skin-model/pom.xml | 2 +- pom.xml | 31 +- src/site/site.xml | 2 +- 37 files changed, 551 insertions(+), 914 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/doxia-sitetools.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
