Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Now that we're holding back the plugin config for interpolation just before it's used, we need to accept pom.* expressions in the parameter expression evaluator. Also, setting the maven-distribution finalName for the assembly plugin back to its old expression, which used pom.version not project.version. 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672784 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
John Dennis Casey 2008-06-30 14:47:09 +00:00
parent 5c32bc6b28
commit 3e03ce0956
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
View File

@ -117,6 +117,7 @@ public PluginParameterExpressionEvaluator( MavenSession context,
* @deprecated Use {@link PluginParameterExpressionEvaluator#PluginParameterExpressionEvaluator(MavenSession, MojoExecution, PathTranslator, LifecycleExecutionContext, Logger, Properties)} * @deprecated Use {@link PluginParameterExpressionEvaluator#PluginParameterExpressionEvaluator(MavenSession, MojoExecution, PathTranslator, LifecycleExecutionContext, Logger, Properties)}
* instead. * instead.
*/ */
@Deprecated
public PluginParameterExpressionEvaluator( MavenSession context, public PluginParameterExpressionEvaluator( MavenSession context,
MojoExecution mojoExecution, MojoExecution mojoExecution,
PathTranslator pathTranslator, PathTranslator pathTranslator,
@ -250,7 +251,7 @@ else if ( "executedProject".equals( expression ) )
{ {
value = project.getExecutionProject(); value = project.getExecutionProject();
} }
else if ( expression.startsWith( "project" ) ) else if ( expression.startsWith( "project" ) || expression.startsWith( "pom" ) )
{ {
try try
{ {

2
maven-distribution/pom.xml
View File

@ -216,7 +216,7 @@ under the License.
</goals> </goals>
<configuration> <configuration>
<descriptor>src/main/assembly/bin.xml</descriptor> <descriptor>src/main/assembly/bin.xml</descriptor>
<finalName>apache-maven-${project.version}</finalName> <finalName>apache-maven-${pom.version}</finalName>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>