mirror of https://github.com/apache/maven.git
o Fixed resolution of plugin metaversions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@754731 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
253cb012bc
commit
5282fec65d
|
@ -182,7 +182,7 @@ public class DefaultPluginManager
|
||||||
// TODO: this should be possibly outside
|
// TODO: this should be possibly outside
|
||||||
// All version-resolution logic has been moved to DefaultPluginVersionManager.
|
// All version-resolution logic has been moved to DefaultPluginVersionManager.
|
||||||
logger.debug( "Resolving plugin: " + plugin.getKey() + " with version: " + pluginVersion );
|
logger.debug( "Resolving plugin: " + plugin.getKey() + " with version: " + pluginVersion );
|
||||||
if ( ( pluginVersion == null ) || Artifact.LATEST_VERSION.equals( pluginVersion ) || Artifact.RELEASE_VERSION.equals( pluginVersion ) )
|
if ( pluginVersion == null )
|
||||||
{
|
{
|
||||||
logger.debug( "Resolving version for plugin: " + plugin.getKey() );
|
logger.debug( "Resolving version for plugin: " + plugin.getKey() );
|
||||||
pluginVersion = resolvePluginVersion( plugin.getGroupId(), plugin.getArtifactId(), project, session );
|
pluginVersion = resolvePluginVersion( plugin.getGroupId(), plugin.getArtifactId(), project, session );
|
||||||
|
@ -212,6 +212,8 @@ public class DefaultPluginManager
|
||||||
{
|
{
|
||||||
Artifact pluginArtifact = resolvePluginArtifact( plugin, project, session );
|
Artifact pluginArtifact = resolvePluginArtifact( plugin, project, session );
|
||||||
|
|
||||||
|
plugin.setVersion( pluginArtifact.getBaseVersion() );
|
||||||
|
|
||||||
addPlugin( plugin, pluginArtifact, project, session );
|
addPlugin( plugin, pluginArtifact, project, session );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue