Author: ifedorenko
Date: Tue Dec 6 14:13:48 2011
New Revision: 1210924
URL: http://svn.apache.org/viewvc?rev=1210924&view=rev
Log:
MNG-5212 preserve PluginDescriptor dependencies in descriptor cache
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java?rev=1210924&r1=1210923&r2=1210924&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java
Tue Dec 6 14:13:48 2011
@@ -96,6 +96,8 @@ public class DefaultPluginDescriptorCach
clone.setId( original.getId() );
clone.setIsolatedRealm( original.isIsolatedRealm() );
clone.setSource( original.getSource() );
+
+ clone.setDependencies( original.getDependencies() );
}
return clone;
Modified:
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java?rev=1210924&r1=1210923&r2=1210924&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java
(original)
+++
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java
Tue Dec 6 14:13:48 2011
@@ -292,6 +292,8 @@ public class PluginManagerTest
session.getRepositorySession() );
pluginManager.getPluginRealm( session, pluginDescriptor );
+ assertEquals( 1, pluginDescriptor.getDependencies().size() );
+
for ( ComponentDescriptor<?> descriptor :
pluginDescriptor.getComponents() )
{
assertNotNull( descriptor.getRealm() );
@@ -308,6 +310,8 @@ public class PluginManagerTest
session.getRepositorySession() );
pluginManager.getPluginRealm( session, pluginDescriptor );
+ assertEquals( 1, pluginDescriptor.getDependencies().size() );
+
for ( ComponentDescriptor<?> descriptor :
pluginDescriptor.getComponents() )
{
assertNotNull( descriptor.getRealm() );