Author: tchemit Date: 2010-04-12 10:08:04 +0200 (Mon, 12 Apr 2010) New Revision: 866 Log: - Evolution #487: Add all reports in a profile to speed up site generation - Evolution #484: Add common checkstyle configuration (REJECTED) - Improve license project descriptor configuration Removed: trunk/mavenpom4labs/src/license/project.xml Modified: trunk/pom.xml trunk/src/license/project.xml Deleted: trunk/mavenpom4labs/src/license/project.xml =================================================================== --- trunk/mavenpom4labs/src/license/project.xml 2010-04-10 20:50:54 UTC (rev 865) +++ trunk/mavenpom4labs/src/license/project.xml 2010-04-12 08:08:04 UTC (rev 866) @@ -1,56 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!-- - #%L - Mavenpom4labs - - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ - $HeadURL$ - %% - Copyright (C) 2009 - 2010 CodeLutin - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Lesser Public License for more details. - - You should have received a copy of the GNU General Lesser Public - License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. - #L% ---> -<project xmlns="http://maven-site.nuiton.org/maven-license-plugin/1.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven-site.nuiton.org/maven-license-plugin/1.0.0 http://maven-site.nuiton.org/maven-license-plugin/licenseProject-1.0.0.xsd"> - <mainLicense>gpl_v3</mainLicense> - <licenseSets> - <licenseSet> - <fileSets> - - <fileSet> - <headerType>apt</headerType> - <basedir>src/site</basedir> - <includes> - <include>**/*.apt</include> - </includes> - </fileSet> - - <fileSet> - <headerType>xml</headerType> - <basedir>src/site</basedir> - <includes> - <include>**/*.xml</include> - </includes> - </fileSet> - - </fileSets> - </licenseSet> - </licenseSets> -</project> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-10 20:50:54 UTC (rev 865) +++ trunk/pom.xml 2010-04-12 08:08:04 UTC (rev 866) @@ -656,124 +656,10 @@ </build> - <!--Site--> <reporting> - <plugins> - - <!-- - The Project Info Reports Plugin has twelve goals: - see http://maven.apache.org/plugins/maven-project-info-reports-plugin - --> - <plugin> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.1.2</version> - <configuration> - <dependencyDetailsEnabled>${maven.reports.dependencyDetailsEnabled}</dependencyDetailsEnabled> - <dependencyLocationsEnabled>${maven.reports.dependencyLocationsEnabled}</dependencyLocationsEnabled> - </configuration> - <reportSets> - <reportSet> - <reports> - <report>project-team</report> - <report>mailing-list</report> - <report>cim</report> - <report>issue-tracking</report> - <report>license</report> - <report>scm</report> - <report>dependencies</report> - <report>dependency-convergence</report> - <report>plugin-management</report> - <report>plugins</report> - <report>dependency-management</report> - <report>summary</report> - </reports> - </reportSet> - </reportSets> - </plugin> - - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <version>${javadoc.version}</version> - <configuration> - <docencoding>${project.build.sourceEncoding}</docencoding> - <encoding>${project.build.sourceEncoding}</encoding> - <charset>${project.reporting.outputEncoding}</charset> - <quiet>${maven.javadoc.quiet}</quiet> - <skip>${maven.javadoc.skip}</skip> - <links> - <link>http://java.sun.com/javase/6/docs/api/</link> - </links> - <excludePackageNames>${maven.javadoc.excludePackageNames} - </excludePackageNames> - <tagletArtifacts> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>${maven-plugin-tools-javadoc.version}</version> - </tagletArtifact> - <tagletArtifact> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-javadoc</artifactId> - <version>${plexus-component-javadoc.version}</version> - </tagletArtifact> - </tagletArtifacts> - </configuration> - <reportSets> - <reportSet> - <reports> - <report>javadoc</report> - <report>test-javadoc</report> - </reports> - </reportSet> - </reportSets> - </plugin> - - <!-- changelog:changelog - changelog:dev-activity - changelog:file-activity --> - <!--FIXME : TC-20090816 : there is a bug with fileactivity - in report, trunk url are prefix with tag/xxx-releaseNumber !--> - <plugin> - <artifactId>maven-changelog-plugin</artifactId> - <version>2.1</version> - <!--configuration> - <displayFileDetailUrl>http://svn.${platform}/svn/${projectId}%FILE%</displayFileDetailUrl> - </configuration--> - </plugin> - - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.5</version> - <configuration> - <encoding>${project.reporting.outputEncoding}</encoding> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - <version>2.4</version> - <configuration> - <linkXRef>true</linkXRef> - <sourceEncoding>${project.reporting.outputEncoding}</sourceEncoding> - <minimumTokens>100</minimumTokens> - <targetJdk>${maven.compile.target}</targetJdk> - </configuration> - - </plugin> - - <plugin> - <artifactId>maven-jxr-plugin</artifactId> - <version>2.1</version> - </plugin> - - <plugin> - <artifactId>maven-surefire-report-plugin</artifactId> - <version>2.5</version> - </plugin> - - </plugins> + <excludeDefaults>true</excludeDefaults> </reporting> - + <!-- ************************************************************* --> <!-- *** Maven Environment *************************************** --> <!-- ************************************************************* --> @@ -914,26 +800,6 @@ <fail>true</fail> </configuration> </execution> - <execution> - <id>ensure-license-project-descriptor</id> - <goals> - <goal>enforce</goal> - </goals> - <!--<phase>initialize</phase>--> - <configuration> - <rules> - <requireFilesExist> - <files> - <file>${license.descriptor}</file> - </files> - </requireFilesExist> - </rules> - <ignoreCache>true</ignoreCache> - <failFast>true</failFast> - <fail>true</fail> - - </configuration> - </execution> </executions> </plugin> @@ -958,7 +824,138 @@ </build> </profile> + <!-- 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> + + <!-- + The Project Info Reports Plugin has twelve goals: + see http://maven.apache.org/plugins/maven-project-info-reports-plugin + --> + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>2.1.2</version> + <configuration> + <dependencyDetailsEnabled>${maven.reports.dependencyDetailsEnabled}</dependencyDetailsEnabled> + <dependencyLocationsEnabled>${maven.reports.dependencyLocationsEnabled}</dependencyLocationsEnabled> + </configuration> + <reportSets> + <reportSet> + <reports> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependencies</report> + <report>dependency-convergence</report> + <report>plugin-management</report> + <report>plugins</report> + <report>dependency-management</report> + <report>summary</report> + </reports> + </reportSet> + </reportSets> + </plugin> + + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>${javadoc.version}</version> + <configuration> + <docencoding>${project.build.sourceEncoding}</docencoding> + <encoding>${project.build.sourceEncoding}</encoding> + <charset>${project.reporting.outputEncoding}</charset> + <quiet>${maven.javadoc.quiet}</quiet> + <skip>${maven.javadoc.skip}</skip> + <links> + <link>http://java.sun.com/javase/6/docs/api/</link> + </links> + <excludePackageNames>${maven.javadoc.excludePackageNames} + </excludePackageNames> + <tagletArtifacts> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>${maven-plugin-tools-javadoc.version}</version> + </tagletArtifact> + <tagletArtifact> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-javadoc</artifactId> + <version>${plexus-component-javadoc.version}</version> + </tagletArtifact> + </tagletArtifacts> + </configuration> + <reportSets> + <reportSet> + <reports> + <report>javadoc</report> + <report>test-javadoc</report> + </reports> + </reportSet> + </reportSets> + </plugin> + + <!-- changelog:changelog + changelog:dev-activity + changelog:file-activity --> + <!--FIXME : TC-20090816 : there is a bug with fileactivity + in report, trunk url are prefix with tag/xxx-releaseNumber !--> + <plugin> + <artifactId>maven-changelog-plugin</artifactId> + <version>2.1</version> + <!--configuration> + <displayFileDetailUrl>http://svn.${platform}/svn/${projectId}%FILE%</displayFileDetailUrl> + </configuration--> + </plugin> + + <!-- TC-20100412 Remove since 2.1 : can not simply share configuration --> + <!--plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.5</version> + <configuration> + <encoding>${project.reporting.outputEncoding}</encoding> + </configuration> + </plugin--> + + <plugin> + <artifactId>maven-pmd-plugin</artifactId> + <version>2.4</version> + <configuration> + <linkXRef>true</linkXRef> + <!--<sourceEncoding>${project.reporting.outputEncoding}</sourceEncoding>--> + <minimumTokens>100</minimumTokens> + <targetJdk>${maven.compile.target}</targetJdk> + </configuration> + + </plugin> + + <plugin> + <artifactId>maven-jxr-plugin</artifactId> + <version>2.1</version> + </plugin> + + <plugin> + <artifactId>maven-surefire-report-plugin</artifactId> + <version>2.5</version> + </plugin> + + </plugins> + </reporting> + + </profile> + + <profile> <id>release-sign-artifacts</id> <activation> <property> @@ -1102,34 +1099,7 @@ <build> <defaultGoal>process-resources</defaultGoal> <plugins> - <plugin> - <artifactId>maven-enforcer-plugin</artifactId> - <executions> - <execution> - <id>ensure-license-project-descriptor</id> - <goals> - <goal>enforce</goal> - </goals> - <phase>initialize</phase> - <configuration> - <rules> - <requireFilesExist> - <files> - <file>${license.descriptor}</file> - </files> - </requireFilesExist> - </rules> - <ignoreCache>true</ignoreCache> - <failFast>true</failFast> - <fail>true</fail> - - </configuration> - </execution> - </executions> - </plugin> - - <plugin> <groupId>org.nuiton</groupId> <artifactId>maven-license-plugin</artifactId> <executions> Modified: trunk/src/license/project.xml =================================================================== --- trunk/src/license/project.xml 2010-04-10 20:50:54 UTC (rev 865) +++ trunk/src/license/project.xml 2010-04-12 08:08:04 UTC (rev 866) @@ -28,30 +28,27 @@ --> <project xmlns="http://maven-site.nuiton.org/maven-license-plugin/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven-site.nuiton.org/maven-license-plugin/1.0.0 http://maven-site.nuiton.org/maven-license-plugin/licenseProject-1.0.0.xsd"> + xsi:schemaLocation="http://maven-site.nuiton.org/maven-license-plugin/1.0.0 http://maven-site.nuiton.org/maven-license-plugin/licenseProjectDescriptor-1.0.0.xsd"> <mainLicense>lgpl_v3</mainLicense> - <licenseSets> - <licenseSet> - <!--<licenseName>lgpl_v3</licenseName>--> - <fileSets> + + <headers> - <fileSet> - <headerType>apt</headerType> - <basedir>src/site</basedir> - <includes> - <include>**/*.apt</include> - </includes> - </fileSet> + <header> + <commentStyle>apt</commentStyle> + <fileSet> + <basedir>src/site</basedir> + <include>**/*.apt</include> + </fileSet> + </header> - <fileSet> - <headerType>xml</headerType> - <basedir>src/site</basedir> - <includes> - <include>**/*.xml</include> - </includes> - </fileSet> + <header> + <commentStyle>xml</commentStyle> + <fileSet> + <basedir>src/site</basedir> + <include>**/*.xml</include> + </fileSet> + </header> - </fileSets> - </licenseSet> - </licenseSets> + </headers> + </project>