Author: tchemit Date: 2011-07-07 14:50:47 +0200 (Thu, 07 Jul 2011) New Revision: 1127 Url: http://nuiton.org/repositories/revision/mavenpom/1127 Log: updates docs + improve sonar management Modified: trunk/mavenpom4labs/pom.xml trunk/mavenpom4labs/src/site/apt/minimalpom.apt trunk/mavenpom4labs/src/site/en/apt/minimalpom.apt trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/apt/minimalpom.apt trunk/mavenpom4redmine/pom.xml trunk/mavenpom4redmine/src/site/apt/minimalpom.apt trunk/pom.xml trunk/src/site/apt/index.apt Modified: trunk/mavenpom4labs/pom.xml =================================================================== --- trunk/mavenpom4labs/pom.xml 2011-07-07 10:51:07 UTC (rev 1126) +++ trunk/mavenpom4labs/pom.xml 2011-07-07 12:50:47 UTC (rev 1127) @@ -128,10 +128,10 @@ <!--<scmwebeditorEnabled>false</scmwebeditorEnabled>--> <!-- sonar still stay on nuiton server --> - <sonar.host.url>http://hudson.nuiton.org/sonar</sonar.host.url> + <sonar.host.url>http://sonar.nuiton.org/sonar</sonar.host.url> <!-- ceux qui utilisent mavenpom4labs sont sur le labs --> - <site.server>labs</site.server> + <!--<site.server>labs</site.server>--> <site.repository>scpexe://${platform}/home/groups/${projectId}/htdocs</site.repository> <!-- customize maven-nuiton-skin --> @@ -159,28 +159,28 @@ <!-- Maven Environment : profiles --> <profiles> - <!-- profile with all reports (include in release process) --> - <profile> - <id>reporting</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> + <!--<!– profile with all reports (include in release process) –>--> + <!--<profile>--> + <!--<id>reporting</id>--> + <!--<activation>--> + <!--<property>--> + <!--<name>performRelease</name>--> + <!--<value>true</value>--> + <!--</property>--> + <!--</activation>--> - <!--Site--> - <reporting> - <plugins> - <plugin> - <groupId>org.codehaus.sonar-plugins</groupId> - <artifactId>maven-report</artifactId> - <version>${sonarReportPluginVersion}</version> - </plugin> - </plugins> - </reporting> + <!--<!–Site–>--> + <!--<reporting>--> + <!--<plugins>--> + <!--<plugin>--> + <!--<groupId>org.codehaus.sonar-plugins</groupId>--> + <!--<artifactId>maven-report</artifactId>--> + <!--<version>${sonarReportPluginVersion}</version>--> + <!--</plugin>--> + <!--</plugins>--> + <!--</reporting>--> - </profile> + <!--</profile>--> <!-- perform only on a release stage when using the maven-release-plugin --> <profile> Modified: trunk/mavenpom4labs/src/site/apt/minimalpom.apt =================================================================== --- trunk/mavenpom4labs/src/site/apt/minimalpom.apt 2011-07-07 10:51:07 UTC (rev 1126) +++ trunk/mavenpom4labs/src/site/apt/minimalpom.apt 2011-07-07 12:50:47 UTC (rev 1127) @@ -51,7 +51,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.0.2</version> + <version>3.0</version> </parent> <groupId>com.myorganisation</groupId> @@ -66,7 +66,7 @@ <description>TODO</description> <inceptionYear>2009</inceptionYear> - <url>http://myproject.labs.libre-entreprise.org/myproject</url> + <url>http://myproject.${platform}/myproject</url> <organization> <name>mycompany</name> @@ -163,9 +163,9 @@ </issueManagement> <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/myproject/myproject/trunk</connection> - <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/myproject/myproject/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/myproject/trunk/?root=myproject</url> + <connection>scm:svn:svn://anonymous@${platform}/svnroot/myproject/myproject/trunk</connection> + <developerConnection>scm:svn:svn+ssh://${username}@${platform}/svnroot/myproject/myproject/trunk</developerConnection> + <url>http://${platform}/plugins/scmsvn/viewcvs.php/myproject/trunk/?root=myproject</url> </scm> <repositories> Modified: trunk/mavenpom4labs/src/site/en/apt/minimalpom.apt =================================================================== --- trunk/mavenpom4labs/src/site/en/apt/minimalpom.apt 2011-07-07 10:51:07 UTC (rev 1126) +++ trunk/mavenpom4labs/src/site/en/apt/minimalpom.apt 2011-07-07 12:50:47 UTC (rev 1127) @@ -52,7 +52,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.0.2</version> + <version>3.0</version> </parent> <groupId>com.myorganisation</groupId> @@ -164,9 +164,9 @@ </issueManagement> <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/myproject/myproject/trunk</connection> - <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/myproject/myproject/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/myproject/trunk/?root=myproject</url> + <connection>scm:svn:svn://anonymous@${platform}/svnroot/myproject/myproject/trunk</connection> + <developerConnection>scm:svn:svn+ssh://${username}@${platform}/svnroot/myproject/myproject/trunk</developerConnection> + <url>http://${platform}/plugins/scmsvn/viewcvs.php/myproject/trunk/?root=myproject</url> </scm> <repositories> Modified: trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/apt/minimalpom.apt =================================================================== --- trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/apt/minimalpom.apt 2011-07-07 10:51:07 UTC (rev 1126) +++ trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/apt/minimalpom.apt 2011-07-07 12:50:47 UTC (rev 1127) @@ -52,7 +52,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.0.2</version> + <version>3.0</version> </parent> <artifactId>myProject</artifactId> @@ -85,9 +85,9 @@ <!-- Source control management. --> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/myProject/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/myProject/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/myProject/trunk</url> + <connection>scm:svn:http://svn.${platform}/svn/myProject/trunk</connection> + <developerConnection>scm:svn:http://svn.${platform}/svn/myProject/trunk</developerConnection> + <url>http://www.${platform}/repositories/browse/myProject/trunk</url> </scm> <!-- ************************************************************* --> @@ -105,7 +105,7 @@ <siteLocales>fr,en</siteLocales> <!-- if documentation is not in rst format, overrides it --> - <siteSourcesType>apt</siteSourcesType> + <siteSourcesType>rst</siteSourcesType> </properties> <build> Modified: trunk/mavenpom4redmine/pom.xml =================================================================== --- trunk/mavenpom4redmine/pom.xml 2011-07-07 10:51:07 UTC (rev 1126) +++ trunk/mavenpom4redmine/pom.xml 2011-07-07 12:50:47 UTC (rev 1127) @@ -148,7 +148,7 @@ target/${project.artifactId}-${project.version}-full.zip </redmine.libReleaseFiles> - <sonar.host.url>http://hudson.nuiton.org/sonar</sonar.host.url> + <!--<sonar.host.url>http://sonar.nuiton.org/sonar</sonar.host.url>--> <!-- pour casser l'héritage depuis mavenpom --> <site.repository>${our.site.repository}</site.repository> @@ -177,30 +177,30 @@ <profiles> <!-- profile with all reports (include in release process) --> - <profile> - <id>reporting</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> + <!--<profile>--> + <!--<id>reporting</id>--> + <!--<activation>--> + <!--<property>--> + <!--<name>performRelease</name>--> + <!--<value>true</value>--> + <!--</property>--> + <!--</activation>--> - <!--Site--> - <reporting> - <plugins> - <plugin> - <groupId>org.codehaus.sonar-plugins</groupId> - <artifactId>maven-report</artifactId> - <version>${sonarReportPluginVersion}</version> - <!--configuration> - <sonar.host.url>http://hudson.${platform}/sonar</sonar.host.url> - </configuration--> - </plugin> - </plugins> - </reporting> + <!--<!–Site–>--> + <!--<reporting>--> + <!--<plugins>--> + <!--<plugin>--> + <!--<groupId>org.codehaus.sonar-plugins</groupId>--> + <!--<artifactId>maven-report</artifactId>--> + <!--<version>${sonarReportPluginVersion}</version>--> + <!--<!–configuration>--> + <!--<sonar.host.url>http://hudson.${platform}/sonar</sonar.host.url>--> + <!--</configuration–>--> + <!--</plugin>--> + <!--</plugins>--> + <!--</reporting>--> - </profile> + <!--</profile>--> <!-- perform only on a release stage when using the maven-release-plugin --> <profile> Modified: trunk/mavenpom4redmine/src/site/apt/minimalpom.apt =================================================================== --- trunk/mavenpom4redmine/src/site/apt/minimalpom.apt 2011-07-07 10:51:07 UTC (rev 1126) +++ trunk/mavenpom4redmine/src/site/apt/minimalpom.apt 2011-07-07 12:50:47 UTC (rev 1127) @@ -52,7 +52,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.2</version> + <version>3.0</version> </parent> <artifactId>myProject</artifactId> @@ -85,9 +85,9 @@ <!-- Source control management. --> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/myProject/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/myProject/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/myProject/trunk</url> + <connection>scm:svn:http://svn.${platform}/svn/myProject/trunk</connection> + <developerConnection>scm:svn:http://svn.${platform}/svn/myProject/trunk</developerConnection> + <url>http://www.${platform}/repositories/browse/myProject/trunk</url> </scm> <!-- ************************************************************* --> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-07 10:51:07 UTC (rev 1126) +++ trunk/pom.xml 2011-07-07 12:50:47 UTC (rev 1127) @@ -210,7 +210,7 @@ <site.repository>${our.site.repository}</site.repository> <!-- server to use for site --> - <site.server>nuiton.org</site.server> + <site.server>${platform}</site.server> <!-- default encoding --> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -225,6 +225,9 @@ <!-- 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> + <mavenVersion>2.2.1</mavenVersion> <antVersion>1.8.2</antVersion> @@ -1148,6 +1151,12 @@ <version>${surefirePluginVersion}</version> </plugin> + <plugin> + <groupId>org.codehaus.sonar-plugins</groupId> + <artifactId>maven-report</artifactId> + <version>${sonarReportPluginVersion}</version> + </plugin> + <!--plugin> <groupId>net.sf</groupId> <artifactId>stat-scm</artifactId> Modified: trunk/src/site/apt/index.apt =================================================================== --- trunk/src/site/apt/index.apt 2011-07-07 10:51:07 UTC (rev 1126) +++ trunk/src/site/apt/index.apt 2011-07-07 12:50:47 UTC (rev 1127) @@ -35,6 +35,65 @@ Le projet <mavenpom> est un pom de type <Corporate> dont héritent tous les projets {{{http://www.codelutin.com}code Lutin}}. + +* Nouveautés de la version 3.0 + + La version 3.0 survient avec une nouvelle forge http://forge.codelutin.com + + Cette forge est basée sur redmine et cela a nécessité du coup de revoir + légèrementl'utilisation de la variable <<platform>> et des serveurs dans le + <<settings.xml>>. + +** Modification du settings.xml + + Il faut donc ajouter les serveurs suivants (dans le <<settings.xml>>) : + +------------------------------------------------------------------------------- + <!-- depot site maven sur nuiton.org --> + <server> + <id>nuiton.org</id> + <username>publish</username> + <filePermissions>664</filePermissions> + <directoryPermissions>775</directoryPermissions> + </server> + + + <!-- depot maven + site maven sur chorem.org --> + <server> + <id>chorem.org</id> + <username>publish</username> + <filePermissions>664</filePermissions> + <directoryPermissions>775</directoryPermissions> + </server> + + <!-- depot maven + site maven sur forge.codelutin.com --> + <server> + <id>forge.codelutin.com</id> + <username>publish</username> + <filePermissions>664</filePermissions> + <directoryPermissions>775</directoryPermissions> + </server> + + <!-- depot maven + site maven sur le labs --> + <server> + <id>labs.libre-entreprise.org</id> + <username>votre login sur le labs</username> + <filePermissions>664</filePermissions> + <directoryPermissions>775</directoryPermissions> + </server> + + <!-- login to forge.codelutin.com --> + <server> + <id>redmine-forge.codelutin.com</id> + <username>votre login sur le redmine forge.codelutin.com </username> + <password>{votre password encodé sur forge.codelutin.com}</password> + </server> + +------------------------------------------------------------------------------- + +** Migration des projets + + * Nouveautés de la version 2.5 Depuis la version <<2.5>>, chaque librairie ou plugin utilisé dans le mavenpom