branch master updated (2c7a9b8 -> 6ca4b5d)
This is an automated email from the git hooks/post-receive script. New change to branch master in repository jrst. See http://git.nuiton.org/jrst.git from 2c7a9b8 Merge branch 'release/2.1' adds 85d0155 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 6a45c8c Merge branch 'master' into develop adds b05bc11 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 662952f fix release process adds a96cec8 Fix gitignore adds a12bbd4 refs #3683: add support for custom classes adds 1848042 Format file adds 9b5f3c2 Fix java 8 compile adds 93fc193 Migration vers gitlab + simplification configuration des sites adds 93f9ac9 Update parent pom adds bfd616b fixes #3684: Revert iText version to 2.1.7 to be compatible with lgpl adds bb11095 refs #3875: Update commons-collections adds 9e36668 refs #3875: Update commons-lang3 adds 2ecd3a3 refs #3875: Update velocity adds 25acdd6 refs #3875: Update jaxen adds 7329044 refs #3875: Update plexus adds f310eca refs #3875: Update xmlunit adds 71b1844 fixes #3875: Update plexus-utils adds 7dc591a Fix compile error adds 2787536 Use nuitonpom 8-SNAPSHOT + doxia 1.7 + maven 3.3.9 (See #3876 #931) adds 2fc271e clean pom unused configuration + move to stable nuitonpom version adds 942af3c fix javadoc adds 7e1f44e [jgitflow-maven-plugin]updating poms for 2.3-SNAPSHOT development adds d90e34e [jgitflow-maven-plugin]updating poms for 2.4-SNAPSHOT development adds f7a58d7 [jgitflow-maven-plugin]updating poms for 2.2 branch with snapshot versions adds 3bb48f0 optimize dependencies adds 1ec94dc [jgitflow-maven-plugin]updating poms for branch'release/2.2' with non-snapshot versions adds 6ca4b5d [jgitflow-maven-plugin]merging 'release/2.2' into 'master' No new revisions were added by this update. Summary of changes: .gitignore | 2 + README.txt => README.md | 0 docutils/.gitignore | 3 + docutils/{README.txt => README.md} | 0 docutils/pom.xml | 2 +- doxia-module-jrst-legacy/.gitignore | 3 + .../README.md | 0 doxia-module-jrst-legacy/pom.xml | 2 +- .../src/license/THIRD-PARTY.properties | 12 +- doxia-module-jrst/.gitignore | 3 + doxia-module-jrst/{README.txt => README.md} | 0 doxia-module-jrst/pom.xml | 2 +- .../src/license/THIRD-PARTY.properties | 12 +- jrst-doc/.gitignore | 2 + jrst/README.txt => jrst-doc/README.md | 0 jrst-doc/pom.xml | 4 +- jrst-site-util/.gitignore | 3 + .../README.txt => jrst-site-util/README.md | 0 jrst-site-util/pom.xml | 21 +- jrst-site-util/src/license/THIRD-PARTY.properties | 12 +- .../java/org/nuiton/jrst/AbstractJrstParser.java | 4 +- .../main/java/org/nuiton/jrst/JrstSiteModule.java | 8 +- .../java/org/nuiton/jrst/JrstSiteRenderer.java | 8 +- .../src/main/java/org/nuiton/jrst/ReflectUtil.java | 4 +- jrst/.gitignore | 3 + jrst-doc/README.txt => jrst/README.md | 0 jrst/pom.xml | 14 +- jrst/src/license/THIRD-PARTY.properties | 13 +- jrst/src/main/java/org/nuiton/jrst/JRST.java | 18 +- .../main/java/org/nuiton/jrst/JRSTGenerator.java | 2 +- .../java/org/nuiton/jrst/JRSTResourceResolver.java | 4 +- .../java/org/nuiton/jrst/JRSTToXmlStrategy.java | 4 +- .../org/nuiton/jrst/JRSTToXmlStrategyDocutils.java | 4 +- .../nuiton/jrst/JRSTToXmlStrategyJRSTReader.java | 4 +- .../main/java/org/nuiton/jrst/JRSTUserAgent.java | 6 +- .../java/org/nuiton/jrst/legacy/JRSTLexer.java | 12 +- .../java/org/nuiton/jrst/legacy/JRSTReader.java | 4 +- .../java/org/nuiton/jrst/ui/BaseActionPanel.java | 6 +- .../java/org/nuiton/jrst/ui/FileEditorHandler.java | 4 +- .../java/org/nuiton/jrst/ui/JRSTCommandModel.java | 4 +- .../java/org/nuiton/jrst/ui/JRSTViewHandler.java | 4 +- jrst/src/main/resources/xsl/rst2xhtml.xsl | 1008 ++++++++++---------- .../java/org/nuiton/jrst/JRSTAbstractTest.java | 11 +- .../java/org/nuiton/jrst/JRSTGeneratorTest.java | 6 +- .../java/org/nuiton/jrst/bugs/AdmonitionTest.java | 6 +- .../java/org/nuiton/jrst/bugs/DirectiveTest.java | 6 - .../test/java/org/nuiton/jrst/bugs/ErrorsTest.java | 2 - .../bugs/{AdmonitionTest.java => HtmlTest.java} | 38 +- .../test/java/org/nuiton/jrst/bugs/OptionTest.java | 2 - .../test/java/org/nuiton/jrst/bugs/TableTest.java | 8 - .../test/java/org/nuiton/jrst/bugs/TextTest.java | 17 - .../test/java/org/nuiton/jrst/bugs/TitlesTest.java | 14 +- .../test/resources/bugs/testCustomClasses3683.rst | 107 +++ maven-jrst-plugin/.gitignore | 3 + pom.xml | 130 ++- src/site/site_en.xml | 7 + src/site/site_fr.xml | 7 + 57 files changed, 855 insertions(+), 730 deletions(-) rename README.txt => README.md (100%) create mode 100644 docutils/.gitignore rename docutils/{README.txt => README.md} (100%) create mode 100644 doxia-module-jrst-legacy/.gitignore rename jrst-site-util/README.txt => doxia-module-jrst-legacy/README.md (100%) create mode 100644 doxia-module-jrst/.gitignore rename doxia-module-jrst/{README.txt => README.md} (100%) create mode 100644 jrst-doc/.gitignore rename jrst/README.txt => jrst-doc/README.md (100%) create mode 100644 jrst-site-util/.gitignore rename doxia-module-jrst-legacy/README.txt => jrst-site-util/README.md (100%) create mode 100644 jrst/.gitignore rename jrst-doc/README.txt => jrst/README.md (100%) copy jrst/src/test/java/org/nuiton/jrst/bugs/{AdmonitionTest.java => HtmlTest.java} (61%) create mode 100644 jrst/src/test/resources/bugs/testCustomClasses3683.rst create mode 100644 maven-jrst-plugin/.gitignore -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm