branch develop updated (e0a977f -> 41f1d83)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository jrst. See http://git.nuiton.org/jrst.git from e0a977f [jgitflow-maven-plugin]updating poms for 2.3-SNAPSHOT development new 7b79e59 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds f7a58d7 [jgitflow-maven-plugin]updating poms for 2.2 branch with snapshot versions new 3bb48f0 optimize dependencies new 1ec94dc [jgitflow-maven-plugin]updating poms for branch'release/2.2' with non-snapshot versions new 6ca4b5d [jgitflow-maven-plugin]merging 'release/2.2' into 'master' new 08a9b62 [jgitflow-maven-plugin]merging 'master' into 'develop' new 41f1d83 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 41f1d8318386b568515cef570e5da017f2fd542c Author: Maven Release <maven-release@codelutin.com> Date: Sun Feb 28 17:56:15 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 08a9b62a31578c4d6b19cf7519baaaec0b24d57d Merge: 7b79e59 6ca4b5d Author: Maven Release <maven-release@codelutin.com> Date: Sun Feb 28 17:56:14 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 7b79e59fe56fd39391a7795d55a2edb121e6698a Author: Maven Release <maven-release@codelutin.com> Date: Sun Feb 28 17:56:14 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 6ca4b5dacdebbe733687ade2e859aa7a7e4c2e93 Merge: 2c7a9b8 1ec94dc Author: Maven Release <maven-release@codelutin.com> Date: Sun Feb 28 17:56:12 2016 +0100 [jgitflow-maven-plugin]merging 'release/2.2' into 'master' commit 1ec94dcb0796b5602bf9729a77da34bc027814b8 Author: Maven Release <maven-release@codelutin.com> Date: Sun Feb 28 17:52:33 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/2.2' with non-snapshot versions commit 3bb48f0b96d58012810a54e06a27668142b21c23 Author: Maven Release <maven-release@codelutin.com> Date: Sun Feb 28 17:52:26 2016 +0100 optimize dependencies Summary of changes: jrst-site-util/pom.xml | 5 +++++ pom.xml | 7 +++++++ 2 files changed, 12 insertions(+) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jrst. See http://git.nuiton.org/jrst.git commit 3bb48f0b96d58012810a54e06a27668142b21c23 Author: Maven Release <maven-release@codelutin.com> Date: Sun Feb 28 17:52:26 2016 +0100 optimize dependencies --- jrst-site-util/pom.xml | 5 +++++ pom.xml | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/jrst-site-util/pom.xml b/jrst-site-util/pom.xml index f71f583..746f7a1 100644 --- a/jrst-site-util/pom.xml +++ b/jrst-site-util/pom.xml @@ -136,6 +136,11 @@ </dependency> <dependency> + <groupId>org.eclipse.sisu</groupId> + <artifactId>org.eclipse.sisu.plexus</artifactId> + </dependency> + + <dependency> <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> <!--<scope>runtime</scope>--> diff --git a/pom.xml b/pom.xml index 74dad24..bca7210 100644 --- a/pom.xml +++ b/pom.xml @@ -418,6 +418,13 @@ </dependency> <dependency> + <groupId>org.eclipse.sisu</groupId> + <artifactId>org.eclipse.sisu.plexus</artifactId> + <version>0.3.2</version> + <scope>provided</scope> + </dependency> + + <dependency> <groupId>org.python</groupId> <artifactId>jython-standalone</artifactId> <version>2.7.0</version> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jrst. See http://git.nuiton.org/jrst.git commit 1ec94dcb0796b5602bf9729a77da34bc027814b8 Author: Maven Release <maven-release@codelutin.com> Date: Sun Feb 28 17:52:33 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/2.2' with non-snapshot versions --- docutils/pom.xml | 2 +- doxia-module-jrst-legacy/pom.xml | 2 +- doxia-module-jrst/pom.xml | 2 +- jrst-doc/pom.xml | 2 +- jrst-site-util/pom.xml | 2 +- jrst/pom.xml | 2 +- pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docutils/pom.xml b/docutils/pom.xml index cc2c933..34a9903 100644 --- a/docutils/pom.xml +++ b/docutils/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.2</version> </parent> <groupId>org.nuiton.jrst</groupId> diff --git a/doxia-module-jrst-legacy/pom.xml b/doxia-module-jrst-legacy/pom.xml index b9582e5..6e5ae9c 100644 --- a/doxia-module-jrst-legacy/pom.xml +++ b/doxia-module-jrst-legacy/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.2</version> </parent> <groupId>org.nuiton.jrst</groupId> diff --git a/doxia-module-jrst/pom.xml b/doxia-module-jrst/pom.xml index bfed51b..073568e 100644 --- a/doxia-module-jrst/pom.xml +++ b/doxia-module-jrst/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.2</version> </parent> <groupId>org.nuiton.jrst</groupId> diff --git a/jrst-doc/pom.xml b/jrst-doc/pom.xml index 00d8a21..29cbea3 100644 --- a/jrst-doc/pom.xml +++ b/jrst-doc/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.2</version> </parent> <groupId>org.nuiton.jrst</groupId> diff --git a/jrst-site-util/pom.xml b/jrst-site-util/pom.xml index 746f7a1..faa1961 100644 --- a/jrst-site-util/pom.xml +++ b/jrst-site-util/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.2</version> </parent> <groupId>org.nuiton.jrst</groupId> diff --git a/jrst/pom.xml b/jrst/pom.xml index a9b5998..aed16fc 100644 --- a/jrst/pom.xml +++ b/jrst/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.2</version> </parent> <groupId>org.nuiton.jrst</groupId> diff --git a/pom.xml b/pom.xml index bca7210..31ddc14 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ </parent> <artifactId>jrst</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.2</version> <packaging>pom</packaging> <name>JRst</name> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jrst. See http://git.nuiton.org/jrst.git commit 6ca4b5dacdebbe733687ade2e859aa7a7e4c2e93 Merge: 2c7a9b8 1ec94dc Author: Maven Release <maven-release@codelutin.com> Date: Sun Feb 28 17:56:12 2016 +0100 [jgitflow-maven-plugin]merging 'release/2.2' into 'master' .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(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jrst. See http://git.nuiton.org/jrst.git commit 7b79e59fe56fd39391a7795d55a2edb121e6698a Author: Maven Release <maven-release@codelutin.com> Date: Sun Feb 28 17:56:14 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- docutils/pom.xml | 2 +- doxia-module-jrst-legacy/pom.xml | 2 +- doxia-module-jrst/pom.xml | 2 +- jrst-doc/pom.xml | 2 +- jrst-site-util/pom.xml | 2 +- jrst/pom.xml | 2 +- pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docutils/pom.xml b/docutils/pom.xml index f04b713..34a9903 100644 --- a/docutils/pom.xml +++ b/docutils/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.2</version> </parent> <groupId>org.nuiton.jrst</groupId> diff --git a/doxia-module-jrst-legacy/pom.xml b/doxia-module-jrst-legacy/pom.xml index 56c768e..6e5ae9c 100644 --- a/doxia-module-jrst-legacy/pom.xml +++ b/doxia-module-jrst-legacy/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.2</version> </parent> <groupId>org.nuiton.jrst</groupId> diff --git a/doxia-module-jrst/pom.xml b/doxia-module-jrst/pom.xml index 1b40e6a..073568e 100644 --- a/doxia-module-jrst/pom.xml +++ b/doxia-module-jrst/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.2</version> </parent> <groupId>org.nuiton.jrst</groupId> diff --git a/jrst-doc/pom.xml b/jrst-doc/pom.xml index f53060f..29cbea3 100644 --- a/jrst-doc/pom.xml +++ b/jrst-doc/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.2</version> </parent> <groupId>org.nuiton.jrst</groupId> diff --git a/jrst-site-util/pom.xml b/jrst-site-util/pom.xml index b52f2d6..01567f7 100644 --- a/jrst-site-util/pom.xml +++ b/jrst-site-util/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.2</version> </parent> <groupId>org.nuiton.jrst</groupId> diff --git a/jrst/pom.xml b/jrst/pom.xml index 7ff453d..aed16fc 100644 --- a/jrst/pom.xml +++ b/jrst/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.2</version> </parent> <groupId>org.nuiton.jrst</groupId> diff --git a/pom.xml b/pom.xml index b7f1318..d6a4ebd 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ </parent> <artifactId>jrst</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.2</version> <packaging>pom</packaging> <name>JRst</name> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jrst. See http://git.nuiton.org/jrst.git commit 08a9b62a31578c4d6b19cf7519baaaec0b24d57d Merge: 7b79e59 6ca4b5d Author: Maven Release <maven-release@codelutin.com> Date: Sun Feb 28 17:56:14 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' jrst-site-util/pom.xml | 5 +++++ pom.xml | 7 +++++++ 2 files changed, 12 insertions(+) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jrst. See http://git.nuiton.org/jrst.git commit 41f1d8318386b568515cef570e5da017f2fd542c Author: Maven Release <maven-release@codelutin.com> Date: Sun Feb 28 17:56:15 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- docutils/pom.xml | 2 +- doxia-module-jrst-legacy/pom.xml | 2 +- doxia-module-jrst/pom.xml | 2 +- jrst-doc/pom.xml | 2 +- jrst-site-util/pom.xml | 2 +- jrst/pom.xml | 2 +- pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docutils/pom.xml b/docutils/pom.xml index 34a9903..f04b713 100644 --- a/docutils/pom.xml +++ b/docutils/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.2</version> + <version>2.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> diff --git a/doxia-module-jrst-legacy/pom.xml b/doxia-module-jrst-legacy/pom.xml index 6e5ae9c..56c768e 100644 --- a/doxia-module-jrst-legacy/pom.xml +++ b/doxia-module-jrst-legacy/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.2</version> + <version>2.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> diff --git a/doxia-module-jrst/pom.xml b/doxia-module-jrst/pom.xml index 073568e..1b40e6a 100644 --- a/doxia-module-jrst/pom.xml +++ b/doxia-module-jrst/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.2</version> + <version>2.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> diff --git a/jrst-doc/pom.xml b/jrst-doc/pom.xml index 29cbea3..f53060f 100644 --- a/jrst-doc/pom.xml +++ b/jrst-doc/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.2</version> + <version>2.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> diff --git a/jrst-site-util/pom.xml b/jrst-site-util/pom.xml index faa1961..40afcef 100644 --- a/jrst-site-util/pom.xml +++ b/jrst-site-util/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.2</version> + <version>2.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> diff --git a/jrst/pom.xml b/jrst/pom.xml index aed16fc..7ff453d 100644 --- a/jrst/pom.xml +++ b/jrst/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.2</version> + <version>2.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> diff --git a/pom.xml b/pom.xml index 31ddc14..8db5dfc 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ </parent> <artifactId>jrst</artifactId> - <version>2.2</version> + <version>2.3-SNAPSHOT</version> <packaging>pom</packaging> <name>JRst</name> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm