maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject svn commit: r750308 - in /maven/components/trunk: ./ maven-core/src/main/java/org/apache/maven/errors/ maven-core/src/main/java/org/apache/maven/lifecycle/ maven-core/src/main/java/org/apache/maven/lifecycle/binding/ maven-core/src/main/java/org/apache...
Date Thu, 05 Mar 2009 04:02:24 GMT
Author: jvanzyl
Date: Thu Mar  5 04:02:23 2009
New Revision: 750308

URL: http://svn.apache.org/viewvc?rev=750308&view=rev
Log:
o use the custom settings for now
o pushing everything related to the plugin manager into one package in preparation for replacement with the plexus plugin manager

Added:
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginLoader.java   (contents, props changed)
      - copied, changed from r750277, maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginLoader.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginPrefixLoader.java   (contents, props changed)
      - copied, changed from r750277, maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginPrefixLoader.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginVersionManager.java   (contents, props changed)
      - copied, changed from r750277, maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginLoader.java   (contents, props changed)
      - copied, changed from r750277, maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoader.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java   (contents, props changed)
      - copied, changed from r750277, maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoaderException.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginPrefixLoader.java   (contents, props changed)
      - copied, changed from r750277, maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginPrefixLoader.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionManager.java   (contents, props changed)
      - copied, changed from r750277, maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionManager.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionNotFoundException.java   (contents, props changed)
      - copied, changed from r750277, maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionResolutionException.java   (contents, props changed)
      - copied, changed from r750277, maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java
Removed:
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginLoader.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginPrefixLoader.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoader.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoaderException.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginPrefixLoader.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionManager.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java
Modified:
    maven/components/trunk/build.xml
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/CoreErrorReporter.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/CoreErrorTips.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultCoreErrorReporter.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/TaskValidationResult.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManager.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/binding/DefaultMojoBindingFactory.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/binding/MojoBindingFactory.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultBuildPlanner.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/statemgmt/ResolveLateBoundPluginMojo.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManagerSupport.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManagerSupport.java
    maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
    maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/plan/DefaultBuildPlannerTest.java
    maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/plan/testutils/TestPluginLoader.java
    maven/components/trunk/maven-core/src/test/resources/org/apache/maven/lifecycle/plan/DefaultBuildPlannerTest.xml
    maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
    maven/components/trunk/settings-booty.xml

Modified: maven/components/trunk/build.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/build.xml?rev=750308&r1=750307&r2=750308&view=diff
==============================================================================
--- maven/components/trunk/build.xml (original)
+++ maven/components/trunk/build.xml Thu Mar  5 04:02:23 2009
@@ -204,6 +204,9 @@
       <classpath refid="maven.classpath"/>
       <arg value="-e"/>
       <arg value="-B"/>
+      <!--
+      <arg value="-s settings-booty.xml"/>
+      -->
       <arg value="clean"/>
       <arg value="install"/>
       <arg value="-Dmaven.repo.local=${maven.repo.local}"/>

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/CoreErrorReporter.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/CoreErrorReporter.java?rev=750308&r1=750307&r2=750308&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/CoreErrorReporter.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/CoreErrorReporter.java Thu Mar  5 04:02:23 2009
@@ -24,12 +24,12 @@
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.PluginConfigurationException;
 import org.apache.maven.plugin.PluginExecutionException;
+import org.apache.maven.plugin.PluginLoaderException;
 import org.apache.maven.plugin.PluginManagerException;
 import org.apache.maven.plugin.PluginParameterException;
+import org.apache.maven.plugin.PluginVersionNotFoundException;
+import org.apache.maven.plugin.PluginVersionResolutionException;
 import org.apache.maven.plugin.descriptor.Parameter;
-import org.apache.maven.plugin.loader.PluginLoaderException;
-import org.apache.maven.plugin.version.PluginVersionNotFoundException;
-import org.apache.maven.plugin.version.PluginVersionResolutionException;
 import org.apache.maven.project.DuplicateArtifactAttachmentException;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.ProjectBuildingException;

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/CoreErrorTips.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/CoreErrorTips.java?rev=750308&r1=750307&r2=750308&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/CoreErrorTips.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/CoreErrorTips.java Thu Mar  5 04:02:23 2009
@@ -15,11 +15,11 @@
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.PluginConfigurationException;
 import org.apache.maven.plugin.PluginExecutionException;
