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

Fix: interpolator - mavenVersion and maven.version are implicitly set. 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@718472 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Britton Isbell 2008-11-18 03:04:29 +00:00
parent 50bfa25053
commit 00a0f513b1
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
View File

@ -72,7 +72,7 @@ import java.text.SimpleDateFormat;
*/ */
public class DefaultMavenProjectBuilder public class DefaultMavenProjectBuilder
implements MavenProjectBuilder, Initializable, LogEnabled implements MavenProjectBuilder, Initializable, LogEnabled
{ {
protected MavenProfilesBuilder profilesBuilder; protected MavenProfilesBuilder profilesBuilder;
protected ArtifactResolver artifactResolver; protected ArtifactResolver artifactResolver;
@ -538,6 +538,8 @@ public class DefaultMavenProjectBuilder
PomInterpolatorTag.PROJECT_PROPERTIES.name())); PomInterpolatorTag.PROJECT_PROPERTIES.name()));
} }
interpolatorProperties.add(new InterpolatorProperty("${mavenVersion}", MavenProjectBuilder.STANDALONE_SUPERPOM_VERSION, PomInterpolatorTag.SYSTEM_PROPERTIES.name()));
interpolatorProperties.add(new InterpolatorProperty("${maven.version}", MavenProjectBuilder.STANDALONE_SUPERPOM_VERSION, PomInterpolatorTag.SYSTEM_PROPERTIES.name()));
MavenProject mavenProject; MavenProject mavenProject;
try try
{ {

2
maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
View File

@ -30,7 +30,7 @@ public interface MavenProjectBuilder
String STANDALONE_SUPERPOM_ARTIFACTID = "super-pom"; String STANDALONE_SUPERPOM_ARTIFACTID = "super-pom";
String STANDALONE_SUPERPOM_VERSION = "3.0"; String STANDALONE_SUPERPOM_VERSION = "3.0-SNAPSHOT";
boolean STRICT_MODEL_PARSING = true; boolean STRICT_MODEL_PARSING = true;