Author: tchemit Date: 2009-09-26 00:08:05 +0200 (Sat, 26 Sep 2009) New Revision: 237 Modified: jredmine/trunk/jredmine-client/pom.xml jredmine/trunk/maven-jredmine-plugin/pom.xml jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java jredmine/trunk/maven-jredmine-plugin/src/main/resources/META-INF/plexus/components.xml jredmine/trunk/pom.xml Log: [ANOMALIE #60] : rendre le plugin compatible 2.2.x (maven-helper-plugin) Modified: jredmine/trunk/jredmine-client/pom.xml =================================================================== --- jredmine/trunk/jredmine-client/pom.xml 2009-09-25 21:43:33 UTC (rev 236) +++ jredmine/trunk/jredmine-client/pom.xml 2009-09-25 22:08:05 UTC (rev 237) @@ -54,9 +54,34 @@ </exclusion> <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-simple</artifactId> + </exclusion> + + <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-api</artifactId> + </exclusion> + + <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-javamail</artifactId> + </exclusion> + + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + + <exclusion> <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> </exclusion> + + <exclusion> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </exclusion> </exclusions> </dependency> Modified: jredmine/trunk/maven-jredmine-plugin/pom.xml =================================================================== --- jredmine/trunk/maven-jredmine-plugin/pom.xml 2009-09-25 21:43:33 UTC (rev 236) +++ jredmine/trunk/maven-jredmine-plugin/pom.xml 2009-09-25 22:08:05 UTC (rev 237) @@ -51,7 +51,7 @@ <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-core</artifactId> + <artifactId>maven-settings</artifactId> </dependency> <dependency> 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-25 21:43:33 UTC (rev 236) +++ jredmine/trunk/maven-jredmine-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java 2009-09-25 22:08:05 UTC (rev 237) @@ -20,12 +20,10 @@ */ package org.nuiton.jredmine.plugin; -import java.io.File; import java.net.URL; import java.text.DateFormat; import java.text.SimpleDateFormat; -import org.apache.maven.execution.MavenSession; import org.apache.maven.model.IssueManagement; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; @@ -55,12 +53,6 @@ public static final String REDMINE_SYSTEM = "redmine"; /** - * @parameter expression="${session}" - * @required - * @readonly - */ - protected MavenSession mavenSession; - /** * Dependance du projet. * * @parameter default-value="${project}" @@ -142,7 +134,7 @@ /** * password decypher * - * @component roleHint="maven-redmine-plugin" + * @component roleHint="maven-helper-plugin" * @since 1.0.0 */ protected SecDispatcher sec; @@ -523,24 +515,6 @@ } protected boolean isExecutionRoot() { - return project == getExecutionRootProject(); + return project.isExecutionRoot(); } - - protected MavenProject getExecutionRootProject() { - MavenProject root = project; - String executionRootDirectory = mavenSession.getExecutionRootDirectory(); - while (root != null) { - File dir = root.getBasedir(); - getLog().debug("Current Folder:" + dir); - boolean result = executionRootDirectory.equalsIgnoreCase(dir.toString()); - if (result) { - break; - } - root = root.getParent(); - } - if (verbose) { - getLog().info("root project " + root); - } - return root; - } } Modified: jredmine/trunk/maven-jredmine-plugin/src/main/resources/META-INF/plexus/components.xml =================================================================== --- jredmine/trunk/maven-jredmine-plugin/src/main/resources/META-INF/plexus/components.xml 2009-09-25 21:43:33 UTC (rev 236) +++ jredmine/trunk/maven-jredmine-plugin/src/main/resources/META-INF/plexus/components.xml 2009-09-25 22:08:05 UTC (rev 237) @@ -20,24 +20,6 @@ <component-set> <components> <component> - <role>org.sonatype.plexus.components.sec.dispatcher.SecDispatcher</role> - <role-hint>maven-redmine-plugin</role-hint> - <implementation>org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher</implementation> - <requirements> - <requirement> - <role>org.sonatype.plexus.components.cipher.PlexusCipher</role> - <field-name>_cipher</field-name> - </requirement> - <requirement> - <role>org.sonatype.plexus.components.sec.dispatcher.PasswordDecryptor</role> - <field-name>_decryptors</field-name> - </requirement> - </requirements> - <configuration> - <_configurationFile>~/.m2/settings-security.xml</_configurationFile> - </configuration> - </component> - <component> <role>org.codehaus.plexus.velocity.VelocityComponent</role> <role-hint>maven-jredmine-plugin</role-hint> <implementation>org.codehaus.plexus.velocity.DefaultVelocityComponent</implementation> Modified: jredmine/trunk/pom.xml =================================================================== --- jredmine/trunk/pom.xml 2009-09-25 21:43:33 UTC (rev 236) +++ jredmine/trunk/pom.xml 2009-09-25 22:08:05 UTC (rev 237) @@ -57,7 +57,7 @@ <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-core</artifactId> + <artifactId>maven-settings</artifactId> <version>${maven.version}</version> <scope>provided</scope> </dependency> @@ -241,7 +241,7 @@ <!-- pour ne pas generer la javadoc (quand on aura un javadoc 2.5) --> <maven.javadoc.skip>false</maven.javadoc.skip> - <maven.version>2.1.0</maven.version> + <maven.version>2.2.1</maven.version> <helper.version>1.0.3-SNAPSHOT</helper.version> <!-- default license to use -->