Author: tchemit Date: 2010-01-07 05:23:57 +0100 (Thu, 07 Jan 2010) New Revision: 1670 Added: trunk/src/site/site_en.xml Removed: trunk/src/site/site.xml Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/license/plugin/GeneratorListPlugin.java trunk/src/main/java/org/nuiton/license/plugin/LicenseListPlugin.java trunk/src/test/resources/org/nuiton/license/plugin/addLicenseFilePluginTest/testOne.xml trunk/src/test/resources/org/nuiton/license/plugin/addLicenseFilePluginTest/testTwo.xml Log: Evolution #192: Use mavenpom Evolution #193: Use maven-helper-plugin 1.2.0 with revisited AbstractPlugin api Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-01 17:27:34 UTC (rev 1669) +++ trunk/pom.xml 2010-01-07 04:23:57 UTC (rev 1670) @@ -8,7 +8,12 @@ <!-- *** POM Relationships *************************************** --> <!-- ************************************************************* --> - <groupId>org.nuiton</groupId> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom</artifactId> + <version>1.1.4</version> + </parent> + <artifactId>maven-license-plugin</artifactId> <version>2.0.1-SNAPSHOT</version> @@ -250,19 +255,6 @@ <inceptionYear>2008</inceptionYear> <url>http://maven-site.nuiton.org/maven-license-plugin</url> - <organization> - <name>CodeLutin</name> - <url>http://www.codelutin.com/</url> - </organization> - - <licenses> - <license> - <name>Lesser General Public License (LGPL)</name> - <url>${project.basedir}/LICENSE.txt</url> - <distribution>local</distribution> - </license> - </licenses> - <developers> <developer> @@ -281,32 +273,6 @@ <!-- *** Build Environment ************************************** --> <!-- ************************************************************* --> - <mailingLists> - <mailingList> - <name>maven-license-plugin-commits</name> - <subscribe>http://list.nuiton.org/cgi-bin/mailman/listinfo/maven-license-plugin-commits</subscribe> - <unsubscribe>http://list.nuiton.org/cgi-bin/mailman/listinfo/maven-license-plugin-commits</unsubscribe> - <post>maven-license-plugin-commits@list.nuiton.org</post> - <archive>http://list.nuiton.org/pipermail/maven-license-plugin-commits/</archive> - </mailingList> - - <mailingList> - <name>maven-license-plugin-devel</name> - <subscribe>http://list.nuiton.org/cgi-bin/mailman/listinfo/maven-license-plugin-devel</subscribe> - <unsubscribe>http://list.nuiton.org/cgi-bin/mailman/listinfo/maven-license-plugin-devel</unsubscribe> - <post>maven-license-plugin-devel@list.nuiton.org</post> - <archive>http://list.nuiton.org/pipermail/maven-license-plugin-devel/</archive> - </mailingList> - - <mailingList> - <name>maven-license-plugin-users</name> - <subscribe>http://list.nuiton.org/cgi-bin/mailman/listinfo/maven-license-plugin-users</subscribe> - <unsubscribe>http://list.nuiton.org/cgi-bin/mailman/listinfo/maven-license-plugin-users</unsubscribe> - <post>maven-license-plugin-users@list.nuiton.org</post> - <archive>http://list.nuiton.org/pipermail/maven-license-plugin-users/</archive> - </mailingList> - </mailingLists> - <!-- Source control management. --> <scm> <connection>scm:svn:http://svn.nuiton.org/svn/maven-license-plugin/trunk</connection> @@ -314,31 +280,6 @@ <url>http://www.nuiton.org/repositories/browse/maven-license-plugin/trunk</url> </scm> - <issueManagement> - <system>Redmine</system> - <url>http://www.nuiton.org/projects/maven-license-plugin/issues/</url> - </issueManagement> - - <distributionManagement> - <repository> - <id>nuiton</id> - <url>scpexe://nuiton.org/var/lib/maven/release</url> - </repository> - <snapshotRepository> - <id>nuiton</id> - <url>scpexe://nuiton.org/var/lib/maven/snapshot</url> - </snapshotRepository> - <site> - <id>nuiton</id> - <url>scpexe://nuiton.org/var/lib/redmine-nuiton/project-site/maven-license-plugin</url> - </site> - </distributionManagement> - - <ciManagement> - <system>hudson</system> - <url>http://hudson.nuiton.org/hudson/job/maven-license-plugin</url> - </ciManagement> - <!-- ************************************************************* --> <!-- *** Build Settings ****************************************** --> <!-- ************************************************************* --> @@ -347,55 +288,11 @@ <properties> - <platform>nuiton.org</platform> + <processor.version>1.0.2</processor.version> - <!-- a proprerty to define the id of the project, in a multi-module - project, you must use a hard-cored value, otherwise for modules - the artifactId will be expanded , otherwise, no need to override it - --> - <projectId>${project.artifactId}</projectId> - - <!-- a property to define list id --> - <listId>${projectId}</listId> - - <maven.src.dir>${basedir}/src</maven.src.dir> - <maven.compile.source>1.6</maven.compile.source> - <maven.compile.target>1.6</maven.compile.target> - - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - - <maven.test.skip>false</maven.test.skip> - - <!-- to activate generation of reports and javadoc when doing a site --> - <maven.reports.generate>true</maven.reports.generate> - - <license.licenseName>lgpl_v3</license.licenseName> - - <repository.home.url>http://maven.nuiton.org/release</repository.home.url> - - <helper.version>1.2.0-SNAPSHOT</helper.version> - <jredmine.version>1.0.0</jredmine.version> - <processor.version>1.0.1</processor.version> - <jrst.version>1.0.0</jrst.version> - - <maven.version>2.2.1</maven.version> - <!-- javadoc 2.6 ne fonctionne pas avec doxia-jrst + maven-helper-plugin --> - <javadoc.version>2.5</javadoc.version> - - <!-- redmine configuration --> - <redmine.safe>false</redmine.safe> - <redmine.url>http://www.${platform}</redmine.url> - <redmine.serverId>redmine-${platform}</redmine.serverId> - <redmine.projectId>maven-license-plugin</redmine.projectId> - <redmine.xmlPath>target/generated-sources/changes/changes.xml</redmine.xmlPath> - <redmine.issueLinkTemplate>${redmine.url}/issues/show/%ISSUE%</redmine.issueLinkTemplate> - <redmine.versionLinkTemplate>${redmine.url}/versions/show/%VERSION%</redmine.versionLinkTemplate> - <redmine.collectedFiles>target/collect.properties</redmine.collectedFiles> - - <!-- extra files to include in release --> - <redmine.releaseFiles/> - + <!-- documention is in english --> + <maven.site.locales>en</maven.site.locales> + </properties> <build> @@ -448,296 +345,8 @@ </plugin> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>${maven.compile.source}</source> - <target>${maven.compile.target}</target> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.4.3</version> - <configuration> - <skip>${maven.test.skip}</skip> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-source-plugin</artifactId> - <version>2.1</version> - </plugin> - - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <version>2.3</version> - </plugin> - - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <version>${javadoc.version}</version> - <configuration> - <docencoding>${project.reporting.outputEncoding}</docencoding> - <encoding>${project.reporting.outputEncoding}</encoding> - <charset>${project.reporting.outputEncoding}</charset> - <quiet>true</quiet> - <!-- uniquement a partir de javadoc 2.5 --> - <!--skip>${maven.javadoc.skip}</skip--> - <taglets> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoAggregatorTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoComponentFieldTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoConfiguratorTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoExecuteTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoExecutionStrategyTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoGoalTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoInheritByDefaultTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoInstantiationStrategyTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoParameterFieldTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoPhaseTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoReadOnlyFieldTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoRequiredFieldTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoRequiresDependencyResolutionTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoRequiresDirectInvocationTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoRequiresOnLineTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoRequiresProjectTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoRequiresReportsTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - - <taglet> - <tagletClass> - org.codehaus.plexus.javadoc.PlexusComponentTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-javadoc - </artifactId> - <version>1.3.0</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.codehaus.plexus.javadoc.PlexusConfigurationTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-javadoc - </artifactId> - <version>1.3.0</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.codehaus.plexus.javadoc.PlexusRequirementTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-javadoc - </artifactId> - <version>1.3.0</version> - </tagletArtifact> - </taglet> - </taglets> - </configuration> - </plugin> - - <plugin> <artifactId>maven-site-plugin</artifactId> <version>2.0.1</version> - <configuration> - <locales>fr</locales> - <siteDirectory>src/site</siteDirectory> - <inputEncoding>${project.reporting.outputEncoding}</inputEncoding> - <outputEncoding>${project.reporting.outputEncoding}</outputEncoding> - <generateReports>${maven.reports.generate}</generateReports> - </configuration> <dependencies> <dependency> <groupId>org.nuiton.jrst</groupId> @@ -753,33 +362,6 @@ </dependencies> </plugin> - <plugin> - <artifactId>maven-release-plugin</artifactId> - <version>2.0-beta-9</version> - </plugin> - - <plugin> - <artifactId>maven-plugin-plugin</artifactId> - <version>2.5.1</version> - </plugin> - - <plugin> - <artifactId>maven-invoker-plugin</artifactId> - <version>1.3</version> - </plugin> - - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <version>${helper.version}</version> - </plugin> - - <plugin> - <groupId>org.nuiton.jredmine</groupId> - <artifactId>maven-jredmine-plugin</artifactId> - <version>${jredmine.version}</version> - </plugin> - </plugins> </pluginManagement> @@ -787,359 +369,12 @@ <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> - <quiet>true</quiet> - <!--<skip>true</skip>--> - <docencoding>${project.build.sourceEncoding}</docencoding> - <encoding>${project.build.sourceEncoding}</encoding> - <charset>${project.reporting.outputEncoding}</charset> - <excludePackageNames>${maven.javadoc.excludePackageNames}</excludePackageNames> - <taglets> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoAggregatorTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoComponentFieldTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoConfiguratorTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoExecuteTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoExecutionStrategyTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoGoalTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoInheritByDefaultTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoInstantiationStrategyTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoParameterFieldTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoPhaseTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoReadOnlyFieldTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoRequiredFieldTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoRequiresDependencyResolutionTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoRequiresDirectInvocationTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoRequiresOnLineTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoRequiresProjectTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoRequiresReportsTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools - </groupId> - <artifactId>maven-plugin-tools-javadoc - </artifactId> - <version>2.5.1</version> - </tagletArtifact> - </taglet> - - <taglet> - <tagletClass> - org.codehaus.plexus.javadoc.PlexusComponentTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-javadoc - </artifactId> - <version>1.3.0</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.codehaus.plexus.javadoc.PlexusConfigurationTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-javadoc - </artifactId> - <version>1.3.0</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.codehaus.plexus.javadoc.PlexusRequirementTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-javadoc - </artifactId> - <version>1.3.0</version> - </tagletArtifact> - </taglet> - </taglets> - </configuration> - <reportSets> - <reportSet> - <reports> - <report>javadoc</report> - <report>test-javadoc</report> - </reports> - </reportSet> - </reportSets> - </plugin> - - <!-- changelog:changelog - changelog:dev-activity - changelog:file-activity --> - <plugin> - <artifactId>maven-changelog-plugin</artifactId> - <version>2.1</version> - </plugin> - - <!-- Implicit add of reportSet to not generate jira reports --> - <plugin> - <artifactId>maven-changes-plugin</artifactId> - <version>2.2</version> - <configuration> - <issueLinkTemplatePerSystem> - <redmine>${redmine.issueLinkTemplate}</redmine> - </issueLinkTemplatePerSystem> - <xmlPath>${redmine.xmlPath}</xmlPath> - </configuration> - <reportSets> - <reportSet> - <reports> - <report>changes-report</report> - </reports> - </reportSet> - </reportSets> - </plugin> - - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.3</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.4.3</version> - </plugin> - - <plugin> <artifactId>maven-plugin-plugin</artifactId> <version>2.5.1</version> </plugin> - + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>cobertura-maven-plugin</artifactId> @@ -1150,340 +385,7 @@ </reporting> <profiles> - <!-- perform only on a release stage when using the maven-release-plugin --> - <profile> - <id>release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> - - <!-- add license and third-party files to build --> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-license-plugin</artifactId> - <version>2.0.0</version> - <executions> - <execution> - <id>attach-licenses</id> - <goals> - <goal>add-license</goal> - <goal>add-third-party</goal> - </goals> - </execution> - </executions> - </plugin> - - <!-- always compute source jar --> - <plugin> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - - <!-- always compute javadoc jar --> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <executions> - <execution> - <id>attach-javadocs</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - - </plugins> - </build> - </profile> - - <!-- perform only on a release stage when using the maven-release-plugin --> - <profile> - <id>redmine-pre-release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <properties> - <redmine.safe>true</redmine.safe> - </properties> - - <reporting> - <plugins> - - <plugin> - <groupId>org.nuiton.jredmine</groupId> - <artifactId>maven-jredmine-plugin</artifactId> - <version>${jredmine.version}</version> - <configuration> - <columnNames>key,summary,status,assignee,tracker,priority,version,category,createdOn - </columnNames> - </configuration> - <reportSets> - <reportSet> - <reports> - <report>issues-report</report> - </reports> - </reportSet> - </reportSets> - </plugin> - - </plugins> - </reporting> - <build> - - <plugins> - - <!-- - - obtain redmine login - - collect files for jredmine release - --> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <executions> - <execution> - <id>get-redmine-login</id> - <goals> - <goal>share-server-secret</goal> - </goals> - <phase>initialize</phase> - <configuration> - <serverId>redmine-${platform}</serverId> - <passwordOut>redmine.password</passwordOut> - <usernameOut>redmine.username</usernameOut> - </configuration> - </execution> - <execution> - <id>get-redmine-login-site</id> - <goals> - <goal>share-server-secret</goal> - </goals> - <phase>pre-site</phase> - <configuration> - <serverId>redmine-${platform}</serverId> - <passwordOut>redmine.password</passwordOut> - <usernameOut>redmine.username</usernameOut> - </configuration> - </execution> - <execution> - <id>collect-files</id> - <goals> - <goal>collect-files</goal> - </goals> - <phase>install</phase> - <configuration> - <extraFiles>${redmine.releaseFiles}</extraFiles> - <descriptionFile>${redmine.collectedFiles}</descriptionFile> - <!--<copyFiles>false</copyFiles>--> - </configuration> - </execution> - </executions> - </plugin> - - <!-- generate the changes.xml from redmine --> - <plugin> - <groupId>org.nuiton.jredmine</groupId> - <artifactId>maven-jredmine-plugin</artifactId> - <executions> - <execution> - <id>jredmine-generate</id> - <goals> - <goal>generate-changes</goal> - <goal>generate-news-announcement</goal> - <goal>generate-email-announcement</goal> - </goals> - <phase>process-classes</phase> - </execution> - </executions> - <configuration> - - <!-- generate-changes --> - <generateOnce>true</generateOnce> - <actionMapping>fix:1, add:2</actionMapping> - <statusIds>3,4,5</statusIds> - - <!-- generate announcements --> - <urlDownload>${redmine.url}/projects/list_files/${projectId}</urlDownload> - - <!--<changesTitle>Release note of Maven pom project</changesTitle>--> - <!--<releaseDescription>Description of first release</releaseDescription>--> - <!--<verbose>true</verbose>--> - </configuration> - </plugin> - - </plugins> - - </build> - </profile> - - <!-- perform a redmine release after a successfull release --> - <profile> - <id>redmine-release-profile</id> - <activation> - <property> - <name>performRedmineRelease</name> - <value>true</value> - </property> - </activation> - - <properties> - <dryRun>true</dryRun> - <redmine.dryRun>${dryRun}</redmine.dryRun> - </properties> - <build> - - <plugins> - - - <!-- - - obtain redmine login - - send release email - --> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <executions> - <execution> - <id>get-redmine-login</id> - <goals> - <goal>share-server-secret</goal> - </goals> - <phase>validate</phase> - <configuration> - <serverId>redmine-${platform}</serverId> - <passwordOut>redmine.password</passwordOut> - <usernameOut>redmine.username</usernameOut> - </configuration> - </execution> - <execution> - <id>send-release-email</id> - <goals> - <goal>send-email</goal> - </goals> - <phase>validate</phase> - </execution> - </executions> - <configuration> - - <!-- for a multi-module just run on root project --> - <runOnce>true</runOnce> - - <emailTitle>[ANNOUNCEMENT] - ${project.name} ${project.version} released</emailTitle> - <emailContentFile>target/generated-sources/announcement/release-email-announcement.vm - </emailContentFile> - <mailSender> - <name>${platform} Release Notification</name> - <email>noreply@${platform}</email> - </mailSender> - <toAddresses> - <item>${listId}-users@list.${platform}</item> - <item>${listId}-devel@list.${platform}</item> - <item>dev@codelutin.com</item> - </toAddresses> - <smtpHost>smtp</smtpHost> - </configuration> - </plugin> - - <!-- - - update version in redmine - - publish release files to redmine - - publish a release news in redmine - --> - <plugin> - <groupId>org.nuiton.jredmine</groupId> - <artifactId>maven-jredmine-plugin</artifactId> - <executions> - <execution> - <id>jredmine-release</id> - <goals> - <goal>update-version</goal> - <goal>publish-attachments</goal> - <goal>publish-news</goal> - </goals> - <phase>validate</phase> - </execution> - </executions> - <configuration> - - <!-- for a multi-module just run on root project --> - <runOnce>true</runOnce> - - <!-- update-version --> - <closeVersion>true</closeVersion> - - <!-- publish-attachments --> - <filesFromProperties>${redmine.collectedFiles}</filesFromProperties> - - <!-- publish-news --> - <newsContentFile>target/generated-sources/announcement/release-news-announcement.vm - </newsContentFile> - <newsSummary>${project.description}</newsSummary> - <newsTitle>${project.name} ${project.version} released</newsTitle> - - </configuration> - </plugin> - - </plugins> - - </build> - </profile> - - <!-- do not execute tests (generaly a bad idea...) --> - <profile> - <id>notests</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <properties> - <maven.test.skip>true</maven.test.skip> - </properties> - </profile> - <!-- do not build reports (speedup site generation in dev) --> - <profile> - <id>noreports</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <properties> - <maven.reports.generate>false</maven.reports.generate> - </properties> - </profile> - <!-- do not build dependencies detail in maven-project-info-report (speedup site generation in dev) --> - <profile> - <id>nodepdetails</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <properties> - <maven.reports.dependencyDetailsEnabled>false</maven.reports.dependencyDetailsEnabled> - </properties> - </profile> - <!-- do not build locations of dependencies in maven-project-info-report (speedup site generation in dev) --> - <profile> - <id>nodeplocations</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <properties> - <maven.reports.dependencyLocationsEnabled>false</maven.reports.dependencyLocationsEnabled> - </properties> - </profile> - <!--profile> <id>run-its</id> <build> Modified: trunk/src/main/java/org/nuiton/license/plugin/GeneratorListPlugin.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/GeneratorListPlugin.java 2010-01-01 17:27:34 UTC (rev 1669) +++ trunk/src/main/java/org/nuiton/license/plugin/GeneratorListPlugin.java 2010-01-07 04:23:57 UTC (rev 1670) @@ -29,7 +29,7 @@ import org.nuiton.license.plugin.header.generator.HeaderGenerator; /** - * The goal display all the knwon generators. + * Displays all the available generators. * * @author chemit * Modified: trunk/src/main/java/org/nuiton/license/plugin/LicenseListPlugin.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/LicenseListPlugin.java 2010-01-01 17:27:34 UTC (rev 1669) +++ trunk/src/main/java/org/nuiton/license/plugin/LicenseListPlugin.java 2010-01-07 04:23:57 UTC (rev 1670) @@ -31,7 +31,7 @@ import org.nuiton.license.plugin.repository.LicenseRepositoryFactory; /** - * Le goal pour afficher dans la console les differentes licenses connues. + * Display all available licenses. * * @author chemit * @goal license-list Deleted: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2010-01-01 17:27:34 UTC (rev 1669) +++ trunk/src/site/site.xml 2010-01-07 04:23:57 UTC (rev 1670) @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="${project.name}"> - - <publishDate format="dd/MM/yyyy"/> - - <skin> - <groupId>org.nuiton</groupId> - <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0</version> - </skin> - - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> - - - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>${project.organization.url}</href> - </bannerRight> - - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> - <logo href="http://maven-nuiton.org/jrst" name="JRst" img="images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="images/restructuredtext-logo.png"/> - </poweredBy> - - <body> - - <links> - <item name="Chorem" href="http://www.chorem.org"/> - <item name="Nuiton" href="http://www.nuiton.org"/> - <item name="Labs" href="http://labs.libre-entreprise.org"/> - <item name="${project.organization.name}" href="${project.organization.url}"/> - <item name="Dépôt maven" href="${repository.home.url}"/> - </links> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> - - <menu name="Utilisateur"> - <item name="Introduction" href="index.html"/> - <item name="Usage" href="usage.html"/> - <item name="Goals" href="plugin-info.html"> - <item name="update-header" href="update-header-mojo.html"/> - <item name="generator-list" href="generator-list-mojo.html"/> - <item name="license-list" href="license-list-mojo.html"/> - <item name="help" href="help-mojo.html"/> - </item> - </menu> - - <menu name="Téléchargement"> - <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}.jar" - name="Librairie (jar)"/> - <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - </menu> - - <menu ref="reports"/> - - </body> -</project> Copied: trunk/src/site/site_en.xml (from rev 1669, trunk/src/site/site.xml) =================================================================== --- trunk/src/site/site_en.xml (rev 0) +++ trunk/src/site/site_en.xml 2010-01-07 04:23:57 UTC (rev 1670) @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> + <logo href="http://maven-nuiton.org/jrst" name="JRst" img="images/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" + img="images/restructuredtext-logo.png"/> + </poweredBy> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="index.html" /> + </breadcrumbs> + + <menu name="User"> + <item name="Introduction" href="index.html"/> + <item name="Usage" href="usage.html"/> + <item name="Goals" href="plugin-info.html"> + <item name="add-license" href="add-license-mojo.html"/> + <item name="add-third-party" href="add-third-party-mojo.html"/> + <item name="update-header" href="update-header-mojo.html"/> + <item name="generator-list" href="generator-list-mojo.html"/> + <item name="license-list" href="license-list-mojo.html"/> + <item name="help" href="help-mojo.html"/> + </item> + </menu> + + <menu name="Downloads"> + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + </menu> + + <menu ref="reports"/> + + </body> +</project> Modified: trunk/src/test/resources/org/nuiton/license/plugin/addLicenseFilePluginTest/testOne.xml =================================================================== --- trunk/src/test/resources/org/nuiton/license/plugin/addLicenseFilePluginTest/testOne.xml 2010-01-01 17:27:34 UTC (rev 1669) +++ trunk/src/test/resources/org/nuiton/license/plugin/addLicenseFilePluginTest/testOne.xml 2010-01-07 04:23:57 UTC (rev 1670) @@ -17,6 +17,7 @@ <licenseName>lgpl_v3</licenseName> <licenseFile>licenseOne.txt</licenseFile> <!--<outputDirectory>test</outputDirectory>--> + <force>true</force> <verbose>true</verbose> </configuration> <executions> Modified: trunk/src/test/resources/org/nuiton/license/plugin/addLicenseFilePluginTest/testTwo.xml =================================================================== --- trunk/src/test/resources/org/nuiton/license/plugin/addLicenseFilePluginTest/testTwo.xml 2010-01-01 17:27:34 UTC (rev 1669) +++ trunk/src/test/resources/org/nuiton/license/plugin/addLicenseFilePluginTest/testTwo.xml 2010-01-07 04:23:57 UTC (rev 1670) @@ -18,6 +18,7 @@ <encoding>UTF-8</encoding> <licenseName>lgpl_v3</licenseName> <licenseFile>licenseTwo.txt</licenseFile> + <force>true</force> <!--<outputDirectory>test</outputDirectory>--> <verbose>true</verbose> </configuration>