+import org.apache.maven.plugin.PluginLoaderException;
 import org.apache.maven.plugin.PluginManagerException;
+import org.apache.maven.plugin.PluginVersionNotFoundException;
+import org.apache.maven.plugin.PluginVersionResolutionException;
 import org.apache.maven.plugin.descriptor.Parameter;
-import org.apache.maven.plugin.loader.PluginLoaderException;
-import org.apache.maven.plugin.version.PluginVersionNotFoundException;
-import org.apache.maven.plugin.version.PluginVersionResolutionException;
 import org.apache.maven.project.DuplicateArtifactAttachmentException;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.artifact.InvalidDependencyVersionException;

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultCoreErrorReporter.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultCoreErrorReporter.java?rev=750308&r1=750307&r2=750308&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultCoreErrorReporter.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultCoreErrorReporter.java Thu Mar  5 04:02:23 2009
@@ -28,13 +28,13 @@
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.PluginConfigurationException;
 import org.apache.maven.plugin.PluginExecutionException;
+import org.apache.maven.plugin.PluginLoaderException;
 import org.apache.maven.plugin.PluginManagerException;
 import org.apache.maven.plugin.PluginParameterException;
 import org.apache.maven.plugin.PluginParameterExpressionEvaluator;
+import org.apache.maven.plugin.PluginVersionNotFoundException;
+import org.apache.maven.plugin.PluginVersionResolutionException;
 import org.apache.maven.plugin.descriptor.Parameter;
-import org.apache.maven.plugin.loader.PluginLoaderException;
-import org.apache.maven.plugin.version.PluginVersionNotFoundException;
-import org.apache.maven.plugin.version.PluginVersionResolutionException;
 import org.apache.maven.project.DuplicateArtifactAttachmentException;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.ProjectBuildingException;

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=750308&r1=750307&r2=750308&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 Mar  5 04:02:23 2009
@@ -46,12 +46,12 @@
 import org.apache.maven.plugin.MojoExecution;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.PluginConfigurationException;
+import org.apache.maven.plugin.PluginLoader;
+import org.apache.maven.plugin.PluginLoaderException;
 import org.apache.maven.plugin.PluginManager;
 import org.apache.maven.plugin.PluginManagerException;
 import org.apache.maven.plugin.descriptor.MojoDescriptor;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
-import org.apache.maven.plugin.loader.PluginLoader;
-import org.apache.maven.plugin.loader.PluginLoaderException;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.artifact.InvalidDependencyVersionException;
 import org.codehaus.plexus.PlexusContainer;

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java?rev=750308&r1=750307&r2=750308&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java Thu Mar  5 04:02:23 2009
@@ -3,8 +3,8 @@
 import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.plugin.PluginConfigurationException;
+import org.apache.maven.plugin.PluginLoaderException;
 import org.apache.maven.plugin.PluginManagerException;
-import org.apache.maven.plugin.loader.PluginLoaderException;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.artifact.InvalidDependencyVersionException;
 

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/TaskValidationResult.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/TaskValidationResult.java?rev=750308&r1=750307&r2=750308&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/TaskValidationResult.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/TaskValidationResult.java Thu Mar  5 04:02:23 2009
@@ -2,7 +2,7 @@
 
 import org.apache.maven.InvalidTaskException;
 import org.apache.maven.plugin.InvalidPluginException;
-import org.apache.maven.plugin.loader.PluginLoaderException;
+import org.apache.maven.plugin.PluginLoaderException;
 
 /** @author Jason van Zyl */
 public class TaskValidationResult

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManager.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManager.java?rev=750308&r1=750307&r2=750308&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManager.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManager.java Thu Mar  5 04:02:23 2009
@@ -21,12 +21,12 @@
 import org.apache.maven.model.PluginExecution;
 import org.apache.maven.model.ReportPlugin;
 import org.apache.maven.model.ReportSet;
