Author: brett
Date: Wed Sep 28 02:00:52 2005
New Revision: 292152
URL: http://svn.apache.org/viewcvs?rev=292152&view=rev
Log:
PR: MNG-913
don't attempt to re-resolve a snapshot of the form 1.0-yyyyMMdd.HHmmss-B
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java?rev=292152&r1=292151&r2=292152&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
(original)
+++
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
Wed Sep 28 02:00:52 2005
@@ -62,13 +62,13 @@
throws ArtifactMetadataRetrievalException
{
RepositoryMetadata metadata;
- if ( !artifact.isSnapshot() || Artifact.LATEST_VERSION.equals(
artifact.getBaseVersion() ) )
+ if ( artifact.isSnapshot() )
{
- metadata = new ArtifactRepositoryMetadata( artifact );
+ metadata = new SnapshotArtifactRepositoryMetadata( artifact );
}
else
{
- metadata = new SnapshotArtifactRepositoryMetadata( artifact );
+ metadata = new ArtifactRepositoryMetadata( artifact );
}
repositoryMetadataManager.resolve( metadata, remoteRepositories,
localRepository );
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java?rev=292152&r1=292151&r2=292152&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
(original)
+++
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
Wed Sep 28 02:00:52 2005
@@ -47,7 +47,8 @@
public void transformForResolve( Artifact artifact, List
remoteRepositories, ArtifactRepository localRepository )
throws ArtifactMetadataRetrievalException
{
- if ( artifact.isSnapshot() )
+ // Only select snapshots that are unresolved (eg 1.0-SNAPSHOT, not
1.0-20050607.123456)
+ if ( artifact.isSnapshot() && artifact.getBaseVersion().equals(
artifact.getVersion() ) )
{
String version = resolveVersion( artifact, localRepository,
remoteRepositories );
artifact.updateVersion( version, localRepository );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
