Author: brett
Date: Tue Apr 26 07:34:47 2005
New Revision: 164797
URL: http://svn.apache.org/viewcvs?rev=164797&view=rev
Log:
fix error reporting
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java?rev=164797&r1=164796&r2=164797&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
Tue Apr 26 07:34:47 2005
@@ -141,31 +141,26 @@
String version = localMetadata.constructVersion();
- if ( getLogger().isInfoEnabled() && !alreadyResolved )
+ // 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() ) )
{
- if ( !version.equals( artifact.getBaseVersion() ) )
+ if ( getLogger().isInfoEnabled() && !alreadyResolved )
{
- String message = artifact.getArtifactId() + ": resolved to
version " + version;
- if ( artifact.getRepository() != null )
+ if ( !version.equals( artifact.getBaseVersion() ) )
{
- message += " from repository " +
artifact.getRepository().getId();
+ 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
- {
- 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" );
- }
- }
- // 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
{
@@ -174,6 +169,14 @@
catch ( ArtifactPathFormatException e )
{
throw new ArtifactMetadataRetrievalException( "Error
reading local metadata", e );
+ }
+ }
+ else
+ {
+ if ( getLogger().isInfoEnabled() && !alreadyResolved )
+ {
+ // Locally installed file is newer, don't use the resolved
version
+ getLogger().info( artifact.getArtifactId() + ": using
locally installed snapshot" );
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
