From 80aacd51f26e053e7091d2abcf7d991ba8d20a83 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Sat, 3 Nov 2012 10:57:36 +0000 Subject: [PATCH] [MPLUGIN-225] made generated descriptor from MojoExecution as Component compatible with Maven 2 git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1405318 13f79535-47bb-0310-9956-ffa450edef68 --- maven-plugin-plugin/src/it/java-basic-annotations/verify.groovy | 2 +- maven-plugin-plugin/src/it/java-basic/verify.groovy | 2 +- .../java/org/apache/maven/tools/plugin/util/PluginUtils.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/maven-plugin-plugin/src/it/java-basic-annotations/verify.groovy b/maven-plugin-plugin/src/it/java-basic-annotations/verify.groovy index 9f48f3a..bea300c 100644 --- a/maven-plugin-plugin/src/it/java-basic-annotations/verify.groovy +++ b/maven-plugin-plugin/src/it/java-basic-annotations/verify.groovy @@ -42,7 +42,7 @@ assert mojo.configuration.project[0].'@default-value' == '${project}' 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' diff --git a/maven-plugin-plugin/src/it/java-basic/verify.groovy b/maven-plugin-plugin/src/it/java-basic/verify.groovy index 8675d2d..bdbbba4 100644 --- a/maven-plugin-plugin/src/it/java-basic/verify.groovy +++ b/maven-plugin-plugin/src/it/java-basic/verify.groovy @@ -42,7 +42,7 @@ assert mojo.configuration.project[0].'@default-value' == '${project}' 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' diff --git a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java index b108b99..8639a11 100644 --- a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java +++ b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java @@ -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}" );