You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/06/11 17:01:56 UTC
svn commit: r783808 - in /maven/components/trunk:
maven-core/src/main/java/org/apache/maven/project/
maven-model-builder/src/main/java/org/apache/maven/model/
maven-model-builder/src/main/java/org/apache/maven/model/interpolation/
Author: bentmann
Date: Thu Jun 11 15:01:55 2009
New Revision: 783808
URL: http://svn.apache.org/viewvc?rev=783808&view=rev
Log:
[MNG-2562] expose current time as a property for POM interpolation
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuildingRequest.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelBuildingRequest.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java?rev=783808&r1=783807&r2=783808&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java Thu Jun 11 15:01:55 2009
@@ -17,6 +17,7 @@
import java.io.File;
import java.io.IOException;
+import java.util.Date;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactUtils;
@@ -102,6 +103,7 @@
{
if ( localProject )
{
+ request.setBuildStartTime( new Date() );
result = modelBuilder.build( pomFile, request );
}
else
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuildingRequest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuildingRequest.java?rev=783808&r1=783807&r2=783808&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuildingRequest.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuildingRequest.java Thu Jun 11 15:01:55 2009
@@ -20,6 +20,7 @@
*/
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Properties;
@@ -46,8 +47,10 @@
private Properties executionProperties;
+ private Date buildStartTime;
+
private ModelResolver modelResolver;
-
+
public DefaultModelBuildingRequest()
{
profiles = new ArrayList<Profile>();
@@ -144,6 +147,18 @@
return this;
}
+ public Date getBuildStartTime()
+ {
+ return buildStartTime;
+ }
+
+ public ModelBuildingRequest setBuildStartTime( Date buildStartTime )
+ {
+ this.buildStartTime = buildStartTime;
+
+ return this;
+ }
+
public ModelResolver getModelResolver()
{
return this.modelResolver;
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelBuildingRequest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelBuildingRequest.java?rev=783808&r1=783807&r2=783808&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelBuildingRequest.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelBuildingRequest.java Thu Jun 11 15:01:55 2009
@@ -19,6 +19,7 @@
* under the License.
*/
+import java.util.Date;
import java.util.List;
import java.util.Properties;
@@ -130,6 +131,21 @@
ModelBuildingRequest setExecutionProperties( Properties executionProperties );
/**
+ * Gets the start time of the build.
+ *
+ * @return The start time of the build or {@code null} if unknown.
+ */
+ Date getBuildStartTime();
+
+ /**
+ * Sets the start time of the build.
+ *
+ * @param buildStartTime The start time of the build, may be {@code null}.
+ * @return This request, never {@code null}.
+ */
+ ModelBuildingRequest setBuildStartTime( Date buildStartTime );
+
+ /**
* Gets the model resolver to use for resolution of mixins or parents that are not locally reachable from the
* project directory.
*
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java?rev=783808&r1=783807&r2=783808&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java Thu Jun 11 15:01:55 2009
@@ -144,7 +144,7 @@
// NOTE: Order counts here!
valueSources.add( basedirValueSource );
valueSources.add( baseUriValueSource );
- // TODO: valueSources.add( new BuildTimestampValueSource( config.getBuildStartTime(), timestampFormat ) );
+ valueSources.add( new BuildTimestampValueSource( config.getBuildStartTime(), timestampFormat ) );
valueSources.add( modelValueSource1 );
valueSources.add( new MapBasedValueSource( modelProperties ) );
valueSources.add( new MapBasedValueSource( config.getExecutionProperties() ) );