You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2009/04/29 08:21:18 UTC
svn commit: r769675 -
/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Author: sisbell
Date: Wed Apr 29 06:21:16 2009
New Revision: 769675
URL: http://svn.apache.org/viewvc?rev=769675&view=rev
Log:
Using props directly for the interpolator.
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=769675&r1=769674&r2=769675&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Wed Apr 29 06:21:16 2009
@@ -255,7 +255,7 @@
List<Profile> projectProfiles;
Properties props = new Properties();
props.putAll(configuration.getExecutionProperties());
- props.putAll(configuration.getUserProperties());
+ // props.putAll(configuration.getUserProperties());
try
{
@@ -407,19 +407,14 @@
String projectId = safeVersionlessKey( model.getGroupId(), model.getArtifactId() );
- List<InterpolatorProperty> interpolatorProperties = new ArrayList<InterpolatorProperty>();
- interpolatorProperties.addAll( InterpolatorProperty.toInterpolatorProperties( config.getExecutionProperties(), PomInterpolatorTag.EXECUTION_PROPERTIES.name() ) );
- interpolatorProperties.addAll( InterpolatorProperty.toInterpolatorProperties( config.getUserProperties(), PomInterpolatorTag.USER_PROPERTIES.name() ) );
-
+ Properties props = new Properties(config.getExecutionProperties());
if ( config.getBuildStartTime() != null )
{
- interpolatorProperties.add( new InterpolatorProperty( "${build.timestamp}", new SimpleDateFormat( "yyyyMMdd-hhmm" ).format( config.getBuildStartTime() ),
- PomInterpolatorTag.PROJECT_PROPERTIES.name() ) );
- }
-
+ props.put("${build.timestamp}", new SimpleDateFormat( "yyyyMMdd-hhmm" ).format( config.getBuildStartTime() ) );
+ }
try
{
- model = interpolator.interpolateDomainModel( domainModel, interpolatorProperties ).getModel();
+ model = interpolator.interpolateDomainModel( domainModel, props ).getModel();
}
catch ( IOException e )
{