Author: brett
Date: Sun Sep 11 19:16:58 2005
New Revision: 280239
URL: http://svn.apache.org/viewcvs?rev=280239&view=rev
Log:
use local copy in bootstrap
Modified:
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/download/ArtifactDownloader.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-mboot2/src/main/java/download/ArtifactDownloader.java?rev=280239&r1=280238&r2=280239&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
Sun Sep 11 19:16:58 2005
@@ -171,7 +171,8 @@
{
log( "Using metadata: " + file );
- RepositoryMetadata metadata = RepositoryMetadata.read(
file );
+ RepositoryMetadata metadata;
+ metadata = RepositoryMetadata.read( file );
if ( version.equals( metadata.getVersion() ) )
{
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=280239&r1=280238&r2=280239&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
Sun Sep 11 19:16:58 2005
@@ -167,7 +167,7 @@
public String constructVersion( String baseVersion )
{
- if ( snapshotTimestamp != null )
+ if ( snapshotTimestamp != null && !localCopy )
{
baseVersion = StringUtils.replace( baseVersion, "SNAPSHOT",
snapshotTimestamp + "-" + snapshotBuildNumber );
}
@@ -200,7 +200,14 @@
{
if ( "buildNumber".equals( rawName ) )
{
- metadata.setSnapshotBuildNumber( Integer.valueOf(
getBodyText() ).intValue() );
+ try
+ {
+ metadata.setSnapshotBuildNumber( Integer.valueOf(
getBodyText() ).intValue() );
+ }
+ catch ( NumberFormatException e )
+ {
+ // Ignore
+ }
}
else if ( "timestamp".equals( rawName ) )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