+import org.apache.maven.plugin.PluginLoader;
+import org.apache.maven.plugin.PluginLoaderException;
 import org.apache.maven.plugin.descriptor.MojoDescriptor;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
 import org.apache.maven.plugin.lifecycle.Execution;
 import org.apache.maven.plugin.lifecycle.Lifecycle;
-import org.apache.maven.plugin.loader.PluginLoader;
-import org.apache.maven.plugin.loader.PluginLoaderException;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.reporting.MavenReport;
 import org.codehaus.plexus.PlexusContainer;

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/binding/DefaultMojoBindingFactory.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/binding/DefaultMojoBindingFactory.java?rev=750308&r1=750307&r2=750308&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/binding/DefaultMojoBindingFactory.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/binding/DefaultMojoBindingFactory.java Thu Mar  5 04:02:23 2009
@@ -5,9 +5,9 @@
 import org.apache.maven.lifecycle.LifecycleSpecificationException;
 import org.apache.maven.lifecycle.model.MojoBinding;
 import org.apache.maven.model.Plugin;
-import org.apache.maven.plugin.loader.PluginLoader;
-import org.apache.maven.plugin.loader.PluginLoaderException;
-import org.apache.maven.plugin.loader.PluginPrefixLoader;
+import org.apache.maven.plugin.PluginLoader;
+import org.apache.maven.plugin.PluginLoaderException;
+import org.apache.maven.plugin.PluginPrefixLoader;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/binding/MojoBindingFactory.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/binding/MojoBindingFactory.java?rev=750308&r1=750307&r2=750308&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/binding/MojoBindingFactory.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/binding/MojoBindingFactory.java Thu Mar  5 04:02:23 2009
@@ -4,7 +4,7 @@
 import org.apache.maven.lifecycle.LifecycleLoaderException;
 import org.apache.maven.lifecycle.LifecycleSpecificationException;
 import org.apache.maven.lifecycle.model.MojoBinding;
