You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2015/09/29 13:15:49 UTC
maven git commit: [MNG-5877] maven-aether-provider does not always
generate snapshot versions using Gregorian calendar year
Repository: maven
Updated Branches:
refs/heads/master 2a9a07b0a -> 5cbc294e7
[MNG-5877] maven-aether-provider does not always generate snapshot versions using Gregorian calendar year
Snapshot versioning should use the Gregorian calendar for consistency
across systems. Apply the fix reported by Anders Forsell to make that
explicit, and include a somewhat overengineered test to confirm that
it's working.
Signed-off-by: Michael Osipov <mi...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/5cbc294e
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/5cbc294e
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/5cbc294e
Branch: refs/heads/master
Commit: 5cbc294e72c79955fb93c6434e9ac8ae7d9206cc
Parents: 2a9a07b
Author: Joseph Walton <jo...@kafsemo.org>
Authored: Sat Sep 12 23:20:21 2015 +1000
Committer: Michael Osipov <mi...@apache.org>
Committed: Tue Sep 29 10:36:35 2015 +0200
----------------------------------------------------------------------
.../internal/RemoteSnapshotMetadata.java | 2 +
.../internal/RemoteSnapshotMetadataTest.java | 81 ++++++++++++++++++++
2 files changed, 83 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/5cbc294e/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 5c7faba..98c914a 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
@@ -24,6 +24,7 @@ import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
+import java.util.GregorianCalendar;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.TimeZone;
@@ -73,6 +74,7 @@ final class RemoteSnapshotMetadata
if ( metadata.getVersioning() == null )
{
DateFormat utcDateFormatter = new SimpleDateFormat( "yyyyMMdd.HHmmss" );
+ utcDateFormatter.setCalendar( new GregorianCalendar() );
utcDateFormatter.setTimeZone( TimeZone.getTimeZone( "UTC" ) );
snapshot = new Snapshot();
http://git-wip-us.apache.org/repos/asf/maven/blob/5cbc294e/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataTest.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataTest.java b/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataTest.java
new file mode 100644
index 0000000..3b3dcb0
--- /dev/null
+++ b/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataTest.java
@@ -0,0 +1,81 @@
+package org.apache.maven.repository.internal;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import static org.junit.Assert.assertTrue;
+
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Set;
+
+import org.apache.maven.artifact.repository.metadata.Metadata;
+import org.eclipse.aether.artifact.DefaultArtifact;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class RemoteSnapshotMetadataTest
+{
+ private Locale defaultLocale;
+
+ @Before
+ public void setLocaleToUseBuddhistCalendar()
+ {
+ defaultLocale = Locale.getDefault();
+ Locale.setDefault( new Locale( "th", "TH" ) );
+ }
+
+ @After
+ public void restoreLocale()
+ {
+ Locale.setDefault(defaultLocale);
+ }
+
+ static String gregorianDate()
+ {
+ SimpleDateFormat df = new SimpleDateFormat( "yyyyMMdd" );
+ df.setCalendar(new GregorianCalendar());
+ return df.format( new Date() );
+ }
+
+ @Test
+ public void gregorianCalendarIsUsed()
+ {
+ String dateBefore = gregorianDate();
+
+ RemoteSnapshotMetadata metadata = new RemoteSnapshotMetadata(
+ new DefaultArtifact( "a:b:1-SNAPSHOT" ), false);
+ metadata.merge(new Metadata());
+
+ String dateAfter = gregorianDate();
+
+ String ts = metadata.metadata.getVersioning().getSnapshot().getTimestamp();
+ String datePart = ts.replaceAll( "\\..*", "" );
+
+ /* Allow for this test running across midnight */
+ Set<String> expected = new HashSet<String>( Arrays.asList( dateBefore, dateAfter ) );
+ assertTrue( "Expected " + datePart + " to be in " + expected,
+ expected.contains(datePart) );
+ }
+}