April 2010 - Mavenpom-commits - mailman.cloud.codelutin.com

r874 - in trunk: . mavenpom4labs mavenpom4redmine
by tchemit＠users.nuiton.org 12 Apr '10

12 Apr '10

Author: tchemit Date: 2010-04-12 13:58:14 +0200 (Mon, 12 Apr 2010) New Revision: 874 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/mavenpom4labs/pom.xml trunk/mavenpom4redmine/pom.xml trunk/pom.xml Modified: trunk/mavenpom4labs/pom.xml =================================================================== --- trunk/mavenpom4labs/pom.xml 2010-04-12 11:58:12 UTC (rev 873) +++ trunk/mavenpom4labs/pom.xml 2010-04-12 11:58:14 UTC (rev 874) @@ -37,7 +37,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.1</version> + <version>2.1.1-SNAPSHOT</version> </parent> <artifactId>mavenpom4labs</artifactId> Modified: trunk/mavenpom4redmine/pom.xml =================================================================== --- trunk/mavenpom4redmine/pom.xml 2010-04-12 11:58:12 UTC (rev 873) +++ trunk/mavenpom4redmine/pom.xml 2010-04-12 11:58:14 UTC (rev 874) @@ -37,7 +37,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.1</version> + <version>2.1.1-SNAPSHOT</version> </parent> <artifactId>mavenpom4redmine</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-12 11:58:12 UTC (rev 873) +++ trunk/pom.xml 2010-04-12 11:58:14 UTC (rev 874) @@ -37,7 +37,7 @@ <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.1</version> + <version>2.1.1-SNAPSHOT</version> <modules> <module>mavenpom4redmine</module> @@ -250,10 +250,10 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/mavenpom/tags/mavenpom-2.1</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/mavenpom/tags/mavenpom-2.1 + <connection>scm:svn:http://svn.nuiton.org/svn/mavenpom/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/mavenpom/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/mavenpom/tags/mavenpom-2.1</url> + <url>http://www.nuiton.org/repositories/browse/mavenpom/trunk</url> </scm>

1 0

r873 - in tags: . mavenpom-2.1
by tchemit＠users.nuiton.org 12 Apr '10

12 Apr '10

Author: tchemit Date: 2010-04-12 13:58:12 +0200 (Mon, 12 Apr 2010) New Revision: 873 Log: [maven-release-plugin] copy for tag mavenpom-2.1 Added: tags/mavenpom-2.1/ Property changes on: tags/mavenpom-2.1 ___________________________________________________________________ Added: svn:ignore + .classpath .project target THIRD-PARTY.txt catalog.xml *.iml *.ipr *.iws Added: svn:mergeinfo + /branches/mavenpom-2.x:726-751

1 0

r872 - in trunk: . mavenpom4labs mavenpom4redmine
by tchemit＠users.nuiton.org 12 Apr '10

12 Apr '10

