You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/07/23 23:50:50 UTC
svn commit: r797239 -
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Author: bentmann
Date: Thu Jul 23 21:50:49 2009
New Revision: 797239
URL: http://svn.apache.org/viewvc?rev=797239&view=rev
Log:
o Made plugin version resolution more robust and ensured we fail fast upon resolution failure instead of some NPE in later execution steps
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=797239&r1=797238&r2=797239&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java Thu Jul 23 21:50:49 2009
@@ -700,22 +700,24 @@
}
if ( artifactMetadataFile.exists() )
- {
+ {
+ logger.debug( "Extracting version for plugin " + plugin.getKey() + " from " + artifactMetadataFile );
+
try
{
Metadata pluginMetadata = readMetadata( artifactMetadataFile );
String release = pluginMetadata.getVersioning().getRelease();
- if ( release != null )
+ if ( StringUtils.isNotEmpty( release ) )
{
plugin.setVersion( release );
}
else
{
String latest = pluginMetadata.getVersioning().getLatest();
-
- if ( latest != null )
+
+ if ( StringUtils.isNotEmpty( latest ) )
{
plugin.setVersion( latest );
}
@@ -726,7 +728,8 @@
logger.warn( "Error reading plugin metadata: ", e );
}
}
- else
+
+ if ( StringUtils.isEmpty( plugin.getVersion() ) )
{
throw new PluginNotFoundException( plugin, remoteRepositories );
}