svn commit: r783860 - in /maven/components/trunk/maven-core/src/main/java/org/apache/maven: execution/DefaultMavenExecutionRequest.java project/DefaultProjectBuilder.java project/DefaultProjectBuildingRequest.java project/ProjectBuildingRequest.java

[be...@apache.org]

Author: bentmann
Date: Thu Jun 11 17:41:25 2009
New Revision: 783860

URL: http://svn.apache.org/viewvc?rev=783860&view=rev
Log:
[MNG-2562] expose current time as a property for POM interpolation

o Fixed timestamp handling, was meant to be per reactor, not per module

Modified:
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java?rev=783860&r1=783859&r2=783860&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java Thu Jun 11 17:41:25 2009
@@ -718,6 +718,7 @@
             projectBuildingRequest.setInactiveProfileIds( getInactiveProfiles() );
             projectBuildingRequest.setProfiles( getProfiles() );
             projectBuildingRequest.setProcessPlugins( true );
+            projectBuildingRequest.setBuildStartTime( getStartTime() );
         }
 
         return projectBuildingRequest;

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=783860&r1=783859&r2=783860&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 17:41:25 2009
@@ -96,6 +96,7 @@
         request.setActiveProfileIds( configuration.getActiveProfileIds() );
         request.setInactiveProfileIds( configuration.getInactiveProfileIds() );
         request.setExecutionProperties( configuration.getExecutionProperties() );
+        request.setBuildStartTime( configuration.getBuildStartTime() );
         request.setModelResolver( resolver );
 
         ModelBuildingResult result;
@@ -103,7 +104,6 @@
         {
             if ( localProject )
             {
-                request.setBuildStartTime( new Date() );
                 result = modelBuilder.build( pomFile, request );
             }
             else

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java?rev=783860&r1=783859&r2=783860&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java Thu Jun 11 17:41:25 2009
@@ -20,6 +20,7 @@
  */
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Properties;
 
@@ -50,6 +51,8 @@
 
     private Properties executionProperties;
 
+    private Date buildStartTime;
+
     public DefaultProjectBuildingRequest()
     {
         processPlugins = true;
@@ -191,4 +194,14 @@
         return profiles;
     }
 
+    public Date getBuildStartTime()
+    {
+        return buildStartTime;
+    }
+
+    public void setBuildStartTime( Date buildStartTime )
+    {
+        this.buildStartTime = buildStartTime;
+    }
+
 }

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java?rev=783860&r1=783859&r2=783860&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java Thu Jun 11 17:41:25 2009
@@ -1,10 +1,10 @@
 package org.apache.maven.project;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Properties;
 
 import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.model.ModelBuildingRequest;
 import org.apache.maven.model.Profile;
 
 public interface ProjectBuildingRequest
@@ -72,4 +72,19 @@
     
     List<Profile> getProfiles();
 
+    /**
+     * 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}.
+     */
+    void setBuildStartTime( Date buildStartTime );
+
 }