Author: tchemit Date: 2008-08-12 22:55:31 +0000 (Tue, 12 Aug 2008) New Revision: 117 Modified: trunk/lutinproject/pom.xml Log: improve site phase and fix some small errors Modified: trunk/lutinproject/pom.xml =================================================================== --- trunk/lutinproject/pom.xml 2008-08-12 15:04:36 UTC (rev 116) +++ trunk/lutinproject/pom.xml 2008-08-12 22:55:31 UTC (rev 117) @@ -61,7 +61,8 @@ <description>Projet Maven de reference pour l'ensemble des autres projets Maven.</description> - <url>http://${labs.host}/projects/${pom.artifactId}</url> + <!-- BE WARE, will be suffixed by /${pom.artifactId} by inheritance --> + <url>http://${labs.host}/projects</url> <inceptionYear>1999</inceptionYear> @@ -175,36 +176,35 @@ <!-- ************************************************************* --> <properties> - <!-- override this property to define labs project's id (or his parent)--> + <!-- Set this value in your pom --> <!--labs.id>10</labs.id--> - <!-- override this property if the current project is a module of a labs project : put here the real labs project name --> + <!-- change this in your pom if your pom is a module of a labs' project --> <labs.project>${pom.artifactId}</labs.project> <!-- override this property to define scm url property --> - <!--maven.scm.url>https://${labs.host}/plugins/scmsvn/viewcvs.php/?root=${labs.project}</maven.scm.url--> + <maven.scm.url>https://${labs.host}/plugins/scmsvn/viewcvs.php/trunk/${labs.project}?root=${labs.project} + </maven.scm.url> - <!-- override this property to define scm url property --> - <!--maven.scm.developerConnection>scm:svn:svn+ssh:${username}@${labs.host}/svnroot/${labs.project}/trunk</maven.scm.developerConnection--> + <!-- BEWARE, will be suffixed by /${pom.artifactId} by inheritance --> + <maven.scm.developerConnection>scm:svn:svn+ssh://${username}@${labs.host}/svnroot/${labs.project}/trunk + </maven.scm.developerConnection> - <!-- override this property to define scm url property --> - <!--maven.scm.connection>scm:svn:svn:anonymous@${labs.host}/svnroot/${labs.project}/trunk</maven.scm.connection--> + <!-- BEWARE, will be suffixed by /${pom.artifactId} by inheritance --> + <maven.scm.connection>scm:svn:svn://anonymous@${labs.host}/svnroot/${labs.project}/trunk</maven.scm.connection> <!-- labs host --> <labs.host>labs.libre-entreprise.org</labs.host> <!-- labs list host --> - <labs.list.host>list.labs.libre-entreprise.org</labs.list.host> + <labs.list.host>lists.labs.libre-entreprise.org</labs.list.host> <!-- labs builder host --> - <labs.builder.host>lutinbuilder.labs.libre-entreprise.org</labs.builder.host> + <labs.builder.url>http://lutinbuilder.labs.libre-entreprise.org/maven2</labs.builder.url> <!-- by default, maven is quiet --> <maven.verbose>false</maven.verbose> - <!-- by default, skip test --> - <!--maven.test.skip>true</maven.test.skip--> - <!-- by default, java sources are in java 1.6 --> <maven.compile.source>1.6</maven.compile.source> @@ -223,6 +223,8 @@ <!-- where to generate site --> <maven.site.gen.dir>${basedir}/target/generated-site</maven.site.gen.dir> + <!-- to allow bad tests --> + <maven.test.testFailureIgnore>false</maven.test.testFailureIgnore> </properties> <packaging>pom</packaging> @@ -267,24 +269,20 @@ </resource> </resources> - <!--testResources> - <testResource> - <directory>${maven.src.dir}/test</directory> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </testResource> - </testResources--> - + <testSourceDirectory>${maven.src.dir}/test/java</testSourceDirectory> <pluginManagement> <plugins> - <!-- jaxx --> + <!-- - - - - - - - - - - - --> + <!-- PHASE PROCESS-SOURCES --> + <!-- - - - - - - - - - - - --> + + <!-- plugin jaxx --> <!--plugin> <groupId>org.codelutin.jaxx</groupId> <artifactId>maven-jaxx-plugin</artifactId> - <version>0.3</version> + <version>0.4</version> <executions> <execution> <id>generate jaxx</id> @@ -295,16 +293,11 @@ </executions> </plugin--> - <!-- resources --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <configuration> - <encoding>${maven.compile.encoding}</encoding> - </configuration> - </plugin> + <!-- - - - - - - - - - - - - --> + <!-- PHASE GENERATE-RESOURCES --> + <!-- - - - - - - - - - - - - --> - <!-- i18n --> + <!-- plugin i18n --> <plugin> <groupId>lutinplugin</groupId> <artifactId>maven-i18n-plugin</artifactId> @@ -322,9 +315,26 @@ </configuration> </plugin> - <!-- compiler --> + <!-- - - - - - - - - --> + <!-- PHASE RESOURCES --> + <!-- - - - - - - - - --> + + <!-- plugin resources --> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <configuration> + <encoding>${maven.compile.encoding}</encoding> + </configuration> + </plugin> + + <!-- - - - - - - - --> + <!-- PHASE COMPILE --> + <!-- - - - - - - - --> + + <!-- plugin compiler --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> <source>${maven.compile.source}</source> @@ -333,12 +343,18 @@ </configuration> </plugin> - <!-- surefire --> + <!-- - - - - - --> + <!-- PHASE TEST --> + <!-- - - - - - --> + + <!-- plugin surefire --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> <skip>${maven.test.skip}</skip> + <testFailureIgnore>${maven.test.testFailureIgnore}</testFailureIgnore> + <forkMode>never</forkMode> <!--Exclude NaughtyTest.java--> <!--<includes> <include>**/*Test.java</include> @@ -349,7 +365,11 @@ </configuration> </plugin> - <!-- dependency --> + <!-- - - - - - - - - --> + <!-- - PHASE PACKAGE --> + <!-- - - - - - - - - --> + + <!-- plugin dependency --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> @@ -368,7 +388,7 @@ </executions> </plugin> - <!-- war --> + <!-- plugin war --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> @@ -378,7 +398,7 @@ </configuration> </plugin> - <!-- jar --> + <!-- plugin jar --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> @@ -394,7 +414,11 @@ </configuration> </plugin> - <!-- source --> + <!-- - - - - - - - --> + <!-- PHASE VERIFY --> + <!-- - - - - - - - --> + + <!-- plugin source --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> @@ -408,7 +432,7 @@ </executions> </plugin> - <!-- javadoc --> + <!-- plugin javadoc --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> @@ -426,22 +450,26 @@ </executions> </plugin> - <!-- jrst --> + <!-- - - - - - - - --> + <!-- PHASE PRE-SITE --> + <!-- - - - - - - - --> + + <!-- plugin jrst --> <plugin> <groupId>lutinplugin</groupId> <artifactId>maven-jrst-plugin</artifactId> <version>0.8</version> <configuration> <directoryIn>${maven.src.dir}/site</directoryIn> - <directoryOut>${maven.gen.site.dir}/xdoc</directoryOut> + <directoryOut>${maven.site.gen.dir}</directoryOut> <verbose>${maven.verbose}</verbose> <defaultLocale>fr</defaultLocale> + <inputEncoding>${maven.compile.encoding}</inputEncoding> + <outputEncoding>${maven.compile.encoding}</outputEncoding> </configuration> <executions> <execution> - <id>jrst</id> - <phase>test</phase> - <!--phase>pre-site</phase--> + <phase>pre-site</phase> <goals> <goal>jrst</goal> </goals> @@ -449,7 +477,11 @@ </executions> </plugin> - <!-- site --> + <!-- - - - - - --> + <!-- PHASE SITE --> + <!-- - - - - - --> + + <!-- plugin site --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> @@ -459,13 +491,14 @@ <configuration> <siteDirectory>${maven.site.gen.dir}</siteDirectory> <xdocDirectory>${maven.site.gen.dir}/xdoc/fr/rst</xdocDirectory> + <inputEncoding>${maven.compile.encoding}</inputEncoding> <outputEncoding>${maven.compile.encoding}</outputEncoding> <generateReports>${maven.reports.generate}</generateReports> <locales>fr</locales> </configuration> </plugin> - <!-- plugin --> + <!-- plugin plugin --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> @@ -491,12 +524,13 @@ </pluginManagement> <plugins> - - <!--plugin> + <!-- always compute javadoc jar --> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - </plugin--> + </plugin> + <!-- always compute source jar --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> @@ -556,12 +590,11 @@ <reporting> <plugins> <!--Site report's plugin--> - <!-- can not allowed this! otherwise when defining a plugin it will not work... --> <!--plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-plugin-plugin</artifactId> + <artifactId>maven-report-plugin</artifactId> <configuration> - <outputDirectory>target/site-build/xdoc</outputDirectory> + <outputDirectory>${maven.site.gen.dir}/xdoc</outputDirectory> </configuration> </plugin--> @@ -569,7 +602,9 @@ <plugin> <!--License--> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.0.1-cl</version> + <version>2.1</version> + <!--version>2.0.1-cl</version--> + </plugin> <plugin> @@ -594,6 +629,24 @@ </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + </plugin> + + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-pmd-plugin</artifactId> + <configuration> + <linkXref>true</linkXref> + <sourceEncoding>${maven.compile.encoding}</sourceEncoding> + <minimumTokens>100</minimumTokens> + <targetJdk>${maven.compile.target}</targetJdk> + </configuration> + + </plugin> + + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>jxr-maven-plugin</artifactId> </plugin> @@ -625,7 +678,7 @@ <issueManagement> <system>gforge</system> - <url>http://${labs.host}/tracker/?group_id=${labs.id}/</url> + <url>http://${labs.host}/tracker/?group_id=${labs.id}</url> </issueManagement> <!-- add ciManagement @@ -635,10 +688,10 @@ <!--Any mailing lists for the project--> <mailingLists> <mailingList> - <name>${pom.artifactId}-commit</name> - <subscribe>http://${labs.list.host}/mailman/listinfo/${pom.artifactId}-commit</subscribe> - <unsubscribe>http://${labs.list.host}/mailman/listinfo/${pom.artifactId}-commit</unsubscribe> - <archive>http://${labs.list.host}/pipermail/${pom.artifactId}-commit/</archive> + <name>${pom.artifactId}-commits</name> + <subscribe>http://${labs.list.host}/mailman/listinfo/${pom.artifactId}-commits</subscribe> + <unsubscribe>http://${labs.list.host}/mailman/listinfo/${pom.artifactId}-commits</unsubscribe> + <archive>http://${labs.list.host}/pipermail/${pom.artifactId}-commits/</archive> </mailingList> <mailingList> @@ -655,46 +708,25 @@ <archive>http://${labs.list.host}/pipermail/${pom.artifactId}-user/</archive> </mailingList> - <mailingList> + <!--mailingList> <name>${pom.artifactId}-bugreport</name> <subscribe>http://${labs.list.host}/mailman/listinfo/${pom.artifactId}-bugreport</subscribe> <unsubscribe>http://${labs.list.host}/mailman/listinfo/${pom.artifactId}-bugreport</unsubscribe> <archive>http://${labs.list.host}/pipermail/${pom.artifactId}-bugreport/</archive> - </mailingList> + </mailingList--> </mailingLists> <!--Source control management--> - <!--the version control repository and http url for on line access - the connection element has the form: - scm:<system>:<system specific connection string>--> - <!--scm> - <url>http://cvs.labs.libre-entreprise.org/cgi-bin/cvsweb.cgi/?cvsroot=${pom.artifactId}</url> - <connection>scm:cvs:pserver:anonymous@cvs.labs.libre-entreprise.org:/cvsroot/${pom.artifactId}:${pom.artifactId} - </connection> - <developerConnection> - scm:cvs:ext:${username}@cvs.labs.libre-entreprise.org:/cvsroot/${pom.artifactId}:${pom.artifactId} - </developerConnection> - </scm--> - <scm> - <!-- BE WARE, if your project is a real labs project, you have to - override this property in your pom, otherwise maven will suffix this - value with /${pom.artifactId}. - You just have to copy the same definition for this property in your pom - --> + <!-- BE WARE, this value will be overriden by inheritance --> <connection>${maven.scm.connection}</connection> - <!-- BE WARE, if your project is a real labs project, you have to - override this property in your pom, otherwise maven will suffix this - value with /${pom.artifactId}. - You just have to copy the same definition for this property in your pom - --> + + <!-- BE WARE, this value will be overriden by inheritance --> <developerConnection>${maven.scm.developerConnection}</developerConnection> - <!-- BE WARE, if your project is not a real labs project says a module - of a real labs's project, you have to override this property in - your pom, otherwise maven will suffix this value with /${pom.artifactId}. - You just have to copy the same definition for this property in your pom - --> - <url>${maven.scm.url}</url> + + <!-- BE WARE, this value will be overriden by inheritance, so while scm.url can not ber suffixed, you must defined + these property in your pom, there is no other better solution... --> + <!--url>${maven.scm.url}</url--> </scm> <!-- ************************************************************* --> @@ -713,7 +745,7 @@ <repository> <id>codelutin-repository</id> <name>CodeLutinRepository</name> - <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> + <url>${labs.builder.url}</url> </repository> </repositories> @@ -747,7 +779,6 @@ <activeByDefault>true</activeByDefault> </activation> <properties> - <!-- test (par defaut, on ne les execute pas) --> <maven.test.skip>true</maven.test.skip> <maven.reports.generate>false</maven.reports.generate> </properties> @@ -758,7 +789,6 @@ <activeByDefault>false</activeByDefault> </activation> <properties> - <!-- test (par defaut, on les execute) --> <maven.test.skip>false</maven.test.skip> <maven.reports.generate>false</maven.reports.generate> </properties> @@ -769,8 +799,7 @@ <activeByDefault>false</activeByDefault> </activation> <properties> - <!-- test (par defaut, on ne les execute pas) --> - <maven.test.skip>true</maven.test.skip> + <maven.test.skip>false</maven.test.skip> <maven.reports.generate>true</maven.reports.generate> </properties> </profile>