You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2008/02/14 22:35:36 UTC
svn commit: r627878 - in /maven/plugins/trunk/maven-assembly-plugin/src:
main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java
test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java
Author: jdcasey
Date: Thu Feb 14 13:35:31 2008
New Revision: 627878
URL: http://svn.apache.org/viewvc?rev=627878&view=rev
Log:
[MASSEMBLY-189] Fixing pom-variable interpolation.
Submitted by: Benjamin Bentmann
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java?rev=627878&r1=627877&r2=627878&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java Thu Feb 14 13:35:31 2008
@@ -180,7 +180,7 @@
{
try
{
- value = ReflectionValueExtractor.evaluate( realExpr, project );
+ value = ReflectionValueExtractor.evaluate( realExpr, project, false );
}
catch ( Exception e )
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java?rev=627878&r1=627877&r2=627878&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java Thu Feb 14 13:35:31 2008
@@ -19,6 +19,7 @@
* under the License.
*/
+import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
import org.apache.maven.plugin.assembly.model.Assembly;
import org.apache.maven.plugin.assembly.model.DependencySet;
@@ -187,6 +188,24 @@
Assembly result = interpolator.interpolate( assembly, new MavenProject( model ), Collections.EMPTY_MAP );
assertEquals( "assembly.${unresolved}", result.getId() );
+ }
+
+ public void testShouldInterpolateMultiDotProjectExpression()
+ throws AssemblyInterpolationException
+ {
+ Build build = new Build();
+ build.setFinalName( "final-name" );
+
+ Model model = new Model();
+ model.setBuild( build );
+
+ Assembly assembly = new Assembly();
+
+ assembly.setId( "assembly.${project.build.finalName}" );
+
+ Assembly result = interpolator.interpolate( assembly, new MavenProject( model ), Collections.EMPTY_MAP );
+
+ assertEquals( "assembly.final-name", result.getId() );
}
}