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/13 07:26:12 UTC
svn commit: r280506 - in
/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata:
ArtifactRepositoryMetadata.java DefaultRepositoryMetadataManager.java
SnapshotArtifactRepositoryMetadata.java
Author: brett
Date: Mon Sep 12 22:26:06 2005
New Revision: 280506
URL: http://svn.apache.org/viewcvs?rev=280506&view=rev
Log:
use repository that provides the metadata
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java
Modified: maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java?rev=280506&r1=280505&r2=280506&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java (original)
+++ maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java Mon Sep 12 22:26:06 2005
@@ -80,10 +80,6 @@
public void setRepository( ArtifactRepository remoteRepository )
{
- // TODO: this is the first wins policy - really, shouldn't call if not
- if ( artifact.getRepository() == null )
- {
- artifact.setRepository( remoteRepository );
- }
+ artifact.setRepository( remoteRepository );
}
}
Modified: maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java?rev=280506&r1=280505&r2=280506&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java (original)
+++ maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java Mon Sep 12 22:26:06 2005
@@ -112,11 +112,13 @@
if ( metadataFile.exists() )
{
Metadata metadata = readMetadata( metadataFile );
- repoMetadata.setRepository( remoteRepository );
if ( repoMetadata.getMetadata() != null )
{
- metadata.merge( repoMetadata.getMetadata() );
+ if ( metadata.merge( repoMetadata.getMetadata() ) )
+ {
+ repoMetadata.setRepository( remoteRepository );
+ }
}
repoMetadata.setMetadata( metadata );
}
Modified: maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java?rev=280506&r1=280505&r2=280506&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java (original)
+++ maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java Mon Sep 12 22:26:06 2005
@@ -79,10 +79,6 @@
public void setRepository( ArtifactRepository remoteRepository )
{
- // TODO: this is the first wins policy - really, shouldn't call if not
- if ( artifact.getRepository() == null )
- {
- artifact.setRepository( remoteRepository );
- }
+ artifact.setRepository( remoteRepository );
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org