Repository: maven Updated Branches: refs/heads/master bcacea2cf -> b711de57d
[MNG-5906] Use canonical name for UTC timezone Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/b711de57 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/b711de57 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/b711de57 Branch: refs/heads/master Commit: b711de57dcd7d5db5b97ab4c9e1a618293e33a4d Parents: bcacea2 Author: Michael Osipov <micha...@apache.org> Authored: Sat Oct 10 14:39:31 2015 +0200 Committer: Michael Osipov <micha...@apache.org> Committed: Sat Oct 10 14:39:31 2015 +0200 ---------------------------------------------------------------------- .../maven/repository/internal/RemoteSnapshotMetadata.java | 7 +++++-- .../legacy/resolver/transform/SnapshotTransformation.java | 10 +++++----- .../maven/model/interpolation/MavenBuildTimestamp.java | 4 +++- .../interpolation/AbstractModelInterpolatorTest.java | 8 ++++---- 4 files changed, 17 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/b711de57/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java ---------------------------------------------------------------------- diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java index 98c914a..285d218 100644 --- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java +++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java @@ -41,6 +41,9 @@ import org.eclipse.aether.artifact.Artifact; final class RemoteSnapshotMetadata extends MavenSnapshotMetadata { + private static final String DEFAULT_SNAPSHOT_TIMESTAMP_FORMAT = "yyyyMMdd.HHmmss"; + + private static final TimeZone DEFAULT_SNAPSHOT_TIME_ZONE = TimeZone.getTimeZone( "Etc/UTC" ); private final Map<String, SnapshotVersion> versions = new LinkedHashMap<>(); @@ -73,9 +76,9 @@ final class RemoteSnapshotMetadata if ( metadata.getVersioning() == null ) { - DateFormat utcDateFormatter = new SimpleDateFormat( "yyyyMMdd.HHmmss" ); + DateFormat utcDateFormatter = new SimpleDateFormat( DEFAULT_SNAPSHOT_TIMESTAMP_FORMAT ); utcDateFormatter.setCalendar( new GregorianCalendar() ); - utcDateFormatter.setTimeZone( TimeZone.getTimeZone( "UTC" ) ); + utcDateFormatter.setTimeZone( DEFAULT_SNAPSHOT_TIME_ZONE ); snapshot = new Snapshot(); snapshot.setBuildNumber( getBuildNumber( recessive ) + 1 ); http://git-wip-us.apache.org/repos/asf/maven/blob/b711de57/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java index 94f0ec0..bd97da7 100644 --- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java +++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java @@ -46,11 +46,11 @@ import org.codehaus.plexus.util.StringUtils; public class SnapshotTransformation extends AbstractVersionTransformation { - private String deploymentTimestamp; + private static final String DEFAULT_SNAPSHOT_TIMESTAMP_FORMAT = "yyyyMMdd.HHmmss"; - private static final TimeZone UTC_TIME_ZONE = TimeZone.getTimeZone( "UTC" ); + private static final TimeZone DEFAULT_SNAPSHOT_TIME_ZONE = TimeZone.getTimeZone( "Etc/UTC" ); - private static final String UTC_TIMESTAMP_PATTERN = "yyyyMMdd.HHmmss"; + private String deploymentTimestamp; public void transformForResolve( Artifact artifact, RepositoryRequest request ) throws ArtifactResolutionException @@ -163,8 +163,8 @@ public class SnapshotTransformation public static DateFormat getUtcDateFormatter() { - DateFormat utcDateFormatter = new SimpleDateFormat( UTC_TIMESTAMP_PATTERN ); - utcDateFormatter.setTimeZone( UTC_TIME_ZONE ); + DateFormat utcDateFormatter = new SimpleDateFormat( DEFAULT_SNAPSHOT_TIMESTAMP_FORMAT ); + utcDateFormatter.setTimeZone( DEFAULT_SNAPSHOT_TIME_ZONE ); return utcDateFormatter; } http://git-wip-us.apache.org/repos/asf/maven/blob/b711de57/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/MavenBuildTimestamp.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/MavenBuildTimestamp.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/MavenBuildTimestamp.java index 447f0ef..d02948a 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/MavenBuildTimestamp.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/MavenBuildTimestamp.java @@ -31,6 +31,8 @@ public class MavenBuildTimestamp public static final String BUILD_TIMESTAMP_FORMAT_PROPERTY = "maven.build.timestamp.format"; + public static final TimeZone DEFAULT_BUILD_TIME_ZONE = TimeZone.getTimeZone( "Etc/UTC" ); + private String formattedTimestamp; public MavenBuildTimestamp() @@ -59,7 +61,7 @@ public class MavenBuildTimestamp time = new Date(); } SimpleDateFormat dateFormat = new SimpleDateFormat( timestampFormat ); - dateFormat.setTimeZone( TimeZone.getTimeZone( "UTC" ) ); + dateFormat.setTimeZone( DEFAULT_BUILD_TIME_ZONE ); formattedTimestamp = dateFormat.format( time ); } http://git-wip-us.apache.org/repos/asf/maven/blob/b711de57/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java index 99842df..b56bc15 100644 --- a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java +++ b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java @@ -88,7 +88,7 @@ public abstract class AbstractModelInterpolatorTest public void testDefaultBuildTimestampFormatShouldFormatTimeIn24HourFormat() { Calendar cal = Calendar.getInstance(); - cal.setTimeZone(TimeZone.getTimeZone("UTC")); + cal.setTimeZone( MavenBuildTimestamp.DEFAULT_BUILD_TIME_ZONE ); cal.set( Calendar.HOUR, 12 ); cal.set( Calendar.AM_PM, Calendar.AM ); @@ -112,7 +112,7 @@ public abstract class AbstractModelInterpolatorTest SimpleDateFormat format = new SimpleDateFormat( MavenBuildTimestamp.DEFAULT_BUILD_TIMESTAMP_FORMAT ); - format.setTimeZone(TimeZone.getTimeZone("UTC")); + format.setTimeZone( MavenBuildTimestamp.DEFAULT_BUILD_TIME_ZONE ); assertEquals( "1976-11-11T00:16:00Z", format.format( firstTestDate ) ); assertEquals( "1976-11-11T23:16:00Z", format.format( secondTestDate ) ); } @@ -120,7 +120,7 @@ public abstract class AbstractModelInterpolatorTest public void testDefaultBuildTimestampFormatWithLocalTimeZoneMidnightRollover() { Calendar cal = Calendar.getInstance(); - cal.setTimeZone(TimeZone.getTimeZone("Europe/Berlin")); + cal.setTimeZone( TimeZone.getTimeZone( "Europe/Berlin" ) ); cal.set( Calendar.HOUR_OF_DAY, 1 ); cal.set( Calendar.MINUTE, 16 ); @@ -137,7 +137,7 @@ public abstract class AbstractModelInterpolatorTest SimpleDateFormat format = new SimpleDateFormat( MavenBuildTimestamp.DEFAULT_BUILD_TIMESTAMP_FORMAT ); - format.setTimeZone(TimeZone.getTimeZone("UTC")); + format.setTimeZone( MavenBuildTimestamp.DEFAULT_BUILD_TIME_ZONE ); assertEquals( "2014-06-15T23:16:00Z", format.format( firstTestDate ) ); assertEquals( "2014-11-16T00:16:00Z", format.format( secondTestDate ) ); }
