Author: tchemit Date: 2010-01-01 17:54:27 +0100 (Fri, 01 Jan 2010) New Revision: 642 Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/plugin/AbstractPlugin.java trunk/src/main/java/org/nuiton/plugin/PluginHelper.java Log: - add renameFile api - fix plexus dependencies - reformat pom Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-29 15:39:54 UTC (rev 641) +++ trunk/pom.xml 2010-01-01 16:54:27 UTC (rev 642) @@ -1,5 +1,6 @@ <?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" +<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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -214,6 +215,20 @@ <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-velocity</artifactId> <version>1.1.7</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-api</artifactId> + </exclusion> + <exclusion> + <groupId>velocity</groupId> + <artifactId>velocity</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> @@ -259,33 +274,53 @@ <mailingLists> <mailingList> <name>maven-helper-plugin-commits</name> - <subscribe>http://list.nuiton.org/cgi-bin/mailman/listinfo/maven-helper-plugin-commits</subscribe> - <unsubscribe>http://list.nuiton.org/cgi-bin/mailman/listinfo/maven-helper-plugin-commits</unsubscribe> + <subscribe> + http://list.nuiton.org/cgi-bin/mailman/listinfo/maven-helper-plugin-commits + </subscribe> + <unsubscribe> + http://list.nuiton.org/cgi-bin/mailman/listinfo/maven-helper-plugin-commits + </unsubscribe> <post>maven-helper-plugin-commits@list.nuiton.org</post> - <archive>http://list.nuiton.org/pipermail/maven-helper-plugin-commits/</archive> + <archive> + http://list.nuiton.org/pipermail/maven-helper-plugin-commits/ + </archive> </mailingList> <mailingList> <name>maven-helper-plugin-devel</name> - <subscribe>http://list.nuiton.org/cgi-bin/mailman/listinfo/maven-helper-plugin-devel</subscribe> - <unsubscribe>http://list.nuiton.org/cgi-bin/mailman/listinfo/maven-helper-plugin-devel</unsubscribe> + <subscribe> + http://list.nuiton.org/cgi-bin/mailman/listinfo/maven-helper-plugin-devel + </subscribe> + <unsubscribe> + http://list.nuiton.org/cgi-bin/mailman/listinfo/maven-helper-plugin-devel + </unsubscribe> <post>maven-helper-plugin-devel@list.nuiton.org</post> - <archive>http://list.nuiton.org/pipermail/maven-helper-plugin-devel/</archive> + <archive>http://list.nuiton.org/pipermail/maven-helper-plugin-devel/ + </archive> </mailingList> <mailingList> <name>maven-helper-plugin-users</name> - <subscribe>http://list.nuiton.org/cgi-bin/mailman/listinfo/maven-helper-plugin-users</subscribe> - <unsubscribe>http://list.nuiton.org/cgi-bin/mailman/listinfo/maven-helper-plugin-users</unsubscribe> + <subscribe> + http://list.nuiton.org/cgi-bin/mailman/listinfo/maven-helper-plugin-users + </subscribe> + <unsubscribe> + http://list.nuiton.org/cgi-bin/mailman/listinfo/maven-helper-plugin-users + </unsubscribe> <post>maven-helper-plugin-users@list.nuiton.org</post> - <archive>http://list.nuiton.org/pipermail/maven-helper-plugin-users/</archive> + <archive>http://list.nuiton.org/pipermail/maven-helper-plugin-users/ + </archive> </mailingList> </mailingLists> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/maven-helper-plugin/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/trunk + </connection> + <developerConnection> + scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/trunk + </developerConnection> + <url>http://www.nuiton.org/repositories/browse/maven-helper-plugin/trunk + </url> </scm> <issueManagement> @@ -304,7 +339,9 @@ </snapshotRepository> <site> <id>nuiton</id> - <url>scpexe://nuiton.org/var/lib/redmine-nuiton/project-site/maven-helper-plugin</url> + <url> + scpexe://nuiton.org/var/lib/redmine-nuiton/project-site/maven-helper-plugin + </url> </site> </distributionManagement> @@ -335,7 +372,8 @@ <maven.compile.target>1.6</maven.compile.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + <project.reporting.outputEncoding>UTF-8 + </project.reporting.outputEncoding> <maven.test.skip>false</maven.test.skip> <maven.javadoc.skip>false</maven.javadoc.skip> @@ -345,16 +383,21 @@ <license.licenseName>lgpl_v3</license.licenseName> - <repository.home.url>http://maven.nuiton.org/release</repository.home.url> + <repository.home.url>http://maven.nuiton.org/release + </repository.home.url> <!-- redmine configuration --> <redmine.safe>false</redmine.safe> <redmine.url>http://www.${platform}</redmine.url> <redmine.projectId>maven-helper-plugin</redmine.projectId> - <redmine.xmlPath>${basedir}/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> + <redmine.xmlPath>${basedir}/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> </properties> <build> @@ -433,8 +476,8 @@ <artifactId>maven-source-plugin</artifactId> <version>2.1</version> </plugin> - - <plugin> + + <plugin> <artifactId>maven-jar-plugin</artifactId> <version>2.3</version> </plugin> @@ -443,112 +486,154 @@ <artifactId>maven-javadoc-plugin</artifactId> <version>${javadoc.version}</version> <configuration> - <docencoding>${project.reporting.outputEncoding}</docencoding> + <docencoding>${project.reporting.outputEncoding} + </docencoding> <encoding>${project.reporting.outputEncoding}</encoding> <charset>${project.reporting.outputEncoding}</charset> <quiet>true</quiet> <skip>${maven.javadoc.skip}</skip> <taglets> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoAggregatorTypeTaglet + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoAggregatorTypeTaglet </tagletClass> <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> + <groupId>org.apache.maven.plugin-tools + </groupId> + <artifactId>maven-plugin-tools-javadoc + </artifactId> <version>2.4.2</version> </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoComponentFieldTaglet + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoComponentFieldTaglet </tagletClass> <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> + <groupId>org.apache.maven.plugin-tools + </groupId> + <artifactId>maven-plugin-tools-javadoc + </artifactId> <version>2.4.2</version> </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoConfiguratorTypeTaglet + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoConfiguratorTypeTaglet </tagletClass> <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> + <groupId>org.apache.maven.plugin-tools + </groupId> + <artifactId>maven-plugin-tools-javadoc + </artifactId> <version>2.4.2</version> </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecuteTypeTaglet</tagletClass> + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoExecuteTypeTaglet + </tagletClass> <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> + <groupId>org.apache.maven.plugin-tools + </groupId> + <artifactId>maven-plugin-tools-javadoc + </artifactId> <version>2.4.2</version> </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecutionStrategyTypeTaglet + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoExecutionStrategyTypeTaglet </tagletClass> <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> + <groupId>org.apache.maven.plugin-tools + </groupId> + <artifactId>maven-plugin-tools-javadoc + </artifactId> <version>2.4.2</version> </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoGoalTypeTaglet</tagletClass> + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoGoalTypeTaglet + </tagletClass> <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> + <groupId>org.apache.maven.plugin-tools + </groupId> + <artifactId>maven-plugin-tools-javadoc + </artifactId> <version>2.4.2</version> </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInheritByDefaultTypeTaglet + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoInheritByDefaultTypeTaglet </tagletClass> <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> + <groupId>org.apache.maven.plugin-tools + </groupId> + <artifactId>maven-plugin-tools-javadoc + </artifactId> <version>2.4.2</version> </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInstantiationStrategyTypeTaglet + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoInstantiationStrategyTypeTaglet </tagletClass> <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> + <groupId>org.apache.maven.plugin-tools + </groupId> + <artifactId>maven-plugin-tools-javadoc + </artifactId> <version>2.4.2</version> </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoParameterFieldTaglet + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoParameterFieldTaglet </tagletClass> <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> + <groupId>org.apache.maven.plugin-tools + </groupId> + <artifactId>maven-plugin-tools-javadoc + </artifactId> <version>2.4.2</version> </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoPhaseTypeTaglet</tagletClass> + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoPhaseTypeTaglet + </tagletClass> <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> + <groupId>org.apache.maven.plugin-tools + </groupId> + <artifactId>maven-plugin-tools-javadoc + </artifactId> <version>2.4.2</version> </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoReadOnlyFieldTaglet</tagletClass> + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoReadOnlyFieldTaglet + </tagletClass> <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> + <groupId>org.apache.maven.plugin-tools + </groupId> + <artifactId>maven-plugin-tools-javadoc + </artifactId> <version>2.4.2</version> </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiredFieldTaglet</tagletClass> + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoRequiredFieldTaglet + </tagletClass> <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> + <groupId>org.apache.maven.plugin-tools + </groupId> + <artifactId>maven-plugin-tools-javadoc + </artifactId> <version>2.4.2</version> </tagletArtifact> </taglet> @@ -557,8 +642,10 @@ org.apache.maven.tools.plugin.javadoc.MojoRequiresDependencyResolutionTypeTaglet </tagletClass> <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> + <groupId>org.apache.maven.plugin-tools + </groupId> + <artifactId>maven-plugin-tools-javadoc + </artifactId> <version>2.4.2</version> </tagletArtifact> </taglet> @@ -567,41 +654,54 @@ org.apache.maven.tools.plugin.javadoc.MojoRequiresDirectInvocationTypeTaglet </tagletClass> <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> + <groupId>org.apache.maven.plugin-tools + </groupId> + <artifactId>maven-plugin-tools-javadoc + </artifactId> <version>2.4.2</version> </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresOnLineTypeTaglet + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoRequiresOnLineTypeTaglet </tagletClass> <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> + <groupId>org.apache.maven.plugin-tools + </groupId> + <artifactId>maven-plugin-tools-javadoc + </artifactId> <version>2.4.2</version> </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresProjectTypeTaglet + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoRequiresProjectTypeTaglet </tagletClass> <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> + <groupId>org.apache.maven.plugin-tools + </groupId> + <artifactId>maven-plugin-tools-javadoc + </artifactId> <version>2.4.2</version> </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresReportsTypeTaglet + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoRequiresReportsTypeTaglet </tagletClass> <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> + <groupId>org.apache.maven.plugin-tools + </groupId> + <artifactId>maven-plugin-tools-javadoc + </artifactId> <version>2.4.2</version> </tagletArtifact> </taglet> <taglet> - <tagletClass>org.codehaus.plexus.javadoc.PlexusComponentTaglet</tagletClass> + <tagletClass> + org.codehaus.plexus.javadoc.PlexusComponentTaglet + </tagletClass> <tagletArtifact> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-javadoc</artifactId> @@ -609,7 +709,9 @@ </tagletArtifact> </taglet> <taglet> - <tagletClass>org.codehaus.plexus.javadoc.PlexusConfigurationTaglet</tagletClass> + <tagletClass> + org.codehaus.plexus.javadoc.PlexusConfigurationTaglet + </tagletClass> <tagletArtifact> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-javadoc</artifactId> @@ -617,7 +719,9 @@ </tagletArtifact> </taglet> <taglet> - <tagletClass>org.codehaus.plexus.javadoc.PlexusRequirementTaglet</tagletClass> + <tagletClass> + org.codehaus.plexus.javadoc.PlexusRequirementTaglet + </tagletClass> <tagletArtifact> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-javadoc</artifactId> @@ -634,9 +738,12 @@ <configuration> <locales>fr</locales> <siteDirectory>src/site</siteDirectory> - <inputEncoding>${project.reporting.outputEncoding}</inputEncoding> - <outputEncoding>${project.reporting.outputEncoding}</outputEncoding> - <generateReports>${maven.reports.generate}</generateReports> + <inputEncoding>${project.reporting.outputEncoding} + </inputEncoding> + <outputEncoding>${project.reporting.outputEncoding} + </outputEncoding> + <generateReports>${maven.reports.generate} + </generateReports> </configuration> </plugin> @@ -682,8 +789,12 @@ <artifactId>maven-project-info-reports-plugin</artifactId> <version>2.1.2</version> <configuration> - <dependencyDetailsEnabled>${maven.reports.dependencyDetailsEnabled}</dependencyDetailsEnabled> - <dependencyLocationsEnabled>${maven.reports.dependencyLocationsEnabled}</dependencyLocationsEnabled> + <dependencyDetailsEnabled> + ${maven.reports.dependencyDetailsEnabled} + </dependencyDetailsEnabled> + <dependencyLocationsEnabled> + ${maven.reports.dependencyLocationsEnabled} + </dependencyLocationsEnabled> </configuration> <reportSets> <reportSet> @@ -714,104 +825,138 @@ <docencoding>${project.build.sourceEncoding}</docencoding> <encoding>${project.build.sourceEncoding}</encoding> <charset>${project.reporting.outputEncoding}</charset> - <excludePackageNames>${maven.javadoc.excludePackageNames}</excludePackageNames> + <excludePackageNames>${maven.javadoc.excludePackageNames} + </excludePackageNames> <taglets> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoAggregatorTypeTaglet</tagletClass> + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoAggregatorTypeTaglet + </tagletClass> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> + <artifactId>maven-plugin-tools-javadoc + </artifactId> <version>2.4.2</version> </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoComponentFieldTaglet</tagletClass> + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoComponentFieldTaglet + </tagletClass> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> + <artifactId>maven-plugin-tools-javadoc + </artifactId> <version>2.4.2</version> </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoConfiguratorTypeTaglet</tagletClass> + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoConfiguratorTypeTaglet + </tagletClass> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> + <artifactId>maven-plugin-tools-javadoc + </artifactId> <version>2.4.2</version> </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecuteTypeTaglet</tagletClass> + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoExecuteTypeTaglet + </tagletClass> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> + <artifactId>maven-plugin-tools-javadoc + </artifactId> <version>2.4.2</version> </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecutionStrategyTypeTaglet + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoExecutionStrategyTypeTaglet </tagletClass> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> + <artifactId>maven-plugin-tools-javadoc + </artifactId> <version>2.4.2</version> </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoGoalTypeTaglet</tagletClass> + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoGoalTypeTaglet + </tagletClass> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> + <artifactId>maven-plugin-tools-javadoc + </artifactId> <version>2.4.2</version> </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInheritByDefaultTypeTaglet + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoInheritByDefaultTypeTaglet </tagletClass> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> + <artifactId>maven-plugin-tools-javadoc + </artifactId> <version>2.4.2</version> </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInstantiationStrategyTypeTaglet + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoInstantiationStrategyTypeTaglet </tagletClass> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> + <artifactId>maven-plugin-tools-javadoc + </artifactId> <version>2.4.2</version> </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoParameterFieldTaglet</tagletClass> + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoParameterFieldTaglet + </tagletClass> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> + <artifactId>maven-plugin-tools-javadoc + </artifactId> <version>2.4.2</version> </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoPhaseTypeTaglet</tagletClass> + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoPhaseTypeTaglet + </tagletClass> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> + <artifactId>maven-plugin-tools-javadoc + </artifactId> <version>2.4.2</version> </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoReadOnlyFieldTaglet</tagletClass> + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoReadOnlyFieldTaglet + </tagletClass> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> + <artifactId>maven-plugin-tools-javadoc + </artifactId> <version>2.4.2</version> </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiredFieldTaglet</tagletClass> + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoRequiredFieldTaglet + </tagletClass> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> + <artifactId>maven-plugin-tools-javadoc + </artifactId> <version>2.4.2</version> </tagletArtifact> </taglet> @@ -821,49 +966,60 @@ </tagletClass> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> + <artifactId>maven-plugin-tools-javadoc + </artifactId> <version>2.4.2</version> </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresDirectInvocationTypeTaglet + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoRequiresDirectInvocationTypeTaglet </tagletClass> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> + <artifactId>maven-plugin-tools-javadoc + </artifactId> <version>2.4.2</version> </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresOnLineTypeTaglet + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoRequiresOnLineTypeTaglet </tagletClass> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> + <artifactId>maven-plugin-tools-javadoc + </artifactId> <version>2.4.2</version> </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresProjectTypeTaglet + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoRequiresProjectTypeTaglet </tagletClass> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> + <artifactId>maven-plugin-tools-javadoc + </artifactId> <version>2.4.2</version> </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresReportsTypeTaglet + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoRequiresReportsTypeTaglet </tagletClass> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> + <artifactId>maven-plugin-tools-javadoc + </artifactId> <version>2.4.2</version> </tagletArtifact> </taglet> <taglet> - <tagletClass>org.codehaus.plexus.javadoc.PlexusComponentTaglet</tagletClass> + <tagletClass> + org.codehaus.plexus.javadoc.PlexusComponentTaglet + </tagletClass> <tagletArtifact> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-javadoc</artifactId> @@ -871,7 +1027,9 @@ </tagletArtifact> </taglet> <taglet> - <tagletClass>org.codehaus.plexus.javadoc.PlexusConfigurationTaglet</tagletClass> + <tagletClass> + org.codehaus.plexus.javadoc.PlexusConfigurationTaglet + </tagletClass> <tagletArtifact> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-javadoc</artifactId> @@ -879,7 +1037,9 @@ </tagletArtifact> </taglet> <taglet> - <tagletClass>org.codehaus.plexus.javadoc.PlexusRequirementTaglet</tagletClass> + <tagletClass> + org.codehaus.plexus.javadoc.PlexusRequirementTaglet + </tagletClass> <tagletArtifact> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-javadoc</artifactId> @@ -909,7 +1069,7 @@ <!-- Implicit add of reportSet to not generate jira reports --> <plugin> <artifactId>maven-changes-plugin</artifactId> - <version>2.2</version> + <version>2.3</version> <configuration> <issueLinkTemplatePerSystem> <redmine>${redmine.issueLinkTemplate}</redmine> @@ -938,7 +1098,8 @@ <version>2.4</version> <configuration> <linkXRef>true</linkXRef> - <sourceEncoding>${project.reporting.outputEncoding}</sourceEncoding> + <sourceEncoding>${project.reporting.outputEncoding} + </sourceEncoding> <minimumTokens>100</minimumTokens> <targetJdk>${maven.compile.target}</targetJdk> </configuration> @@ -1051,7 +1212,8 @@ <artifactId>maven-jredmine-plugin</artifactId> <version>${jredmine.version}</version> <configuration> - <columnNames>key,summary,status,assignee,tracker,priority,version,category,createdOn + <columnNames> + key,summary,status,assignee,tracker,priority,version,category,createdOn </columnNames> </configuration> <reportSets> @@ -1110,7 +1272,8 @@ <phase>install</phase> <configuration> <extraFiles/> - <descriptionFile>${redmine.collectedFiles}</descriptionFile> + <descriptionFile>${redmine.collectedFiles} + </descriptionFile> </configuration> </execution> </executions> @@ -1139,7 +1302,9 @@ <statusIds>3,4,5</statusIds> <!-- generate announcements --> - <urlDownload>${redmine.url}/projects/list_files/maven-helper-plugin</urlDownload> + <urlDownload> + ${redmine.url}/projects/list_files/maven-helper-plugin + </urlDownload> <!--<changesTitle>Release note of Maven pom project</changesTitle>--> <!--<releaseDescription>Description of first release</releaseDescription>--> @@ -1204,8 +1369,11 @@ <!-- for a multi-module just run on root project --> <runOnce>true</runOnce> - <emailTitle>[ANNOUNCEMENT] - ${project.artifactId} ${project.version} released</emailTitle> - <emailContentFile>target/generated-sources/announcement/release-email-announcement.vm + <emailTitle>[ANNOUNCEMENT] - ${project.artifactId} + ${project.version} released + </emailTitle> + <emailContentFile> + target/generated-sources/announcement/release-email-announcement.vm </emailContentFile> <mailSender> <name>${platform} Release Notification</name> @@ -1248,13 +1416,17 @@ <closeVersion>true</closeVersion> <!-- publish-attachments --> - <filesFromProperties>${redmine.collectedFiles}</filesFromProperties> + <filesFromProperties>${redmine.collectedFiles} + </filesFromProperties> <!-- publish-news --> - <newsContentFile>target/generated-sources/announcement/release-news-announcement.vm + <newsContentFile> + target/generated-sources/announcement/release-news-announcement.vm </newsContentFile> <newsSummary>${project.description}</newsSummary> - <newsTitle>${project.artifactId} ${project.version} released</newsTitle> + <newsTitle>${project.artifactId} ${project.version} + released + </newsTitle> </configuration> </plugin> @@ -1291,7 +1463,8 @@ <activeByDefault>false</activeByDefault> </activation> <properties> - <maven.reports.dependencyDetailsEnabled>false</maven.reports.dependencyDetailsEnabled> + <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) --> @@ -1301,7 +1474,8 @@ <activeByDefault>false</activeByDefault> </activation> <properties> - <maven.reports.dependencyLocationsEnabled>false</maven.reports.dependencyLocationsEnabled> + <maven.reports.dependencyLocationsEnabled>false + </maven.reports.dependencyLocationsEnabled> </properties> </profile> @@ -1319,15 +1493,21 @@ <artifactId>maven-invoker-plugin</artifactId> <configuration> <pomIncludes> - <pomInclude>collect-files/single/pom.xml</pomInclude> - <pomInclude>collect-files/multi/pom.xml</pomInclude> - <pomInclude>send-email/single/pom.xml</pomInclude> - <pomInclude>share-server-secret/single/pom.xml</pomInclude> + <pomInclude>collect-files/single/pom.xml + </pomInclude> + <pomInclude>collect-files/multi/pom.xml + </pomInclude> + <pomInclude>send-email/single/pom.xml + </pomInclude> + <pomInclude>share-server-secret/single/pom.xml + </pomInclude> </pomIncludes> <postBuildHookScript>verify</postBuildHookScript> - <localRepositoryPath>${basedir}/target/local-repo</localRepositoryPath> + <localRepositoryPath>${basedir}/target/local-repo + </localRepositoryPath> <settingsFile>src/it/settings.xml</settingsFile> - <cloneProjectsTo>${project.build.directory}/its</cloneProjectsTo> + <cloneProjectsTo>${project.build.directory}/its + </cloneProjectsTo> </configuration> <executions> <execution> Modified: trunk/src/main/java/org/nuiton/plugin/AbstractPlugin.java =================================================================== --- trunk/src/main/java/org/nuiton/plugin/AbstractPlugin.java 2009-12-29 15:39:54 UTC (rev 641) +++ trunk/src/main/java/org/nuiton/plugin/AbstractPlugin.java 2010-01-01 16:54:27 UTC (rev 642) @@ -87,7 +87,7 @@ @Override public final void execute() throws MojoExecutionException, MojoFailureException { - + try { // check if project packaging is compatible with the mojo boolean canContinue = checkPackaging(); @@ -127,9 +127,19 @@ } catch (Exception e) { throw new MojoExecutionException("could not execute goal " + getClass().getSimpleName() + " for reason : " + e.getMessage(), e); } + } finally { + afterExecute(); + } } /** + * A call back to execute after the {@link #execute()} is done + */ + protected void afterExecute() { + // by default do nothing + } + + /** * Check if the project packaging is acceptable for the mojo. * <p/> * By default, accept all packaging types. @@ -610,6 +620,19 @@ PluginHelper.deleteFile(file); } +/** + * Rename the given file to the destination one. + * + * @param file the file to rename + * @param destination the destination of the file + * @throws IOException if could not delete the file + * @since 1.2.0 + */ + protected void renameFile(File file,File destination) throws IOException { + PluginHelper.renameFile(file,destination); + } + + /** * @param file the source file * @return the backup file Modified: trunk/src/main/java/org/nuiton/plugin/PluginHelper.java =================================================================== --- trunk/src/main/java/org/nuiton/plugin/PluginHelper.java 2009-12-29 15:39:54 UTC (rev 641) +++ trunk/src/main/java/org/nuiton/plugin/PluginHelper.java 2010-01-01 16:54:27 UTC (rev 642) @@ -363,6 +363,21 @@ } /** + * Rename the given file to a new destination. + * + * @param file the file to rename + * @param destination the destination file + * @throws IOException if could not rename the file + * @since 1.2.0 + */ + public static void renameFile(File file, File destination) throws IOException { + boolean b = file.renameTo(destination); + if (!b) { + throw new IOException("could not rename " + file + " to " + destination); + } + } + + /** * Permet de copier le fichier source vers le fichier cible. * * @param source le fichier source @@ -456,6 +471,7 @@ // FileUtils.copyStreamToFile(facade, destFile); // } + public static List<File> getIncludedFiles(File dir, String[] includes, String[] excludes) { DirectoryScanner ds = new DirectoryScanner(); List<File> result = new ArrayList<File>();
participants (1)
-
tchemit＠users.nuiton.org