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

remove legacy metadata handling 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@292156 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-09-28 10:12:38 +00:00
parent 3c8a171004
commit 687b41ede8
2 changed files with 1 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java
View File

@ -237,10 +237,6 @@ public class Verifier
int startIndex = newLine.indexOf( ' ' );
command = newLine.substring( 0, startIndex );
if ( "rm".equals( command ) )
{
l.add( newLine.substring( 0, index ) + "SNAPSHOT.version.txt" );
}
filespec = newLine.substring( startIndex + 1, endIndex );
}

53
maven-mboot2/src/main/java/download/ArtifactDownloader.java
View File

@ -2,7 +2,6 @@ package download;
import model.Dependency;
import model.Repository;
import util.FileUtils;
import java.io.File;
import java.io.FileNotFoundException;
@ -158,7 +157,6 @@ public class ArtifactDownloader
remoteFile.delete();
}
boolean legacy = false;
File file = localFile;
if ( remoteFile.exists() )
{
@ -167,57 +165,8 @@ public class ArtifactDownloader
file = remoteFile;
}
}
else
{
log( "WARNING: attempting to use legacy metadata" );
filename = getSnapshotMetadataFile( destinationFile.getName(), "SNAPSHOT.version.txt" );
File f = localRepository.getMetadataFile( dep.getGroupId(), dep.getArtifactId(),
dep.getVersion(), dep.getType(), filename );
metadataPath = remoteRepo.getMetadataPath( dep.getGroupId(), dep.getArtifactId(),
dep.getVersion(), dep.getType(), filename );
metaUrl = remoteRepo.getBasedir() + "/" + metadataPath;
log( "Downloading " + metaUrl );
try
{
HttpUtils.getFile( metaUrl, f, ignoreErrors, true, proxyHost, proxyPort, proxyUserName,
proxyPassword, false );
}
catch ( IOException e )
{
log( "WARNING: remote SNAPSHOT version not found, using local: " + e.getMessage() );
f.delete();
}
if ( f.exists() )
{
if ( !localFile.exists() || localFile.lastModified() < f.lastModified() )
{
version = FileUtils.fileRead( f );
log( "Resolved version: " + version );
dep.setResolvedVersion( version );
if ( !version.endsWith( "SNAPSHOT" ) )
{
String ver = version.substring(
version.lastIndexOf( "-", version.lastIndexOf( "-" ) - 1 ) + 1 );
String extension = url.substring( url.length() - 4 );
url = getSnapshotMetadataFile( url, ver + extension );
}
else if ( destinationFile.exists() )
{
// It's already there
return true;
}
legacy = true;
}
}
else
{
log( "WARNING: local SNAPSHOT version not found, using default" );
}
}
if ( !legacy && file.exists() )
if ( file.exists() )
{
log( "Using metadata: " + file );