This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository doxia.
commit 3cb3bcf03611272a06c8181b2d5fe23f55a7faa9 Merge: 20665bc 3375c13 Author: Emmanuel Bourg <[email protected]> Date: Thu Jul 27 22:58:14 2017 +0200 Updated version 1.6 from 'upstream/1.6' with Debian dir 3f522e260fdc99cfdbb0f9dad4bd0f856085d009 doxia-core/pom.xml | 8 +- .../maven/doxia/macro/snippet/SnippetMacro.java | 11 +- .../maven/doxia/macro/snippet/SnippetReader.java | 33 +++++- .../doxia/module/site/AbstractSiteModule.java | 3 +- .../apache/maven/doxia/module/site/SiteModule.java | 6 +- .../site/manager/DefaultSiteModuleManager.java | 3 +- .../module/site/manager/SiteModuleManager.java | 5 +- .../site/manager/SiteModuleNotFoundException.java | 3 +- .../apache/maven/doxia/parser/AbstractParser.java | 4 +- .../module/AbstractParserModule.java} | 32 ++++-- .../parser/module/DefaultParserModuleManager.java | 72 ++++++++++++ .../module/ParserModule.java} | 14 +-- .../module/ParserModuleManager.java} | 31 ++--- .../module/ParserModuleNotFoundException.java} | 25 ++-- .../doxia/macro/snippet/SnippetMacroTest.java | 18 +++ .../maven/doxia/parser/AbstractParserTest.java | 14 ++- .../apache/maven/doxia/sink/AbstractSinkTest.java | 52 +++++++-- .../apache/maven/doxia/sink/TestAbstractSink.java | 48 ++++++++ .../test/resources/macro/snippet/testSnippet.txt | 4 + doxia-logging-api/pom.xml | 2 +- doxia-modules/doxia-module-apt/pom.xml | 2 +- .../maven/doxia/module/apt/AptParserModule.java | 42 +++---- doxia-modules/doxia-module-confluence/pom.xml | 2 +- .../module/confluence/ConfluenceParserModule.java | 42 +++---- .../confluence/parser/ChildBlocksBuilder.java | 8 +- doxia-modules/doxia-module-docbook-simple/pom.xml | 2 +- .../doxia/module/docbook/DocBookParserModule.java | 42 +++---- doxia-modules/doxia-module-fml/pom.xml | 2 +- .../apache/maven/doxia/module/fml/FmlParser.java | 4 +- .../maven/doxia/module/fml/FmlParserModule.java | 42 +++---- doxia-modules/doxia-module-fo/pom.xml | 2 +- .../maven/doxia/module/fo/FoAggregateSinkTest.java | 23 +++- .../apache/maven/doxia/module/fo/FoSinkTest.java | 12 +- doxia-modules/doxia-module-itext/pom.xml | 2 +- doxia-modules/doxia-module-latex/pom.xml | 2 +- doxia-modules/doxia-module-markdown/pom.xml | 2 +- .../doxia/module/markdown/MarkdownParser.java | 37 +++++- .../module/markdown/MarkdownParserModule.java | 41 +++---- .../doxia/module/markdown/MarkdownParserTest.java | 27 ++++- .../src/test/resources/html-content.md | 18 +++ .../src/test/resources/metadata.md | 6 +- doxia-modules/doxia-module-rtf/pom.xml | 2 +- doxia-modules/doxia-module-twiki/pom.xml | 2 +- .../doxia/module/twiki/TWikiParserModule.java | 42 +++---- doxia-modules/doxia-module-xdoc/pom.xml | 2 +- .../maven/doxia/module/xdoc/XdocParserModule.java | 42 +++---- doxia-modules/doxia-module-xhtml/pom.xml | 2 +- .../maven/doxia/module/xhtml/XhtmlParser.java | 6 +- .../doxia/module/xhtml/XhtmlParserModule.java | 42 +++---- doxia-modules/pom.xml | 2 +- doxia-sink-api/pom.xml | 2 +- doxia-test-docs/pom.xml | 2 +- pom.xml | 40 +++++-- src/site/resources/download.cgi | 22 ++++ src/site/site.xml | 7 +- src/site/xdoc/download.xml.vm | 126 +++++++++++++++++++++ src/site/xdoc/index.xml | 7 +- 57 files changed, 750 insertions(+), 346 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/doxia.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
