branch develop updated (7dc591a -> 2787536)
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 7dc591a Fix compile error new 2787536 Use nuitonpom 8-SNAPSHOT + doxia 1.7 + maven 3.3.9 (See #3876 #931) The 1 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 27875369c4378ca958ad8c04ae968047af3c69cf Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Feb 27 18:07:50 2016 +0100 Use nuitonpom 8-SNAPSHOT + doxia 1.7 + maven 3.3.9 (See #3876 #931) Summary of changes: README.txt => README.md | 0 docutils/{README.txt => README.md} | 0 .../README.txt => doxia-module-jrst-legacy/README.md | 0 doxia-module-jrst/{README.txt => README.md} | 0 jrst/README.txt => jrst-doc/README.md | 0 .../README.txt => jrst-site-util/README.md | 0 jrst-site-util/pom.xml | 2 +- .../src/main/java/org/nuiton/jrst/JrstSiteModule.java | 4 ++-- jrst-doc/README.txt => jrst/README.md | 0 pom.xml | 18 ++++++------------ 10 files changed, 9 insertions(+), 15 deletions(-) rename README.txt => README.md (100%) rename docutils/{README.txt => README.md} (100%) rename jrst-site-util/README.txt => doxia-module-jrst-legacy/README.md (100%) rename doxia-module-jrst/{README.txt => README.md} (100%) rename jrst/README.txt => jrst-doc/README.md (100%) rename doxia-module-jrst-legacy/README.txt => jrst-site-util/README.md (100%) rename jrst-doc/README.txt => jrst/README.md (100%) -- 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 27875369c4378ca958ad8c04ae968047af3c69cf Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Feb 27 18:07:50 2016 +0100 Use nuitonpom 8-SNAPSHOT + doxia 1.7 + maven 3.3.9 (See #3876 #931) --- README.txt => README.md | 0 docutils/{README.txt => README.md} | 0 .../README.txt => doxia-module-jrst-legacy/README.md | 0 doxia-module-jrst/{README.txt => README.md} | 0 jrst/README.txt => jrst-doc/README.md | 0 .../README.txt => jrst-site-util/README.md | 0 jrst-site-util/pom.xml | 2 +- .../src/main/java/org/nuiton/jrst/JrstSiteModule.java | 4 ++-- jrst-doc/README.txt => jrst/README.md | 0 pom.xml | 18 ++++++------------ 10 files changed, 9 insertions(+), 15 deletions(-) diff --git a/README.txt b/README.md similarity index 100% rename from README.txt rename to README.md diff --git a/docutils/README.txt b/docutils/README.md similarity index 100% rename from docutils/README.txt rename to docutils/README.md diff --git a/jrst-site-util/README.txt b/doxia-module-jrst-legacy/README.md similarity index 100% rename from jrst-site-util/README.txt rename to doxia-module-jrst-legacy/README.md diff --git a/doxia-module-jrst/README.txt b/doxia-module-jrst/README.md similarity index 100% rename from doxia-module-jrst/README.txt rename to doxia-module-jrst/README.md diff --git a/jrst/README.txt b/jrst-doc/README.md similarity index 100% rename from jrst/README.txt rename to jrst-doc/README.md diff --git a/doxia-module-jrst-legacy/README.txt b/jrst-site-util/README.md similarity index 100% rename from doxia-module-jrst-legacy/README.txt rename to jrst-site-util/README.md diff --git a/jrst-site-util/pom.xml b/jrst-site-util/pom.xml index 7ea79b1..f71f583 100644 --- a/jrst-site-util/pom.xml +++ b/jrst-site-util/pom.xml @@ -78,7 +78,7 @@ <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> + <artifactId>maven-core</artifactId> </dependency> <dependency> diff --git a/jrst-site-util/src/main/java/org/nuiton/jrst/JrstSiteModule.java b/jrst-site-util/src/main/java/org/nuiton/jrst/JrstSiteModule.java index 737d483..af7445f 100644 --- a/jrst-site-util/src/main/java/org/nuiton/jrst/JrstSiteModule.java +++ b/jrst-site-util/src/main/java/org/nuiton/jrst/JrstSiteModule.java @@ -41,8 +41,8 @@ public class JrstSiteModule extends AbstractParserModule { } @Override - public String getExtension() { - return "rst"; + public String[] getExtensions() { + return new String[]{"rst"}; } @Override diff --git a/jrst-doc/README.txt b/jrst/README.md similarity index 100% rename from jrst-doc/README.txt rename to jrst/README.md diff --git a/pom.xml b/pom.xml index 2b4d290..b6c84cb 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuitonpom</artifactId> - <version>6</version> + <version>8-SNAPSHOT</version> </parent> <artifactId>jrst</artifactId> @@ -102,23 +102,17 @@ <url>https://gitlab.nuiton.org/nuiton/jrst</url> </scm> - <distributionManagement> - <site> - <id>${site.server}</id> - <url>${site.url}</url> - </site> - </distributionManagement> - <properties> <projectId>jrst</projectId> + <ciViewId>JRst</ciViewId> - <doxiaVersion>1.6</doxiaVersion> - <doxiaSitetoolsVersion>1.6</doxiaSitetoolsVersion> + <doxiaVersion>1.7</doxiaVersion> + <doxiaSitetoolsVersion>1.7</doxiaSitetoolsVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion> <xalanVersion>2.7.1</xalanVersion> <jaxxVersion>2.28.2</jaxxVersion> - <mavenVersion>2.2.1</mavenVersion> + <mavenVersion>3.3.9</mavenVersion> <!-- site configuration --> @@ -334,7 +328,7 @@ <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> + <artifactId>maven-core</artifactId> <version>${mavenVersion}</version> <scope>provided</scope> </dependency> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm