Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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 <michaelo@apache.org>
This commit is contained in:
Joseph Walton 2015-09-12 23:20:21 +10:00 committed by Michael Osipov
parent 2a9a07b0a1
commit 5cbc294e72
2 changed files with 83 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maven-aether-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java
View File

@ -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();

81
maven-aether-provider/src/test/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataTest.java Normal file
View File

@ -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) );
}
}