Author: tchemit Date: 2009-09-29 16:13:04 +0200 (Tue, 29 Sep 2009) New Revision: 654 Modified: trunk/pom.xml Log: - use maven-helper-plugin 1.1.0 - remove goal check-project-files invocation m(aven-helper-plugin) since now with mvn > 2.2.0 plugin execution id are fine and does no more mix up with the default one (moreover each maven must be independant, so each file should required a changelog.txt...) - [Evolution #68] utilisation du framework mojo maven-helper-plugin Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-26 01:32:51 UTC (rev 653) +++ trunk/pom.xml 2009-09-29 14:13:04 UTC (rev 654) @@ -236,8 +236,10 @@ <maven.javadoc.skip>false</maven.javadoc.skip> <maven.version>2.2.1</maven.version> - <helper.version>1.0.3-SNAPSHOT</helper.version> + <helper.version>1.1.0-SNAPSHOT</helper.version> <jredmine.version>1.0.0-SNAPSHOT</jredmine.version> + <!-- will be used in version 1.1.0 --> + <!--<license.version>2.0.0-SNAPSHOT</license.version>--> <jrst.version>1.0.0</jrst.version> <!-- default license to use --> @@ -279,23 +281,35 @@ </resources> <plugins> + <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> + <artifactId>maven-enforcer-plugin</artifactId> <executions> - <!-- check that the root module has a changelog.txt file --> <execution> <id>check-project-files</id> <goals> - <goal>check-project-files</goal> + <goal>enforce</goal> </goals> + <phase>initialize</phase> <configuration> - <verbose>true</verbose> + <rules> + <requireFilesExist> + <files> + <file>LICENSE.txt</file> + <file>README.txt</file> + <file>changelog.txt</file> + </files> + </requireFilesExist> + </rules> + <ignoreCache>true</ignoreCache> + <failFast>true</failFast> + <fail>true</fail> + </configuration> </execution> </executions> </plugin> - + </plugins> <pluginManagement> @@ -500,6 +514,13 @@ <version>${jredmine.version}</version> </plugin> + <!-- will be used in version 1.1.0 --> + <!--plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-license-plugin</artifactId> + <version>${license.version}</version> + </plugin--> + </plugins> </pluginManagement> @@ -783,8 +804,6 @@ </execution> </executions> <configuration> - <!-- common --> - <!--<xmlPath>${maven.changeFile}</xmlPath>--> <!-- generate-changes --> <generateOnce>true</generateOnce> @@ -825,6 +844,7 @@ <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> <executions> + <!-- will be removed when using maven-license-plugin --> <execution> <id>attach-licenses</id> <goals> @@ -832,7 +852,7 @@ <goal>add-third-party</goal> </goals> </execution> - + <!-- collect files to send to redmine --> <execution> <id>collect-files</id> <goals> @@ -848,7 +868,23 @@ </executions> </plugin> - + + + <!-- will be used in version 1.1.0 + add license and third-party files to classpath --> + <!--plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-license-plugin</artifactId> + <executions> + <execution> + <id>attach-licenses</id> + <goals> + <goal>add-license</goal> + <goal>add-third-party</goal> + </goals> + </execution> + </executions> + </plugin--> </plugins> </build> @@ -901,7 +937,7 @@ <filesFromProperties>${redmine.collectedFiles}</filesFromProperties> <!-- publish-news --> - <newsContentFile>target/announcement/release-news-announcement.vm</newsContentFile> + <newsContentFile>target/generated-sources/announcement/release-news-announcement.vm</newsContentFile> <newsSummary>${project.description}</newsSummary> <newsTitle>${project.name} ${project.version} released</newsTitle> @@ -929,7 +965,7 @@ <runOnce>true</runOnce> <emailTitle>[ANNOUNCEMENT] - ${project.name} ${project.version} released</emailTitle> - <emailContentFile>target/announcement/release-email-announcement.vm</emailContentFile> + <emailContentFile>target/generated-sources/announcement/release-email-announcement.vm</emailContentFile> <mailSender> <name>${platform} Release Notification</name> <email>noreply@${platform}</email> @@ -962,7 +998,7 @@ <artifactId>maven-enforcer-plugin</artifactId> <executions> <execution> - <id>run</id> + <id>check-run</id> <goals> <goal>enforce</goal> </goals>