sync up mboot to changes in artifact

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@292429 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-09-29 13:28:42 +00:00
parent 638088b075
commit d8f499ddeb
3 changed files with 33 additions and 2 deletions

View File

@ -22,6 +22,8 @@
import java.io.OutputStream;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@ -31,6 +33,7 @@
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.TimeZone;
import java.util.TreeMap;
public class MBoot
@ -822,6 +825,7 @@ private void install( String basedir, Repository localRepository, ModelReader re
metadata = new RepositoryMetadata();
metadata.setLocalCopy( true );
metadata.setLastUpdated( getCurrentUtcDate() );
file = localRepository.getMetadataFile( groupId, artifactId, version, type, "maven-metadata-local.xml" );
metadata.write( file );
}
@ -1003,6 +1007,13 @@ private void copyResources( String sourceDirectory, String destinationDirectory
}
}
public String getCurrentUtcDate()
{
TimeZone timezone = TimeZone.getTimeZone( "UTC" );
DateFormat fmt = new SimpleDateFormat( "yyyyMMddHHmmss" );
return fmt.format( new Date() );
}
class SettingsReader
extends AbstractReader
{

View File

@ -172,7 +172,10 @@ private boolean getRemoteArtifact( Dependency dep, File destinationFile )
RepositoryMetadata metadata = RepositoryMetadata.read( file );
version = metadata.constructVersion( version );
if ( !file.equals( localFile ) )
{
version = metadata.constructVersion( version );
}
log( "Resolved version: " + version );
dep.setResolvedVersion( version );
if ( !version.endsWith( "SNAPSHOT" ) )

View File

@ -56,6 +56,8 @@ public class RepositoryMetadata
private boolean localCopy;
private String lastUpdated;
public String getSnapshotTimestamp()
{
return snapshotTimestamp;
@ -167,13 +169,23 @@ public void write( File file )
public String constructVersion( String baseVersion )
{
if ( snapshotTimestamp != null && !localCopy )
if ( snapshotTimestamp != null )
{
baseVersion = StringUtils.replace( baseVersion, "SNAPSHOT", snapshotTimestamp + "-" + snapshotBuildNumber );
}
return baseVersion;
}
public void setLastUpdated( String lastUpdated )
{
this.lastUpdated = lastUpdated;
}
public String getLastUpdated()
{
return lastUpdated;
}
static class Reader
extends AbstractReader
{
@ -279,6 +291,10 @@ else if ( "release".equals( rawName ) )
{
metadata.setReleaseVersion( getBodyText() );
}
else if ( "lastUpdated".equals( rawName ) )
{
metadata.setLastUpdated( getBodyText() );
}
}
else if ( "groupId".equals( rawName ) )
{
@ -320,6 +336,7 @@ public void write( File file )
w.println( " <versioning>" );
writeLine( w, " ", "latest", metadata.getLatestVersion() );
writeLine( w, " ", "release", metadata.getReleaseVersion() );
writeLine( w, " ", "lastUpdated", String.valueOf( metadata.getLastUpdated() ) );
w.println( " <snapshot>" );
writeLine( w, " ", "localCopy", String.valueOf( metadata.isLocalCopy() ) );
writeLine( w, " ", "buildNumber", String.valueOf( metadata.getSnapshotBuildNumber() ) );