Index: src/test/java/org/apache/maven/changelog/ChangeLogTest.java =================================================================== --- src/test/java/org/apache/maven/changelog/ChangeLogTest.java (revision 410116) +++ src/test/java/org/apache/maven/changelog/ChangeLogTest.java (working copy) @@ -25,6 +25,7 @@ import java.io.FileInputStream; import java.io.InputStream; import java.util.List; +import java.util.Calendar; /** * @author Edwin Punzalan @@ -47,8 +48,16 @@ ChangeSet changeSet = (ChangeSet) changelogSets.getChangeSets().get( 0 ); - assertEquals( "Test changelog 1 set 1 date/time", 239635800000L, changeSet.getDate().getTime() ); + Calendar cal = Calendar.getInstance(); // new cal with default TZ + + cal.set( 1977, 7, 6, 5, 30, 0); // expected date from min-changelog.xml + + cal.set( Calendar.MILLISECOND, 0); + + + assertEquals( "Test changelog 1 set 1 date/time", cal.getTime().getTime(), changeSet.getDate().getTime() ); + assertEquals( "Test changelog 1 set 1 author", "Edwin Punzalan", changeSet.getAuthor() ); assertEquals( "Test changelog 1 set 1 msg", "First commit msg", changeSet.getComment() ); @@ -64,8 +73,10 @@ changeSet = (ChangeSet) changelogSets.getChangeSets().get( 1 ); - assertEquals( "Test changelog 1 set 2 date/time", 1109223000000L, changeSet.getDate().getTime() ); + cal.set( 2005, 1, 24, 21, 30, 0 ); + assertEquals( "Test changelog 1 set 2 date/time", cal.getTime().getTime(), changeSet.getDate().getTime() ); + assertEquals( "Test changelog 1 set 2 author", "Edwin Punzalan", changeSet.getAuthor() ); assertEquals( "Test changelog 1 set 2 msg", "Second commit msg", changeSet.getComment() ); @@ -92,8 +103,10 @@ changeSet = (ChangeSet) changelogSets.getChangeSets().get( 0 ); - assertEquals( "Test changelog 2 set 1 date/time", 1109313900000L, changeSet.getDate().getTime() ); + cal.set( 2005, 1, 25, 22, 45, 0 ); + assertEquals( "Test changelog 2 set 1 date/time", cal.getTime().getTime(), changeSet.getDate().getTime() ); + assertEquals( "Test changelog 2 set 1 author", "Keogh Edrich Punzalan", changeSet.getAuthor() ); assertEquals( "Test changelog 2 set 1 msg", "Third commit msg", changeSet.getComment() ); @@ -109,8 +122,10 @@ changeSet = (ChangeSet) changelogSets.getChangeSets().get( 1 ); - assertEquals( "Test changelog 2 set 2 date/time", 4107159000000L, changeSet.getDate().getTime() ); + cal.set( 2100, 1, 25, 5, 30, 0 ); + assertEquals( "Test changelog 2 set 2 date/time", cal.getTime().getTime(), changeSet.getDate().getTime() ); + assertEquals( "Test changelog 2 set 2 author", "Keogh Edrich Punzalan", changeSet.getAuthor() ); assertEquals( "Test changelog 2 set 2 msg", "Last commit msg", changeSet.getComment() ); Index: src/main/java/org/apache/maven/changelog/ChangeLogHandler.java =================================================================== --- src/main/java/org/apache/maven/changelog/ChangeLogHandler.java (revision 410116) +++ src/main/java/org/apache/maven/changelog/ChangeLogHandler.java (working copy) @@ -28,6 +28,7 @@ import java.util.Collection; import java.util.Date; import java.util.LinkedList; +import java.util.TimeZone; /** * Change log generated xml parser. SAXParser listener for processing a previously generated xml into several @@ -114,7 +115,7 @@ { ms = bufEntry.getDate().getTime(); } - bufEntry.setDate( new Date( ms + new SimpleDateFormat( currentPattern ).parse( bufData ).getTime() ) ); + bufEntry.setDate( new Date( ms + new SimpleDateFormat( currentPattern ).parse( bufData ).getTime() + TimeZone.getDefault().getRawOffset()) ); } catch ( ParseException e ) {