svn commit: r786811 - in /maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin: DefaultPluginCache.java DefaultPluginManager.java

[bentmann]

Author: bentmann
Date: Sat Jun 20 13:17:36 2009
New Revision: 786811

URL: http://svn.apache.org/viewvc?rev=786811&view=rev
Log:
[MNG-4041] embedder returns stale maven project state
Submitted by: Igor Fedorenko

o Committed additional patch with bugfixes

Modified:
    
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginCache.java
    
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java

Modified: 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginCache.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginCache.java?rev=786811&r1=786810&r2=786811&view=diff
==============================================================================
--- 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginCache.java
 (original)
+++ 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginCache.java
 Sat Jun 20 13:17:36 2009
@@ -222,7 +222,8 @@
                 && eq( aD.getArtifactId(), bD.getArtifactId() ) //
                 && eq( aD.getVersion(), bD.getVersion() ) // 
                 && eq( aD.getType(), bD.getType() ) //
-                && eq( aD.getClassifier(), bD.getScope() );
+                && eq( aD.getClassifier(), bD.getClassifier() ) //
+                && eq( aD.getScope(), bD.getScope() );
 
             r &= exclusionsEquals( aD.getExclusions(), bD.getExclusions() );
 

Modified: 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=786811&r1=786810&r2=786811&view=diff
==============================================================================
--- 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
 (original)
+++ 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
 Sat Jun 20 13:17:36 2009
@@ -480,7 +480,7 @@
             }
         }
 
-        throw new PluginManagerException( plugin, "Could not create 
ClassRealm", (Throwable) null );
+        throw new PluginManagerException( plugin, "Could not create ClassRealm 
for plugin " + baseRealmId, (Throwable) null );
     }
 
     private Mojo getConfiguredMojo( MavenSession session, MavenProject 
project, MojoExecution mojoExecution, ClassRealm pluginRealm )