Author: tchemit Date: 2010-04-12 13:58:05 +0200 (Mon, 12 Apr 2010) New Revision: 872 Log: [maven-release-plugin] prepare release mavenpom-2.1 Modified: trunk/mavenpom4labs/pom.xml trunk/mavenpom4redmine/pom.xml trunk/pom.xml Modified: trunk/mavenpom4labs/pom.xml =================================================================== --- trunk/mavenpom4labs/pom.xml 2010-04-12 11:56:07 UTC (rev 871) +++ trunk/mavenpom4labs/pom.xml 2010-04-12 11:58:05 UTC (rev 872) @@ -26,9 +26,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -39,7 +37,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.1-SNAPSHOT</version> + <version>2.1</version> </parent> <artifactId>mavenpom4labs</artifactId> @@ -119,7 +117,7 @@ <properties> - <labs.id/> + <labs.id /> <labs.list.host>lists.${platform}</labs.list.host> @@ -221,20 +219,15 @@ <configuration> <tasks>  - <taskdef - resource="net/sf/antcontrib/antcontrib.properties"/> + <taskdef resource="net/sf/antcontrib/antcontrib.properties" /> <if> - <equals arg1="${siteSourcesType}" arg2="rst"/> + <equals arg1="${siteSourcesType}" arg2="rst" /> <then> - <echo - message="Copy changelog.txt to src/site/rst/release-note.rst"/> - <copy verbose="${maven.verbose}" failonerror="false" - overwrite="false" file="changelog.txt" - tofile="src/site/rst/release-note.rst"/> + <echo message="Copy changelog.txt to src/site/rst/release-note.rst" /> + <copy verbose="${maven.verbose}" failonerror="false" overwrite="false" file="changelog.txt" tofile="src/site/rst/release-note.rst" /> </then> <else> - <echo - message="Skip Copy changelog.txt to src/site/rst/release-note.rst (not rst documentation)"/> + <echo message="Skip Copy changelog.txt to src/site/rst/release-note.rst (not rst documentation)" /> </else> </if> Modified: trunk/mavenpom4redmine/pom.xml =================================================================== --- trunk/mavenpom4redmine/pom.xml 2010-04-12 11:56:07 UTC (rev 871) +++ trunk/mavenpom4redmine/pom.xml 2010-04-12 11:58:05 UTC (rev 872) @@ -26,9 +26,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -39,7 +37,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.1-SNAPSHOT</version> + <version>2.1</version> </parent> <artifactId>mavenpom4redmine</artifactId> @@ -135,7 +133,7 @@ <redmine.deploymentUrl>${repository.home.url}</redmine.deploymentUrl>  - <redmine.releaseFiles/> + <redmine.releaseFiles />  <redmine.libReleaseFiles> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-12 11:56:07 UTC (rev 871) +++ trunk/pom.xml 2010-04-12 11:58:05 UTC (rev 872) @@ -27,9 +27,7 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -39,7 +37,7 @@ <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.1-SNAPSHOT</version> + <version>2.1</version> <modules> <module>mavenpom4redmine</module> @@ -252,10 +250,10 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/mavenpom/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/mavenpom/trunk + <connection>scm:svn:http://svn.nuiton.org/svn/mavenpom/tags/mavenpom-2.1</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/mavenpom/tags/mavenpom-2.1 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/mavenpom/trunk</url> + <url>http://www.nuiton.org/repositories/browse/mavenpom/tags/mavenpom-2.1</url> </scm>  @@ -1261,7 +1259,7 @@ <redmine.collectedArtifacts>target/collect-artifacts.txt</redmine.collectedArtifacts> <redmine.deploymentUrl>${repository.home.url}</redmine.deploymentUrl>  - <redmine.releaseFiles/> + <redmine.releaseFiles /> </properties>

1 0

r871 - trunk
by tchemit＠users.nuiton.org 12 Apr '10

12 Apr '10

Author: tchemit Date: 2010-04-12 13:56:07 +0200 (Mon, 12 Apr 2010) New Revision: 871 Log: use last stable versions for release Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-12 08:16:10 UTC (rev 870) +++ trunk/pom.xml 2010-04-12 11:56:07 UTC (rev 871) @@ -345,9 +345,9 @@ <maven-plugin-tools-javadoc.version>2.5.1</maven-plugin-tools-javadoc.version> <plexus-component-javadoc.version>1.3.0</plexus-component-javadoc.version> - <helper.version>1.2.3-SNAPSHOT</helper.version> + <helper.version>1.2.3</helper.version> <jredmine.version>1.1.3</jredmine.version> - <license.version>2.1-SNAPSHOT</license.version> + <license.version>2.1</license.version> <jrst.version>1.1.0</jrst.version> <skin.version>1.0.3</skin.version>

1 0

r870 - in trunk: . mavenpom4labs mavenpom4redmine
by tchemit＠users.nuiton.org 12 Apr '10

12 Apr '10

