Author: brett
Date: Mon Sep 5 18:55:04 2005
New Revision: 278898
URL: http://svn.apache.org/viewcvs?rev=278898&view=rev
Log:
PR: MNG-613
merge all metadata fields on update
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.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=278898&r1=278897&r2=278898&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 5 18:55:04 2005
@@ -30,6 +30,7 @@
import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
+import java.util.Iterator;
/**
* Metadata for the artifact directory of the repository.
@@ -160,6 +161,25 @@
{
s.setBuildNumber( snapshot.getBuildNumber() );
changed = true;
+ }
+ }
+ if ( versioning.getRelease() != null )
+ {
+ changed = true;
+ v.setRelease( versioning.getRelease() );
+ }
+ if ( versioning.getLatest() != null )
+ {
+ changed = true;
+ v.setLatest( versioning.getLatest() );
+ }
+ for ( Iterator i = versioning.getVersions().iterator();
i.hasNext(); )
+ {
+ String version = (String) i.next();
+ if ( !v.getVersions().contains( version ) )
+ {
+ changed = true;
+ v.getVersions().add( version );
}
}
}
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java?rev=278898&r1=278897&r2=278898&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java
Mon Sep 5 18:55:04 2005
@@ -95,10 +95,13 @@
{
ArtifactRepository remoteRepository = (ArtifactRepository)
i.next();
+ sb.append( remoteRepository.getId() );
+ sb.append( " (" );
sb.append( remoteRepository.getUrl() );
+ sb.append( ")" );
if ( i.hasNext() )
{
- sb.append( ", " );
+ sb.append( ",\n " );
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
