You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2012/11/03 11:57:36 UTC
svn commit: r1405318 - in /maven/plugin-tools/trunk: maven-plugin-plugin/src/it/java-basic-annotations/ maven-plugin-plugin/src/it/java-basic/ maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/

Author: hboutemy
Date: Sat Nov  3 10:57:36 2012
New Revision: 1405318

URL: http://svn.apache.org/viewvc?rev=1405318&view=rev
Log:
[MPLUGIN-225] made generated descriptor from MojoExecution as Component compatible with Maven 2

Modified:
    maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic-annotations/verify.groovy
    maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic/verify.groovy
    maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java

Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic-annotations/verify.groovy
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic-annotations/verify.groovy?rev=1405318&r1=1405317&r2=1405318&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic-annotations/verify.groovy (original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic-annotations/verify.groovy Sat Nov  3 10:57:36 2012
@@ -42,7 +42,7 @@ assert mojo.configuration.project[0].'@d
 
 assert mojo.configuration.mojo[0].text() == ''
 assert mojo.configuration.mojo[0].'@implementation' == 'org.apache.maven.plugin.MojoExecution'
-assert mojo.configuration.mojo[0].'@default-value' == '${mojo}'
+assert mojo.configuration.mojo[0].'@default-value' == '${mojoExecution}'
 
 assert mojo.configuration.plugin[0].text() == ''
 assert mojo.configuration.plugin[0].'@implementation' == 'org.apache.maven.plugin.descriptor.PluginDescriptor'

Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic/verify.groovy
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic/verify.groovy?rev=1405318&r1=1405317&r2=1405318&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic/verify.groovy (original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic/verify.groovy Sat Nov  3 10:57:36 2012
@@ -42,7 +42,7 @@ assert mojo.configuration.project[0].'@d
 
 assert mojo.configuration.mojo[0].text() == ''
 assert mojo.configuration.mojo[0].'@implementation' == 'org.apache.maven.plugin.MojoExecution'
-assert mojo.configuration.mojo[0].'@default-value' == '${mojo}'
+assert mojo.configuration.mojo[0].'@default-value' == '${mojoExecution}'
 
 assert mojo.configuration.plugin[0].text() == ''
 assert mojo.configuration.plugin[0].'@implementation' == 'org.apache.maven.plugin.descriptor.PluginDescriptor'

Modified: maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java?rev=1405318&r1=1405317&r2=1405318&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java Sat Nov  3 10:57:36 2012
@@ -57,7 +57,7 @@ public final class PluginUtils
 
         mavenComponents.put( "org.apache.maven.execution.MavenSession", "${session}" );
         mavenComponents.put( "org.apache.maven.project.MavenProject", "${project}" );
-        mavenComponents.put( "org.apache.maven.plugin.MojoExecution", "${mojo}" );
+        mavenComponents.put( "org.apache.maven.plugin.MojoExecution", "${mojoExecution}" );
         mavenComponents.put( "org.apache.maven.plugin.descriptor.PluginDescriptor", "${plugin}" );
         mavenComponents.put( "org.apache.maven.settings.Settings", "${settings}" );