Author: tchemit Date: 2010-04-12 10:16:10 +0200 (Mon, 12 Apr 2010) New Revision: 870 Log: add headers on poms Modified: trunk/mavenpom4labs/pom.xml trunk/mavenpom4redmine/pom.xml trunk/pom.xml Modified: trunk/mavenpom4labs/pom.xml =================================================================== --- trunk/mavenpom4labs/pom.xml 2010-04-12 08:13:02 UTC (rev 869) +++ trunk/mavenpom4labs/pom.xml 2010-04-12 08:16:10 UTC (rev 870) @@ -1,30 +1,30 @@ <?xml version="1.0" encoding="UTF-8"?>  <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Modified: trunk/mavenpom4redmine/pom.xml =================================================================== --- trunk/mavenpom4redmine/pom.xml 2010-04-12 08:13:02 UTC (rev 869) +++ trunk/mavenpom4redmine/pom.xml 2010-04-12 08:16:10 UTC (rev 870) @@ -1,4 +1,31 @@ <?xml version="1.0" encoding="UTF-8"?> + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-12 08:13:02 UTC (rev 869) +++ trunk/pom.xml 2010-04-12 08:16:10 UTC (rev 870) @@ -1,31 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?>  + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

1 0

r869 - in trunk/src/site: apt en/apt
by tchemit＠users.nuiton.org 12 Apr '10

12 Apr '10

Author: tchemit Date: 2010-04-12 10:13:02 +0200 (Mon, 12 Apr 2010) New Revision: 869 Log: doc for profile reporting Modified: trunk/src/site/apt/profiles.apt trunk/src/site/en/apt/profiles.apt Modified: trunk/src/site/apt/profiles.apt =================================================================== --- trunk/src/site/apt/profiles.apt 2010-04-12 08:09:05 UTC (rev 868) +++ trunk/src/site/apt/profiles.apt 2010-04-12 08:13:02 UTC (rev 869) @@ -47,6 +47,8 @@ *----------------------------------+------------------------------+ | {{noreports}} | <<->> | *----------------------------------+------------------------------+ +| {{reporting}} | <<performRelease>> | +*----------------------------------+------------------------------+ | {{release-profile}} | <<performRelease>> | *----------------------------------+------------------------------+ | {{release-sign-artifacts}} | <<performSign>> | @@ -91,6 +93,24 @@ mvn site -Pnoreports -------------------------------------------------------------------------------- +* {reporting} + + Ce profile regroupe tous les reports utilisés pour la génération du site. + Le mettre dans un profile de ne pas à générer tous les rapports à chaque + génération de site. + + Ce profile est utilisable en activant la propriété <performRelease> : + +-------------------------------------------------------------------------------- +mvn site -Prelease-profile +-------------------------------------------------------------------------------- + + ou + +-------------------------------------------------------------------------------- +mvn site -DperformRelease +-------------------------------------------------------------------------------- + * {release-profile} Ce profile (défini par maven) est utilisé lors d'un <mvn release:perform>. Modified: trunk/src/site/en/apt/profiles.apt =================================================================== --- trunk/src/site/en/apt/profiles.apt 2010-04-12 08:09:05 UTC (rev 868) +++ trunk/src/site/en/apt/profiles.apt 2010-04-12 08:13:02 UTC (rev 869) @@ -89,6 +89,24 @@ mvn site -Pnoreports -------------------------------------------------------------------------------- +* {reporting} + + This profile regroups all reports configuration for site generation. + The interest of putting the reports in a profile is to make possible + generation of site WITHOUT them. + + This profile is activable via the property <performRelease> : + +-------------------------------------------------------------------------------- +mvn site -Prelease-profile +-------------------------------------------------------------------------------- + + ou + +-------------------------------------------------------------------------------- +mvn site -DperformRelease +-------------------------------------------------------------------------------- + * {release-profile} This profile (defined par maven) is used while a <mvn release:perform>.

1 0

r868 - trunk/mavenpom4labs/src
by tchemit＠users.nuiton.org 12 Apr '10

12 Apr '10

Author: tchemit Date: 2010-04-12 10:09:05 +0200 (Mon, 12 Apr 2010) New Revision: 868 Log: remove obsolete license project descriptor (can use parent one) Removed: trunk/mavenpom4labs/src/license/

1 0

r867 - trunk/mavenpom4redmine/src
by tchemit＠users.nuiton.org 12 Apr '10

12 Apr '10

Author: tchemit Date: 2010-04-12 10:08:29 +0200 (Mon, 12 Apr 2010) New Revision: 867 Log: remove obsolete license project descriptor (can use parent one) Removed: trunk/mavenpom4redmine/src/license/

