svn commit: r686268 - in /maven/components/branches/maven-2.0.10-RC: maven-core/src/main/java/org/apache/maven/plugin/ maven-project/src/main/java/org/apache/maven/project/interpolation/ maven-project/src/test/java/org/apache/maven/project/interpolation/

[jdcasey]

Author: jdcasey
Date: Fri Aug 15 09:01:30 2008
New Revision: 686268

URL: http://svn.apache.org/viewvc?rev=686268&view=rev
Log:
[MNG-3718] Ensure default build timestamp format (for interpolation) uses 
24-hour time. Includes a unit test for the default timestamp format.

Modified:
    
maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
    
maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java
    
maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolatorTest.java

Modified: 
maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=686268&r1=686267&r2=686268&view=diff
==============================================================================
--- 
maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
 (original)
+++ 
maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
 Fri Aug 15 09:01:30 2008
@@ -1,4 +1,3 @@
-
 package org.apache.maven.plugin;
 
 /*
@@ -57,8 +56,6 @@
 import org.apache.maven.project.ProjectBuildingException;
 import org.apache.maven.project.artifact.InvalidDependencyVersionException;
 import org.apache.maven.project.artifact.MavenMetadataSource;
-import org.apache.maven.project.interpolation.ModelInterpolationException;
-import org.apache.maven.project.interpolation.ModelInterpolator;
 import org.apache.maven.project.path.PathTranslator;
 import org.apache.maven.reporting.MavenReport;
 import org.apache.maven.settings.Settings;

Modified: 
maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java?rev=686268&r1=686267&r2=686268&view=diff
==============================================================================
--- 
maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java
 (original)
+++ 
maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java
 Fri Aug 15 09:01:30 2008
@@ -32,7 +32,7 @@
  */
 public interface ModelInterpolator
 {
-    String DEFAULT_BUILD_TIMESTAMP_FORMAT = "yyyyMMdd-hhmm";
+    String DEFAULT_BUILD_TIMESTAMP_FORMAT = "yyyyMMdd-HHmm";
 
     String BUILD_TIMESTAMP_FORMAT_PROPERTY = "maven.build.timestamp.format";
 

Modified: 
maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolatorTest.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolatorTest.java?rev=686268&r1=686267&r2=686268&view=diff
==============================================================================
--- 
maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolatorTest.java
 (original)
+++ 
maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolatorTest.java
 Fri Aug 15 09:01:30 2008
@@ -33,7 +33,10 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Collections;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -58,6 +61,34 @@
 
         context = Collections.singletonMap( "basedir", "myBasedir" );
     }
+    
+    public void testDefaultBuildTimestampFormatShouldParseTimeIn24HourFormat()
+    {
+        Calendar cal = Calendar.getInstance();
+        cal.set( Calendar.HOUR, 12 );
+        cal.set( Calendar.AM_PM, Calendar.AM );
+        
+        // just to make sure all the bases are covered...
+        cal.set( Calendar.HOUR_OF_DAY, 0 );
+        cal.set( Calendar.MINUTE, 16 );
+        cal.set( Calendar.YEAR, 1976 );
+        cal.set( Calendar.MONTH, Calendar.NOVEMBER );
+        cal.set( Calendar.DATE, 11 );
+        
+        Date firstTestDate = cal.getTime();
+        
+        cal.set( Calendar.HOUR, 11 );
+        cal.set( Calendar.AM_PM, Calendar.PM );
+        
+        // just to make sure all the bases are covered...
+        cal.set( Calendar.HOUR_OF_DAY, 23 );
+        
+        Date secondTestDate = cal.getTime();
+        
+        SimpleDateFormat format = new SimpleDateFormat( 
ModelInterpolator.DEFAULT_BUILD_TIMESTAMP_FORMAT );
+        assertEquals( "19761111-0016", format.format( firstTestDate ) );
+        assertEquals( "19761111-2316", format.format( secondTestDate ) );
+    }
 
     public void testShouldNotThrowExceptionOnReferenceToNonExistentValue()
         throws IOException, ModelInterpolationException, 
InitializationException