branch develop-2.x updated (6396631 -> 8877745)
This is an automated email from the git hooks/post-receive script. New change to branch develop-2.x in repository jaxx. See http://git.nuiton.org/jaxx.git from 6396631 Fixes #3833. Merge branch 'feature/3833' into 'develop-2.x' new 9d895ac Remove cobertura report in jaxx-compiler module (Fixes #3838) new 8877745 Utilisation de nuitonpom 5.1 + configuration du scm sur gitlab (Fixes #3834) The 2 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 88777456e886e0fc5b7dfe7f056725a1243c8d4a Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Dec 24 11:46:54 2015 +0100 Utilisation de nuitonpom 5.1 + configuration du scm sur gitlab (Fixes #3834) commit 9d895ac37366233340af1792f8513be6c424d706 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Dec 24 11:33:56 2015 +0100 Remove cobertura report in jaxx-compiler module (Fixes #3838) Summary of changes: jaxx-compiler/pom.xml | 6 ------ pom.xml | 15 +++++++++++---- src/site/site.xml | 9 ++++++++- 3 files changed, 19 insertions(+), 11 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-2.x in repository jaxx. See http://git.nuiton.org/jaxx.git commit 9d895ac37366233340af1792f8513be6c424d706 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Dec 24 11:33:56 2015 +0100 Remove cobertura report in jaxx-compiler module (Fixes #3838) --- jaxx-compiler/pom.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/jaxx-compiler/pom.xml b/jaxx-compiler/pom.xml index 3feab45..0fc3d2d 100644 --- a/jaxx-compiler/pom.xml +++ b/jaxx-compiler/pom.xml @@ -164,12 +164,6 @@ <version>${plexusPluginVersion}</version> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - <version>${coberturaPluginVersion}</version> - </plugin> - </plugins> </reporting> -- 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-2.x in repository jaxx. See http://git.nuiton.org/jaxx.git commit 88777456e886e0fc5b7dfe7f056725a1243c8d4a Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Dec 24 11:46:54 2015 +0100 Utilisation de nuitonpom 5.1 + configuration du scm sur gitlab (Fixes #3834) --- pom.xml | 15 +++++++++++---- src/site/site.xml | 9 ++++++++- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index a354b48..9f3f2e4 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuitonpom</artifactId> - <version>1.8.3</version> + <version>5.1</version> </parent> <artifactId>jaxx</artifactId> @@ -133,6 +133,9 @@ <!-- Remove this if one day we use maven3 API in jaxx 2 --> <helperPluginVersion>2.1</helperPluginVersion> + <pluginPluginVersion>3.3</pluginPluginVersion> + <!-- Remove this if one day we use maven3 API in jaxx 2 --> + <mavenVersion>2.2.1</mavenVersion> <nuitonValidatorVersion>3.0</nuitonValidatorVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion> @@ -142,6 +145,10 @@ <!-- i18n configuration --> <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> + <!--site configuration --> + <locales>fr</locales> + <siteSourcesType>rst</siteSourcesType> + <!-- jnlp configuration --> <jnlpFileName>jaxx-demo.jnlp</jnlpFileName> <jnlpCodebase>http://jaxx.nuiton.org/v/${siteDeployClassifier}/jaxx-demo/jnlp</jnlpCodebase> @@ -159,9 +166,9 @@ <!-- Source control management. --> <scm> - <connection>scm:git:http://git.nuiton.org/jaxx.git</connection> - <developerConnection>scm:git:https://git.nuiton.org/jaxx.git</developerConnection> - <url>https://gitweb.nuiton.org/jaxx.git</url> + <connection>scm:git:git@gitlab.nuiton.org:nuiton/jaxx.git</connection> + <developerConnection>scm:git:git@gitlab.nuiton.org:nuiton/jaxx.git</developerConnection> + <url>https://gitlab.nuiton.org/nuiton/jaxx</url> </scm> <distributionManagement> diff --git a/src/site/site.xml b/src/site/site.xml index 8cf8f97..5a78984 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -40,7 +40,7 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="${siteCommonResourcesUrl}/images/logos/maven-feather.png"/> - <logo href="${siteCommonResourcesUrl}/jrst" name="JRst" + <logo href="http://jrst.nuiton.org" name="JRst" img="${siteCommonResourcesUrl}/images/logos/jrst-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" @@ -104,5 +104,12 @@ <menu ref="reports"/> + <footer> + <div id='mavenProjectProperties' locale='fr' + projectId='${project.projectId}' + version='${project.siteDeployClassifier}' + sourcesType='${project.siteSourcesType}'/> + </footer> + </body> </project> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm