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/05/04 07:46:14 UTC
svn commit: r168078 - in /maven/components/trunk/maven-mboot2/src/main/java:
download/ArtifactDownloader.java model/Dependency.java model/ModelReader.java
Author: brett
Date: Tue May 3 22:46:13 2005
New Revision: 168078
URL: http://svn.apache.org/viewcvs?rev=168078&view=rev
Log:
make snapshot download behave more like maven-artifact
Modified:
maven/components/trunk/maven-mboot2/src/main/java/download/ArtifactDownloader.java
maven/components/trunk/maven-mboot2/src/main/java/model/Dependency.java
maven/components/trunk/maven-mboot2/src/main/java/model/ModelReader.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=168078&r1=168077&r2=168078&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 Tue May 3 22:46:13 2005
@@ -36,6 +36,8 @@
private static final String REPO_URL = "http://repo1.maven.org/maven2";
+ private Set downloadedArtifacts = new HashSet();
+
public ArtifactDownloader( Repository localRepository, List remoteRepositories )
throws Exception
{
@@ -54,8 +56,6 @@
System.out.println( "Using the following for your remote repositories: " + remoteRepos );
}
- private Set downloadedArtifacts = new HashSet();
-
public void setProxy( String host, String port, String userName, String password )
{
proxyHost = host;
@@ -157,6 +157,7 @@
proxyPassword, false );
version = FileUtils.fileRead( file );
log( "Resolved version: " + version );
+ dep.setResolvedVersion( version );
String ver = version.substring( version.lastIndexOf( "-", version.lastIndexOf( "-" ) - 1 ) + 1 );
String extension = url.substring( url.length() - 4 );
url = getSnapshotMetadataFile( url, ver + extension );
@@ -170,7 +171,7 @@
{
File file = localRepository.getMetadataFile( dep.getGroupId(), dep.getArtifactId(),
dep.getVersion(), dep.getType(),
- dep.getArtifactId() + "-" + dep.getVersion() + ".pom" );
+ dep.getArtifactId() + "-" + dep.getResolvedVersion() + ".pom" );
file.getParentFile().mkdirs();
@@ -194,6 +195,7 @@
}
}
+ destinationFile = localRepository.getArtifactFile( dep );
if ( !destinationFile.exists() || version.indexOf( "SNAPSHOT" ) >= 0 )
{
log( "Downloading " + url );
Modified: maven/components/trunk/maven-mboot2/src/main/java/model/Dependency.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-mboot2/src/main/java/model/Dependency.java?rev=168078&r1=168077&r2=168078&view=diff
==============================================================================
--- maven/components/trunk/maven-mboot2/src/main/java/model/Dependency.java (original)
+++ maven/components/trunk/maven-mboot2/src/main/java/model/Dependency.java Tue May 3 22:46:13 2005
@@ -39,6 +39,8 @@
private String scope = "compile";
+ private String resolvedVersion;
+
public Dependency()
{
}
@@ -109,11 +111,11 @@
if ( isValid( getArtifactId() ) )
{
- artifact = getArtifactId() + "-" + getVersion() + ".";
+ artifact = getArtifactId() + "-" + getResolvedVersion() + ".";
}
else
{
- artifact = getId() + "-" + getVersion() + ".";
+ artifact = getId() + "-" + getResolvedVersion() + ".";
}
if ( "jar".equals( getType() ) || "maven-plugin".equals( getType() ) )
@@ -246,5 +248,19 @@
public String getConflictId()
{
return getGroupId() + ":" + getArtifactId() + ":" + getType();
+ }
+
+ public void setResolvedVersion( String resolvedVersion )
+ {
+ this.resolvedVersion = resolvedVersion;
+ }
+
+ public String getResolvedVersion()
+ {
+ if ( resolvedVersion == null )
+ {
+ resolvedVersion = getVersion();
+ }
+ return resolvedVersion;
}
}
Modified: maven/components/trunk/maven-mboot2/src/main/java/model/ModelReader.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-mboot2/src/main/java/model/ModelReader.java?rev=168078&r1=168077&r2=168078&view=diff
==============================================================================
--- maven/components/trunk/maven-mboot2/src/main/java/model/ModelReader.java (original)
+++ maven/components/trunk/maven-mboot2/src/main/java/model/ModelReader.java Tue May 3 22:46:13 2005
@@ -407,7 +407,7 @@
Repository localRepository = downloader.getLocalRepository();
p.parse(
localRepository.getMetadataFile( groupId, artifactId, version, type,
- artifactId + "-" + version + ".pom" ) );
+ artifactId + "-" + pom.getResolvedVersion() + ".pom" ) );
}
catch ( IOException e )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org