Author: bleny Date: 2012-02-02 10:49:06 +0100 (Thu, 02 Feb 2012) New Revision: 1207 Url: http://nuiton.org/repositories/revision/mavenpom/1207 Log: #1920 Fix continuous integration and qa urls Modified: trunk/mavenpom4labs/pom.xml trunk/pom.xml trunk/src/site/apt/properties.apt.vm Modified: trunk/mavenpom4labs/pom.xml =================================================================== --- trunk/mavenpom4labs/pom.xml 2012-02-02 08:55:17 UTC (rev 1206) +++ trunk/mavenpom4labs/pom.xml 2012-02-02 09:49:06 UTC (rev 1207) @@ -125,10 +125,10 @@ <platform>labs.libre-entreprise.org</platform> <!-- sonar still stay on nuiton server --> - <sonar.host.url>http://sonar.nuiton.org/sonar</sonar.host.url> + <qa.host.url>http://qa.nuiton.org/sonar</qa.host.url> <!-- jenkins still stay on nuiton server --> - <jenkins.host.url>http://jenkins.nuiton.org/jenkins</jenkins.host.url> + <ci.host.url>http://ci.nuiton.org/jenkins</ci.host.url> <!-- ceux qui utilisent mavenpom4labs sont sur le labs --> <!--<site.server>labs</site.server>--> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-02-02 08:55:17 UTC (rev 1206) +++ trunk/pom.xml 2012-02-02 09:49:06 UTC (rev 1207) @@ -115,7 +115,7 @@ <ciManagement> <system>hudson</system> - <url>${jenkins.host.url}/job/${projectId}</url> + <url>${ci.host.url}/job/${projectId}</url> </ciManagement> <!--Any mailing lists for the project--> @@ -219,11 +219,11 @@ <!-- le fichier de license du projet --> <maven.license.file>${project.basedir}/LICENSE.txt</maven.license.file> - <!-- url of the sonar --> - <sonar.host.url>http://sonar.${platform}/sonar</sonar.host.url> + <!-- url of the quality assurance platform --> + <qa.host.url>http://qa.${platform}/sonar</qa.host.url> - <!-- url of the jenkins --> - <jenkins.host.url>http://jenkins.${platform}/jenkins</jenkins.host.url> + <!-- url of the continuous integration platform --> + <ci.host.url>http://ci.${platform}/jenkins</ci.host.url> <mavenVersion>2.2.1</mavenVersion> <antVersion>1.8.2</antVersion> Modified: trunk/src/site/apt/properties.apt.vm =================================================================== --- trunk/src/site/apt/properties.apt.vm 2012-02-02 08:55:17 UTC (rev 1206) +++ trunk/src/site/apt/properties.apt.vm 2012-02-02 09:49:06 UTC (rev 1207) @@ -274,9 +274,9 @@ *--------------------------------------+--------------------------------------------------------+ | {{maven.javadoc.quiet}} | <<true>> | *--------------------------------------+--------------------------------------------------------+ -| {{sonar.host.url}} | <<http://sonar.(platform)/sonar>> | +| {{ci.host.url}} | <<http://ci.(platform)/sonar>> | *--------------------------------------+--------------------------------------------------------+ -| {{jenkins.host.url}} | <<http://jenkins.(platform)/jenkins>> | +| {{qa.host.url}} | <<http://qa.(platform)/jenkins>> | *--------------------------------------+--------------------------------------------------------+ * Propriétés pour les déployements