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/04/20 18:52:32 UTC
cvs commit: maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/transform SnapshotTransformation.java
brett 2005/04/20 09:52:32
Modified: maven-artifact/src/main/java/org/apache/maven/artifact/transform
SnapshotTransformation.java
Log:
fix error reporting
Revision Changes Path
1.21 +20 -23 maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
Index: SnapshotTransformation.java
===================================================================
RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- SnapshotTransformation.java 12 Apr 2005 23:51:21 -0000 1.20
+++ SnapshotTransformation.java 20 Apr 2005 16:52:32 -0000 1.21
@@ -139,36 +139,33 @@
resolvedArtifactCache.add( getCacheKey( artifact ) );
}
- // TODO: if the POM and JAR are inconsistent, this might mean that different version of each are used
- if ( artifact.getFile().exists() && !localMetadata.newerThanFile( artifact.getFile() ) )
+ String version = localMetadata.constructVersion();
+
+ if ( getLogger().isInfoEnabled() && !alreadyResolved )
{
- if ( !alreadyResolved )
+ if ( !version.equals( artifact.getBaseVersion() ) )
+ {
+ String message = artifact.getArtifactId() + ": resolved to version " + version;
+ if ( artifact.getRepository() != null )
+ {
+ message += " from repository " + artifact.getRepository().getId();
+ }
+ else
+ {
+ message += " from local repository";
+ }
+ getLogger().info( message );
+ }
+ else
{
// Locally installed file is newer, don't use the resolved version
getLogger().info( artifact.getArtifactId() + ": using locally installed snapshot" );
}
}
- else
- {
- String version = localMetadata.constructVersion();
-
- if ( getLogger().isInfoEnabled() )
- {
- if ( !version.equals( artifact.getBaseVersion() ) && !alreadyResolved )
- {
- String message = artifact.getArtifactId() + ": resolved to version " + version;
- if ( artifact.getRepository() != null )
- {
- message += " from repository " + artifact.getRepository().getId();
- }
- else
- {
- message += " from local repository";
- }
- getLogger().info( message );
- }
- }
+ // TODO: if the POM and JAR are inconsistent, this might mean that different version of each are used
+ if ( !artifact.getFile().exists() || localMetadata.newerThanFile( artifact.getFile() ) )
+ {
artifact.setVersion( version );
try
{
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org