From b94672b9e44c5de231aa85e254bfc2aeb66a4810 Mon Sep 17 00:00:00 2001 From: Brett Leslie Porter Date: Wed, 28 Sep 2005 09:00:52 +0000 Subject: [PATCH] PR: MNG-913 don't attempt to re-resolve a snapshot of the form 1.0-yyyyMMdd.HHmmss-B git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@292152 13f79535-47bb-0310-9956-ffa450edef68 --- .../artifact/transform/AbstractVersionTransformation.java | 6 +++--- .../maven/artifact/transform/SnapshotTransformation.java | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java b/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java index ad102ace06..314762caaa 100644 --- a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java +++ b/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java @@ -62,13 +62,13 @@ public abstract class AbstractVersionTransformation 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 ); diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java b/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java index f70b4a8e74..22fbd2b509 100644 --- a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java +++ b/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java @@ -47,7 +47,8 @@ public class SnapshotTransformation 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 );