Author: tchemit Date: 2009-09-29 12:45:48 +0200 (Tue, 29 Sep 2009) New Revision: 263 Modified: jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishNewsMojo.java jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/UpdateVersionMojo.java jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java jredmine/trunk/pom.xml Log: utilisation maven-helper-plugin 1.1.0 Modified: jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java =================================================================== --- jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java 2009-09-29 07:41:28 UTC (rev 262) +++ jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java 2009-09-29 10:45:48 UTC (rev 263) @@ -188,11 +188,6 @@ /////////////////////////////////////////////////////////////////////////// /// AbstractPlugin /////////////////////////////////////////////////////////////////////////// - @Override - protected boolean ensurePackaging() { - // accept all project's packaging - return false; - } @Override protected boolean init() throws Exception { Modified: jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java =================================================================== --- jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java 2009-09-29 07:41:28 UTC (rev 262) +++ jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java 2009-09-29 10:45:48 UTC (rev 263) @@ -47,7 +47,7 @@ import org.nuiton.jredmine.model.User; import org.nuiton.jredmine.model.Version; import org.nuiton.jredmine.RedmineServiceException; -import org.nuiton.util.PluginHelper; +import org.nuiton.plugin.PluginHelper; /** * Generates the changes.xml file from the Redmine's server to be used Modified: jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java =================================================================== --- jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java 2009-09-29 07:41:28 UTC (rev 262) +++ jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java 2009-09-29 10:45:48 UTC (rev 263) @@ -25,7 +25,7 @@ import org.apache.maven.plugin.MojoExecutionException; import org.nuiton.jredmine.model.ModelHelper; import org.nuiton.jredmine.model.Version; -import org.nuiton.util.PluginHelper; +import org.nuiton.plugin.PluginHelper; /** * Prepare the next version to be used. Modified: jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java =================================================================== --- jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java 2009-09-29 07:41:28 UTC (rev 262) +++ jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java 2009-09-29 10:45:48 UTC (rev 263) @@ -29,8 +29,8 @@ import java.util.Properties; import org.apache.maven.plugin.MojoExecutionException; import org.nuiton.jredmine.model.Attachment; -import org.nuiton.plugin.CollectFilesMojo; -import org.nuiton.util.PluginHelper; +import org.nuiton.io.plugin.CollectFilesMojo; +import org.nuiton.plugin.PluginHelper; /** * Publish files for a given project and version on redmine server. @@ -212,7 +212,7 @@ List<File> incoming = null; try { - incoming = CollectFilesMojo.getFiles(filesFromProperties); + incoming = new CollectFilesMojo().getFiles(filesFromProperties); getLog().info("Loaded " + filesFromProperties); } catch (IOException ex) { throw new MojoExecutionException("could not load file " + filesFromProperties, ex); Modified: jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishNewsMojo.java =================================================================== --- jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishNewsMojo.java 2009-09-29 07:41:28 UTC (rev 262) +++ jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishNewsMojo.java 2009-09-29 10:45:48 UTC (rev 263) @@ -22,7 +22,7 @@ import java.io.File; import org.nuiton.jredmine.model.News; -import org.nuiton.util.PluginHelper; +import org.nuiton.plugin.PluginHelper; /** * Publish a news on redmine server. Modified: jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/UpdateVersionMojo.java =================================================================== --- jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/UpdateVersionMojo.java 2009-09-29 07:41:28 UTC (rev 262) +++ jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/UpdateVersionMojo.java 2009-09-29 10:45:48 UTC (rev 263) @@ -25,7 +25,7 @@ import org.apache.maven.plugin.MojoExecutionException; import org.nuiton.jredmine.model.ModelHelper; import org.nuiton.jredmine.model.Version; -import org.nuiton.util.PluginHelper; +import org.nuiton.plugin.PluginHelper; /** * Create or update a version on redmine server. Modified: jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java =================================================================== --- jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java 2009-09-29 07:41:28 UTC (rev 262) +++ jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java 2009-09-29 10:45:48 UTC (rev 263) @@ -34,7 +34,7 @@ import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.velocity.VelocityComponent; import org.nuiton.jredmine.plugin.AbstractRedmineMojo; -import org.nuiton.util.PluginHelper; +import org.nuiton.plugin.PluginHelper; /** * Modified: jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java =================================================================== --- jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java 2009-09-29 07:41:28 UTC (rev 262) +++ jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java 2009-09-29 10:45:48 UTC (rev 263) @@ -27,7 +27,7 @@ import org.apache.maven.reporting.MavenReportException; import org.nuiton.jredmine.model.Issue; import org.nuiton.jredmine.RedmineServiceException; -import org.nuiton.util.PluginHelper; +import org.nuiton.plugin.PluginHelper; /** * Abstract Generates a report for issues from Redmine's server Modified: jredmine/trunk/pom.xml =================================================================== --- jredmine/trunk/pom.xml 2009-09-29 07:41:28 UTC (rev 262) +++ jredmine/trunk/pom.xml 2009-09-29 10:45:48 UTC (rev 263) @@ -242,7 +242,7 @@ <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> <!-- default license to use --> <license.licenseName>lgpl_v3</license.licenseName> @@ -275,10 +275,37 @@ <plugins> <plugin> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>check-project-files</id> + <goals> + <goal>enforce</goal> + </goals> + <phase>initialize</phase> + <configuration> + <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> + <!--<plugin> <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> <executions> - <!-- check that the root module has a changelog.txt file --> + check that the root module has a changelog.txt file <execution> <id>check-project-files</id> <goals> @@ -289,7 +316,7 @@ </configuration> </execution> </executions> - </plugin> + </plugin>--> </plugins>