-import org.apache.maven.plugin.loader.PluginLoader;
+import org.apache.maven.plugin.PluginLoader;
 import org.apache.maven.project.MavenProject;
 
 /**

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultBuildPlanner.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultBuildPlanner.java?rev=750308&r1=750307&r2=750308&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultBuildPlanner.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultBuildPlanner.java Thu Mar  5 04:02:23 2009
@@ -9,10 +9,10 @@
 import org.apache.maven.lifecycle.binding.MojoBindingFactory;
 import org.apache.maven.lifecycle.model.LifecycleBindings;
 import org.apache.maven.lifecycle.model.MojoBinding;
+import org.apache.maven.plugin.PluginLoader;
+import org.apache.maven.plugin.PluginLoaderException;
 import org.apache.maven.plugin.descriptor.MojoDescriptor;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
-import org.apache.maven.plugin.loader.PluginLoader;
-import org.apache.maven.plugin.loader.PluginLoaderException;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/statemgmt/ResolveLateBoundPluginMojo.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/statemgmt/ResolveLateBoundPluginMojo.java?rev=750308&r1=750307&r2=750308&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/statemgmt/ResolveLateBoundPluginMojo.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/statemgmt/ResolveLateBoundPluginMojo.java Thu Mar  5 04:02:23 2009
@@ -7,10 +7,10 @@
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugin.PluginLoader;
+import org.apache.maven.plugin.PluginLoaderException;
 import org.apache.maven.plugin.descriptor.MojoDescriptor;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
-import org.apache.maven.plugin.loader.PluginLoader;
-import org.apache.maven.plugin.loader.PluginLoaderException;
 import org.apache.maven.project.MavenProject;
 
 public class ResolveLateBoundPluginMojo extends AbstractMojo

Copied: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginLoader.java (from r750277, maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginLoader.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginLoader.java?p2=maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginLoader.java&p1=maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginLoader.java&r1=750277&r2=750308&rev=750308&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginLoader.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginLoader.java Thu Mar  5 04:02:23 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.loader;
+package org.apache.maven.plugin;
 
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
@@ -7,13 +7,7 @@
 import org.apache.maven.lifecycle.model.MojoBinding;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.ReportPlugin;
-import org.apache.maven.plugin.InvalidPluginException;
-import org.apache.maven.plugin.PluginManager;
-import org.apache.maven.plugin.PluginManagerException;
-import org.apache.maven.plugin.PluginNotFoundException;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
-import org.apache.maven.plugin.version.PluginVersionNotFoundException;
-import org.apache.maven.plugin.version.PluginVersionResolutionException;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;

Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginLoader.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginLoader.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginLoader.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Mar  5 04:02:23 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginLoader.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginLoader.java:680477
+/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginLoader.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginLoader.java:739385,741841,747468,748815,749612
+/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginLoader.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginLoader.java:738757-738972
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginLoader.java:688587-696625,696644-699681

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=750308&r1=750307&r2=750308&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 Thu Mar  5 04:02:23 2009
@@ -62,9 +62,6 @@
 import org.apache.maven.plugin.descriptor.Parameter;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
 import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder;
-import org.apache.maven.plugin.version.PluginVersionManager;
-import org.apache.maven.plugin.version.PluginVersionNotFoundException;
-import org.apache.maven.plugin.version.PluginVersionResolutionException;
 import org.apache.maven.project.DuplicateArtifactAttachmentException;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
@@ -187,9 +184,7 @@
         if ( ( pluginVersion == null ) || Artifact.LATEST_VERSION.equals( pluginVersion ) || Artifact.RELEASE_VERSION.equals( pluginVersion ) )
         {
             logger.debug( "Resolving version for plugin: " + plugin.getKey() );
-            pluginVersion = pluginVersionManager.resolvePluginVersion( plugin.getGroupId(),
-                                                                        plugin.getArtifactId(),
-                                                                        project, session );
+            pluginVersion = pluginVersionManager.resolvePluginVersion( plugin.getGroupId(), plugin.getArtifactId(), project, session );
             plugin.setVersion( pluginVersion );
 
             logger.debug( "Resolved to version: " + pluginVersion );
@@ -198,12 +193,8 @@
         return verifyVersionedPlugin( plugin, project, session );
     }
 
-    private PluginDescriptor verifyVersionedPlugin( Plugin plugin,
-                                                    MavenProject project,
-                                                    MavenSession session )
-        throws PluginVersionResolutionException, ArtifactNotFoundException,
-        ArtifactResolutionException, InvalidPluginException,
-        PluginManagerException, PluginNotFoundException
+    private PluginDescriptor verifyVersionedPlugin( Plugin plugin, MavenProject project, MavenSession session )
+        throws PluginVersionResolutionException, ArtifactNotFoundException, ArtifactResolutionException, InvalidPluginException, PluginManagerException, PluginNotFoundException
     {
         logger.debug( "In verifyVersionedPlugin for: " + plugin.getKey() );
 
@@ -224,9 +215,7 @@
             }
             else
             {
-                logger.debug(
-                                   "Skipping resolution for Maven built-in plugin: "
-                                                   + plugin.getKey() );
+                logger.debug( "Skipping resolution for Maven built-in plugin: " + plugin.getKey() );
             }
 
             project.addPlugin( plugin );
@@ -243,8 +232,7 @@
             {
                 throw new PluginNotFoundException( plugin, e );
             }
-            else if ( groupId.equals( e.getGroupId() ) && artifactId.equals( e.getArtifactId() )
-                      && version.equals( e.getVersion() ) && "maven-plugin".equals( e.getType() ) )
+            else if ( groupId.equals( e.getGroupId() ) && artifactId.equals( e.getArtifactId() ) && version.equals( e.getVersion() ) && "maven-plugin".equals( e.getType() ) )
             {
                 throw new PluginNotFoundException( plugin, e );
             }
@@ -261,12 +249,8 @@
         return pluginDescriptor;
     }
 
-    protected void addPlugin( Plugin plugin,
-                              Artifact pluginArtifact,
-                              MavenProject project,
-                              MavenSession session )
-        throws ArtifactNotFoundException, ArtifactResolutionException, PluginManagerException,
-        InvalidPluginException
+    protected void addPlugin( Plugin plugin, Artifact pluginArtifact, MavenProject project, MavenSession session )
+        throws ArtifactNotFoundException, ArtifactResolutionException, PluginManagerException, InvalidPluginException
     {
         // ----------------------------------------------------------------------------
         // Get the dependencies for the Plugin

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManagerSupport.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManagerSupport.java?rev=750308&r1=750307&r2=750308&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManagerSupport.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManagerSupport.java Thu Mar  5 04:02:23 2009
@@ -36,9 +36,6 @@
 import org.apache.maven.execution.RuntimeInformation;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
-import org.apache.maven.plugin.version.PluginVersionManager;
-import org.apache.maven.plugin.version.PluginVersionNotFoundException;
-import org.apache.maven.plugin.version.PluginVersionResolutionException;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.project.ProjectBuildingException;

Copied: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginPrefixLoader.java (from r750277, maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginPrefixLoader.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginPrefixLoader.java?p2=maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginPrefixLoader.java&p1=maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginPrefixLoader.java&r1=750277&r2=750308&rev=750308&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginPrefixLoader.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginPrefixLoader.java Thu Mar  5 04:02:23 2009
@@ -1,10 +1,7 @@
-package org.apache.maven.plugin.loader;
+package org.apache.maven.plugin;
 
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Plugin;
-import org.apache.maven.plugin.MavenPluginCollector;
-import org.apache.maven.plugin.PluginManagerSupport;
-import org.apache.maven.plugin.PluginMappingManager;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
 import org.apache.maven.project.MavenProject;
 //import org.apache.maven.settings.Settings;

Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginPrefixLoader.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginPrefixLoader.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginPrefixLoader.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Mar  5 04:02:23 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginPrefixLoader.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginPrefixLoader.java:680477
+/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginPrefixLoader.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginPrefixLoader.java:739385,741841,747468,748815,749612
+/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginPrefixLoader.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginPrefixLoader.java:738757-738972
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginPrefixLoader.java:688587-696625,696644-699681

Copied: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginVersionManager.java (from r750277, maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginVersionManager.java?p2=maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginVersionManager.java&p1=maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java&r1=750277&r2=750308&rev=750308&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginVersionManager.java Thu Mar  5 04:02:23 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.version;
+package org.apache.maven.plugin;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -35,7 +35,6 @@
 import org.apache.maven.execution.RuntimeInformation;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.ReportPlugin;
-import org.apache.maven.plugin.InvalidPluginException;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.project.ProjectBuildingException;

Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginVersionManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginVersionManager.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginVersionManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Mar  5 04:02:23 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java:680477
+/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java:739385,741841,747468,748815,749612
+/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java:738757-738972
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java:688587-696625,696644-699681

Copied: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginLoader.java (from r750277, maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoader.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginLoader.java?p2=maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginLoader.java&p1=maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoader.java&r1=750277&r2=750308&rev=750308&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoader.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginLoader.java Thu Mar  5 04:02:23 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.loader;
+package org.apache.maven.plugin;
 
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.execution.MavenSession;

Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginLoader.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginLoader.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginLoader.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Mar  5 04:02:23 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoader.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoader.java:680477
+/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoader.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoader.java:739385,741841,747468,748815,749612
+/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoader.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoader.java:738757-738972
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoader.java:688587-696625,696644-699681

Copied: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java (from r750277, maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoaderException.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java?p2=maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java&p1=maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoaderException.java&r1=750277&r2=750308&rev=750308&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoaderException.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java Thu Mar  5 04:02:23 2009
@@ -1,15 +1,10 @@
-package org.apache.maven.plugin.loader;
+package org.apache.maven.plugin;
 
 import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.ReportPlugin;
-import org.apache.maven.plugin.InvalidPluginException;
-import org.apache.maven.plugin.PluginManagerException;
-import org.apache.maven.plugin.PluginNotFoundException;
-import org.apache.maven.plugin.version.PluginVersionNotFoundException;
-import org.apache.maven.plugin.version.PluginVersionResolutionException;
 
 /**
  * Signifies a failure to load a plugin. This is used to abstract the specific errors which may be

Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Mar  5 04:02:23 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoaderException.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoaderException.java:680477
+/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoaderException.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoaderException.java:739385,741841,747468,748815,749612
+/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoaderException.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoaderException.java:738757-738972
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoaderException.java:688587-696625,696644-699681

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java?rev=750308&r1=750307&r2=750308&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java Thu Mar  5 04:02:23 2009
@@ -25,8 +25,6 @@
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.ReportPlugin;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
-import org.apache.maven.plugin.version.PluginVersionNotFoundException;
-import org.apache.maven.plugin.version.PluginVersionResolutionException;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.artifact.InvalidDependencyVersionException;
 import org.apache.maven.reporting.MavenReport;

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManagerSupport.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManagerSupport.java?rev=750308&r1=750307&r2=750308&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManagerSupport.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManagerSupport.java Thu Mar  5 04:02:23 2009
@@ -7,7 +7,6 @@
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
-import org.apache.maven.plugin.version.PluginVersionResolutionException;
 import org.apache.maven.project.MavenProject;
 
 import java.util.List;

Copied: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginPrefixLoader.java (from r750277, maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginPrefixLoader.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginPrefixLoader.java?p2=maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginPrefixLoader.java&p1=maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginPrefixLoader.java&r1=750277&r2=750308&rev=750308&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginPrefixLoader.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginPrefixLoader.java Thu Mar  5 04:02:23 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.loader;
+package org.apache.maven.plugin;
 
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Plugin;

Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginPrefixLoader.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginPrefixLoader.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginPrefixLoader.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Mar  5 04:02:23 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginPrefixLoader.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginPrefixLoader.java:680477
+/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginPrefixLoader.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginPrefixLoader.java:739385,741841,747468,748815,749612
+/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginPrefixLoader.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginPrefixLoader.java:738757-738972
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginPrefixLoader.java:688587-696625,696644-699681

Copied: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionManager.java (from r750277, maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionManager.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionManager.java?p2=maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionManager.java&p1=maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionManager.java&r1=750277&r2=750308&rev=750308&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionManager.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionManager.java Thu Mar  5 04:02:23 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.version;
+package org.apache.maven.plugin;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,6 @@
 
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.execution.MavenSession;
-import org.apache.maven.plugin.InvalidPluginException;
 import org.apache.maven.project.MavenProject;
 
 public interface PluginVersionManager

Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionManager.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Mar  5 04:02:23 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionManager.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionManager.java:680477
+/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionManager.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionManager.java:739385,741841,747468,748815,749612
+/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionManager.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionManager.java:738757-738972
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionManager.java:688587-696625,696644-699681

Copied: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionNotFoundException.java (from r750277, maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionNotFoundException.java?p2=maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionNotFoundException.java&p1=maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java&r1=750277&r2=750308&rev=750308&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionNotFoundException.java Thu Mar  5 04:02:23 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.version;
+package org.apache.maven.plugin;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionNotFoundException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionNotFoundException.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionNotFoundException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Mar  5 04:02:23 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java:680477
+/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java:739385,741841,747468,748815,749612
+/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java:738757-738972
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java:688587-696625,696644-699681

Copied: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionResolutionException.java (from r750277, maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionResolutionException.java?p2=maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionResolutionException.java&p1=maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java&r1=750277&r2=750308&rev=750308&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionResolutionException.java Thu Mar  5 04:02:23 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.version;
+package org.apache.maven.plugin;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionResolutionException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionResolutionException.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionResolutionException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Mar  5 04:02:23 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java:680477
+/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java:739385,741841,747468,748815,749612
+/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java:738757-738972
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java:688587-696625,696644-699681

Modified: maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=750308&r1=750307&r2=750308&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml Thu Mar  5 04:02:23 2009
@@ -42,7 +42,7 @@
       <implementation>org.apache.maven.lifecycle.binding.DefaultLifecycleBindingManager</implementation>
       <requirements>
         <requirement>
-          <role>org.apache.maven.plugin.loader.PluginLoader</role>
+          <role>org.apache.maven.plugin.PluginLoader</role>
         </requirement>
         <requirement>
           <role>org.apache.maven.lifecycle.LifecycleBindingLoader</role>

Modified: maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/plan/DefaultBuildPlannerTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/plan/DefaultBuildPlannerTest.java?rev=750308&r1=750307&r2=750308&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/plan/DefaultBuildPlannerTest.java (original)
+++ maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/plan/DefaultBuildPlannerTest.java Thu Mar  5 04:02:23 2009
@@ -11,9 +11,9 @@
 import org.apache.maven.model.Model;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.PluginExecution;
+import org.apache.maven.plugin.PluginLoader;
 import org.apache.maven.plugin.descriptor.MojoDescriptor;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
-import org.apache.maven.plugin.loader.PluginLoader;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.realm.DefaultMavenRealmManager;
 import org.apache.maven.realm.MavenRealmManager;

Modified: maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/plan/testutils/TestPluginLoader.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/plan/testutils/TestPluginLoader.java?rev=750308&r1=750307&r2=750308&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/plan/testutils/TestPluginLoader.java (original)
+++ maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/plan/testutils/TestPluginLoader.java Thu Mar  5 04:02:23 2009
@@ -5,10 +5,10 @@
 import org.apache.maven.lifecycle.model.MojoBinding;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.ReportPlugin;
+import org.apache.maven.plugin.PluginLoader;
+import org.apache.maven.plugin.PluginLoaderException;
 import org.apache.maven.plugin.descriptor.MojoDescriptor;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
-import org.apache.maven.plugin.loader.PluginLoader;
-import org.apache.maven.plugin.loader.PluginLoaderException;
 import org.apache.maven.project.MavenProject;
 
 import java.util.HashMap;

Modified: maven/components/trunk/maven-core/src/test/resources/org/apache/maven/lifecycle/plan/DefaultBuildPlannerTest.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/resources/org/apache/maven/lifecycle/plan/DefaultBuildPlannerTest.xml?rev=750308&r1=750307&r2=750308&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/resources/org/apache/maven/lifecycle/plan/DefaultBuildPlannerTest.xml (original)
+++ maven/components/trunk/maven-core/src/test/resources/org/apache/maven/lifecycle/plan/DefaultBuildPlannerTest.xml Thu Mar  5 04:02:23 2009
@@ -20,7 +20,7 @@
 <component-set>
   <components>
     <component>
-      <role>org.apache.maven.plugin.loader.PluginLoader</role>
+      <role>org.apache.maven.plugin.PluginLoader</role>
       <role-hint>default</role-hint>
       <implementation>org.apache.maven.lifecycle.plan.testutils.TestPluginLoader</implementation>
     </component>

Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=750308&r1=750307&r2=750308&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java Thu Mar  5 04:02:23 2009
@@ -63,8 +63,8 @@
 import org.apache.maven.plugin.PluginManagerException;
 import org.apache.maven.plugin.PluginNotFoundException;
 import org.apache.maven.plugin.PluginRepository;
-import org.apache.maven.plugin.version.PluginVersionNotFoundException;
-import org.apache.maven.plugin.version.PluginVersionResolutionException;
+import org.apache.maven.plugin.PluginVersionNotFoundException;
+import org.apache.maven.plugin.PluginVersionResolutionException;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.project.MavenProjectBuildingResult;

Modified: maven/components/trunk/settings-booty.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/settings-booty.xml?rev=750308&r1=750307&r2=750308&view=diff
==============================================================================
--- maven/components/trunk/settings-booty.xml (original)
+++ maven/components/trunk/settings-booty.xml Thu Mar  5 04:02:23 2009
@@ -9,7 +9,7 @@
       <id>Nexus</id>
       <mirrorOf>*</mirrorOf>
       <name>Nexus</name>
-      <url>http://repository.sonatype.org:8081/content/groups/sonatype-grid</url>
+      <url>http://repository.sonatype.org/content/groups/public</url>
     </mirror>
   </mirrors>
   <profiles>



Mime
View raw message