1 0

r866 - in trunk: . mavenpom4labs/src/license src/license
by tchemit＠users.nuiton.org 12 Apr '10

12 Apr '10

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'?> - -<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> -  <reporting> - <plugins> - -  - <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> - -  -  - <plugin> - <artifactId>maven-changelog-plugin</artifactId> - <version>2.1</version> -  - </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> - +    @@ -914,26 +800,6 @@ <fail>true</fail> </configuration> </execution> - <execution> - <id>ensure-license-project-descriptor</id> - <goals> - <goal>enforce</goal> - </goals> -  - <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> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + +  + <reporting> + <plugins> + +  + <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> + +  +  + <plugin> + <artifactId>maven-changelog-plugin</artifactId> + <version>2.1</version> +  + </plugin> + +  +  + + <plugin> + <artifactId>maven-pmd-plugin</artifactId> + <version>2.4</version> + <configuration> + <linkXRef>true</linkXRef> +  + <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-…"> <mainLicense>lgpl_v3</mainLicense> - <licenseSets> - <licenseSet> -  - <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>

1 0

r865 - in trunk: . src/site/apt src/site/en/apt
by tchemit＠users.nuiton.org 10 Apr '10

10 Apr '10

Author: tchemit Date: 2010-04-10 22:50:54 +0200 (Sat, 10 Apr 2010) New Revision: 865 Log: update header file Modified: trunk/pom.xml trunk/src/site/apt/MavenProjectBestPratices.apt trunk/src/site/apt/index.apt trunk/src/site/apt/profiles.apt trunk/src/site/apt/properties.apt trunk/src/site/apt/release.apt trunk/src/site/en/apt/MavenProjectBestPratices.apt trunk/src/site/en/apt/index.apt trunk/src/site/en/apt/profiles.apt trunk/src/site/en/apt/properties.apt trunk/src/site/en/apt/release.apt Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-10 16:16:20 UTC (rev 864) +++ trunk/pom.xml 2010-04-10 20:50:54 UTC (rev 865) @@ -1086,12 +1086,12 @@ </distributionManagement> </profile> -  +  <profile> - <id>update-license</id> + <id>update-file-header</id> <activation> <property> - <name>updateLicense</name> + <name>updateFileHeader</name> <value>true</value> </property> </activation> @@ -1134,9 +1134,9 @@ <artifactId>maven-license-plugin</artifactId> <executions> <execution> - <id>update-license</id> + <id>update-file-header</id> <goals> - <goal>update-license</goal> + <goal>update-file-header</goal> </goals> <configuration> <addSvnKeyWords>true</addSvnKeyWords> Modified: trunk/src/site/apt/MavenProjectBestPratices.apt =================================================================== --- trunk/src/site/apt/MavenProjectBestPratices.apt 2010-04-10 16:16:20 UTC (rev 864) +++ trunk/src/site/apt/MavenProjectBestPratices.apt 2010-04-10 20:50:54 UTC (rev 865) @@ -1,3 +1,31 @@ +~~~ +~~ #%L +~~ Mavenpom +~~ +~~ $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% +~~~ + ---- Maven 2 best pratices ---- Modified: trunk/src/site/apt/index.apt =================================================================== --- trunk/src/site/apt/index.apt 2010-04-10 16:16:20 UTC (rev 864) +++ trunk/src/site/apt/index.apt 2010-04-10 20:50:54 UTC (rev 865) @@ -1,3 +1,31 @@ +~~~ +~~ #%L +~~ Mavenpom +~~ +~~ $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% +~~~ + ------ Maven nuiton pom ------ Modified: trunk/src/site/apt/profiles.apt =================================================================== --- trunk/src/site/apt/profiles.apt 2010-04-10 16:16:20 UTC (rev 864) +++ trunk/src/site/apt/profiles.apt 2010-04-10 20:50:54 UTC (rev 865) @@ -1,3 +1,31 @@ +~~~ +~~ #%L +~~ Mavenpom +~~ +~~ $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% +~~~ + ------ Profiles disponibles dans mavenpom ------ Modified: trunk/src/site/apt/properties.apt =================================================================== --- trunk/src/site/apt/properties.apt 2010-04-10 16:16:20 UTC (rev 864) +++ trunk/src/site/apt/properties.apt 2010-04-10 20:50:54 UTC (rev 865) @@ -1,3 +1,31 @@ +~~~ +~~ #%L +~~ Mavenpom +~~ +~~ $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% +~~~ + ------ Propriétés disponibles dans mavenpom ------ Modified: trunk/src/site/apt/release.apt =================================================================== --- trunk/src/site/apt/release.apt 2010-04-10 16:16:20 UTC (rev 864) +++ trunk/src/site/apt/release.apt 2010-04-10 20:50:54 UTC (rev 865) @@ -1,3 +1,31 @@ +~~~ +~~ #%L +~~ Mavenpom +~~ +~~ $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% +~~~ + ------ Effectuer une release ------ Modified: trunk/src/site/en/apt/MavenProjectBestPratices.apt =================================================================== --- trunk/src/site/en/apt/MavenProjectBestPratices.apt 2010-04-10 16:16:20 UTC (rev 864) +++ trunk/src/site/en/apt/MavenProjectBestPratices.apt 2010-04-10 20:50:54 UTC (rev 865) @@ -1,35 +1,31 @@ +~~~ +~~ #%L +~~ Mavenpom +~~ +~~ $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% +~~~ - -~~~ #%L -~~~ Mavenpom -~~~ -~~~ $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% - - - - - ---- Maven 2 best pratices ---- Modified: trunk/src/site/en/apt/index.apt =================================================================== --- trunk/src/site/en/apt/index.apt 2010-04-10 16:16:20 UTC (rev 864) +++ trunk/src/site/en/apt/index.apt 2010-04-10 20:50:54 UTC (rev 865) @@ -1,35 +1,9 @@ +~~~ +~~ #%L +~~ PPPPPPPPPPPPPPPPPPPPPPP +~~ #L% +~~~ - -~~~ #%L -~~~ Mavenpom -~~~ -~~~ $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% - - - - - ------ Maven nuiton pom ------ Modified: trunk/src/site/en/apt/profiles.apt =================================================================== --- trunk/src/site/en/apt/profiles.apt 2010-04-10 16:16:20 UTC (rev 864) +++ trunk/src/site/en/apt/profiles.apt 2010-04-10 20:50:54 UTC (rev 865) @@ -1,35 +1,31 @@ +~~~ +~~ #%L +~~ Mavenpom +~~ +~~ $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% +~~~ - -~~~ #%L -~~~ Mavenpom -~~~ -~~~ $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% - - - - - ------ Available profiles in mavenpom ------ @@ -229,7 +225,7 @@ This profile update the license header on all files in a project using the new license project descriptor introduced in - {{{http://maven-site.nuiton.org/maven-license-plugin}}maven-license-plugin 2.1}. + {{{http://maven-site.nuiton.org/maven-license-plugin}maven-license-plugin 2.1}}. -------------------------------------------------------------------------------- mvn -Pupdate-license Modified: trunk/src/site/en/apt/properties.apt =================================================================== --- trunk/src/site/en/apt/properties.apt 2010-04-10 16:16:20 UTC (rev 864) +++ trunk/src/site/en/apt/properties.apt 2010-04-10 20:50:54 UTC (rev 865) @@ -1,35 +1,31 @@ +~~~ +~~ #%L +~~ Mavenpom +~~ +~~ $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% +~~~ - -~~~ #%L -~~~ Mavenpom -~~~ -~~~ $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% - - - - - ------ Available properties in mavenpom ------ Modified: trunk/src/site/en/apt/release.apt =================================================================== --- trunk/src/site/en/apt/release.apt 2010-04-10 16:16:20 UTC (rev 864) +++ trunk/src/site/en/apt/release.apt 2010-04-10 20:50:54 UTC (rev 865) @@ -1,35 +1,31 @@ +~~~ +~~ #%L +~~ Mavenpom +~~ +~~ $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% +~~~ - -~~~ #%L -~~~ Mavenpom -~~~ -~~~ $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% - - - - - ------ Make a release from mavenpom4redmine ------

1 0