You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/09/29 15:28:47 UTC
svn commit: r292429 - in /maven/components/trunk/maven-mboot2/src/main/java:
MBoot.java download/ArtifactDownloader.java download/RepositoryMetadata.java
Author: brett
Date: Thu Sep 29 06:28:42 2005
New Revision: 292429
URL: http://svn.apache.org/viewcvs?rev=292429&view=rev
Log:
sync up mboot to changes in artifact
Modified:
maven/components/trunk/maven-mboot2/src/main/java/MBoot.java
maven/components/trunk/maven-mboot2/src/main/java/download/ArtifactDownloader.java
maven/components/trunk/maven-mboot2/src/main/java/download/RepositoryMetadata.java
Modified: maven/components/trunk/maven-mboot2/src/main/java/MBoot.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-mboot2/src/main/java/MBoot.java?rev=292429&r1=292428&r2=292429&view=diff
==============================================================================
--- maven/components/trunk/maven-mboot2/src/main/java/MBoot.java (original)
+++ maven/components/trunk/maven-mboot2/src/main/java/MBoot.java Thu Sep 29 06:28:42 2005
@@ -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 @@
metadata = new RepositoryMetadata();
metadata.setLocalCopy( true );
+ metadata.setLastUpdated( getCurrentUtcDate() );
file = localRepository.getMetadataFile( groupId, artifactId, version, type, "maven-metadata-local.xml" );
metadata.write( file );
}
@@ -1001,6 +1005,13 @@
FileUtils.copyFile( source, dest );
}
+ }
+
+ public String getCurrentUtcDate()
+ {
+ TimeZone timezone = TimeZone.getTimeZone( "UTC" );
+ DateFormat fmt = new SimpleDateFormat( "yyyyMMddHHmmss" );
+ return fmt.format( new Date() );
}
class SettingsReader
Modified: maven/components/trunk/maven-mboot2/src/main/java/download/ArtifactDownloader.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-mboot2/src/main/java/download/ArtifactDownloader.java?rev=292429&r1=292428&r2=292429&view=diff
==============================================================================
--- maven/components/trunk/maven-mboot2/src/main/java/download/ArtifactDownloader.java (original)
+++ maven/components/trunk/maven-mboot2/src/main/java/download/ArtifactDownloader.java Thu Sep 29 06:28:42 2005
@@ -172,7 +172,10 @@
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" ) )
Modified: maven/components/trunk/maven-mboot2/src/main/java/download/RepositoryMetadata.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-mboot2/src/main/java/download/RepositoryMetadata.java?rev=292429&r1=292428&r2=292429&view=diff
==============================================================================
--- maven/components/trunk/maven-mboot2/src/main/java/download/RepositoryMetadata.java (original)
+++ maven/components/trunk/maven-mboot2/src/main/java/download/RepositoryMetadata.java Thu Sep 29 06:28:42 2005
@@ -56,6 +56,8 @@
private boolean localCopy;
+ private String lastUpdated;
+
public String getSnapshotTimestamp()
{
return snapshotTimestamp;
@@ -167,13 +169,23 @@
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 @@
{
metadata.setReleaseVersion( getBodyText() );
}
+ else if ( "lastUpdated".equals( rawName ) )
+ {
+ metadata.setLastUpdated( getBodyText() );
+ }
}
else if ( "groupId".equals( rawName ) )
{
@@ -320,6 +336,7 @@
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() ) );
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org