Author: jdcasey
Date: Thu Nov 29 00:42:38 2007
New Revision: 599338
URL: http://svn.apache.org/viewvc?rev=599338&view=rev
Log:
Fixing case where parent pom has pluginManagement, child does not refer to the
plugin, and plugin is used directly on the command line...version from
parent-pom pluginManagement should be used. Test case to follow.
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/binding/BindingUtils.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/binding/BindingUtils.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/binding/BindingUtils.java?rev=599338&r1=599337&r2=599338&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/binding/BindingUtils.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/binding/BindingUtils.java
Thu Nov 29 00:42:38 2007
@@ -211,6 +211,7 @@
plugin = new Plugin();
plugin.setGroupId( binding.getGroupId() );
plugin.setArtifactId( binding.getArtifactId() );
+ plugin.setVersion( binding.getVersion() );
}
injectPluginManagementInfo( plugin, project );
@@ -238,6 +239,7 @@
configuration = mergeRawConfigurations( reportConfig,
configuration );
}
+ binding.setVersion( plugin.getVersion() );
binding.setConfiguration( configuration );
}
@@ -308,6 +310,7 @@
Map plugMgmtMap = buildPluginMap( plugMgmt );
String key = createPluginKey( plugin );
+
Plugin mgmtPlugin = (Plugin) plugMgmtMap.get( key );
if ( mgmtPlugin != null )