Author: sisbell
Date: Mon Sep 29 12:51:10 2008
New Revision: 700226
URL: http://svn.apache.org/viewvc?rev=700226&view=rev
Log:
Removed extension scanner. It was tied up into the old model lineage code,
which is very buggy. Needs to be reimplemented.
Removed:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/
maven/components/trunk/maven-core/src/test/java/org/apache/maven/extension/
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
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/errors/DefaultProjectErrorReporter.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/reactor/MavenExecutionException.java
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=700226&r1=700225&r2=700226&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Mon Sep 29 12:51:10 2008
@@ -22,8 +22,6 @@
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.apache.maven.execution.*;
-import org.apache.maven.extension.BuildExtensionScanner;
-import org.apache.maven.extension.ExtensionScanningException;
import org.apache.maven.lifecycle.LifecycleExecutionException;
import org.apache.maven.lifecycle.LifecycleExecutor;
import org.apache.maven.lifecycle.TaskValidationResult;
@@ -77,8 +75,6 @@
protected RuntimeInformation runtimeInformation;
- private BuildExtensionScanner buildExtensionScanner;
-
private Logger logger;
// ----------------------------------------------------------------------
@@ -263,17 +259,6 @@
e );
}
- // TODO: We should probably do this discovery just-in-time, if we can
move to building project
- // instances just-in-time.
- try
- {
- buildExtensionScanner.scanForBuildExtensions( files, request,
false );
- }
- catch ( ExtensionScanningException e )
- {
- throw new MavenExecutionException( "Error scanning for extensions:
" + e.getMessage(), e );
- }
-
projects = collectProjects( files, request, !request.useReactor() );
return projects;
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=700226&r1=700225&r2=700226&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
Mon Sep 29 12:51:10 2008
@@ -13,8 +13,6 @@
import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenSession;
-import org.apache.maven.extension.ExtensionManagerException;
-import org.apache.maven.extension.ModelInterpolationException;
import org.apache.maven.lifecycle.LifecycleException;
import org.apache.maven.lifecycle.LifecycleLoaderException;
import org.apache.maven.lifecycle.LifecycleSpecificationException;
@@ -37,7 +35,6 @@
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
-import org.apache.maven.errors.ProjectErrorReporter;
import org.apache.maven.path.PathTranslator;
import org.apache.maven.reactor.MavenExecutionException;
import org.apache.maven.reactor.MissingModuleException;
@@ -69,14 +66,10 @@
void reportErrorFormulatingBuildPlan( List tasks, MavenProject project,
MavenSession session, LifecycleException cause );
- void reportErrorInterpolatingModel( Model model, Map inheritedValues, File
pomFile, MavenExecutionRequest request, ModelInterpolationException cause );
-
void reportErrorLoadingPlugin( MojoBinding binding, MavenProject project,
PluginLoaderException cause );
void reportErrorManagingRealmForExtension( Artifact extensionArtifact,
Artifact projectArtifact, List remoteRepos, MavenExecutionRequest request,
RealmManagementException cause );
- void reportErrorResolvingExtensionDependencies( Artifact
extensionArtifact, Artifact projectArtifact, List remoteRepos,
MavenExecutionRequest request, ArtifactResolutionResult resolutionResult,
ExtensionManagerException err );
-
void reportErrorResolvingExtensionDirectDependencies( Artifact
extensionArtifact, Artifact projectArtifact, List remoteRepos,
MavenExecutionRequest request, ArtifactMetadataRetrievalException cause );
void reportErrorSearchingforCompatibleExtensionPluginVersion( Plugin
plugin, Model originModel, List remoteRepos, MavenExecutionRequest request,
String requiredMavenVersion, String currentMavenVersion,
InvalidVersionSpecificationException cause );
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=700226&r1=700225&r2=700226&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
Mon Sep 29 12:51:10 2008
@@ -1,7 +1,6 @@
package org.apache.maven.errors;
import org.apache.maven.ProjectCycleException;
-import org.apache.maven.extension.ModelInterpolationException;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.artifact.resolver.AbstractArtifactResolutionException;
@@ -181,13 +180,6 @@
return null;
}
- public static List getTipsForModelInterpolationError( Model model,
- File pomFile,
-
ModelInterpolationException cause )
- {
- // TODO Auto-generated method stub
- return null;
- }
public static List getIncompatibleProjectMavenVersionPrereqTips(
MavenProject project,
ArtifactVersion mavenVersion )
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=700226&r1=700225&r2=700226&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
Mon Sep 29 12:51:10 2008
@@ -9,14 +9,11 @@
import org.apache.maven.artifact.resolver.AbstractArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
-import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
-import org.apache.maven.artifact.resolver.CyclicDependencyException;
import org.apache.maven.artifact.resolver.MultipleArtifactsNotFoundException;
import org.apache.maven.artifact.versioning.ArtifactVersion;
import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenSession;
-import org.apache.maven.extension.ExtensionManagerException;
import org.apache.maven.lifecycle.LifecycleException;
import org.apache.maven.lifecycle.LifecycleLoaderException;
import org.apache.maven.lifecycle.LifecycleSpecificationException;
@@ -42,10 +39,6 @@
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
-import org.apache.maven.errors.DefaultProjectErrorReporter;
-import org.apache.maven.errors.ProjectErrorReporter;
-import org.apache.maven.errors.ProjectReporterManager;
-import org.apache.maven.extension.ModelInterpolationException;
import org.apache.maven.reactor.MavenExecutionException;
import org.apache.maven.reactor.MissingModuleException;
import org.apache.maven.realm.RealmManagementException;
@@ -60,7 +53,6 @@
import java.io.StringWriter;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -844,26 +836,6 @@
registerBuildError( exception, formattedMessage, reportedException );
}
- public void reportErrorInterpolatingModel( Model model,
- Map inheritedValues,
- File pomFile,
- MavenExecutionRequest request,
- ModelInterpolationException
cause )
- {
- StringWriter writer = new StringWriter();
-
- writer.write( NEWLINE );
- writer.write( "You have an invalid expression in your POM
(interpolation failed):" );
- writer.write( NEWLINE );
- writer.write( cause.getMessage() );
-
- writeProjectCoordinate( model, pomFile, writer );
- addTips( CoreErrorTips.getTipsForModelInterpolationError( model,
pomFile, cause ),
- writer );
-
- registerBuildError( cause, writer.toString(), cause.getCause() );
- }
-
public void reportErrorResolvingExtensionDirectDependencies( Artifact
extensionArtifact,
Artifact
projectArtifact,
List
remoteRepos,
@@ -901,140 +873,6 @@
registerBuildError( cause, writer.toString(), cause.getCause() );
}
- public void reportErrorResolvingExtensionDependencies( Artifact
extensionArtifact,
- Artifact
projectArtifact,
- List remoteRepos,
-
MavenExecutionRequest request,
-
ArtifactResolutionResult resolutionResult,
-
ExtensionManagerException err )
- {
- StringWriter writer = new StringWriter();
-
- writer.write( NEWLINE );
- writer.write( "Maven encountered an error while trying to resolve the
artifacts for a build extension used in your project." );
- writer.write( NEWLINE );
- writer.write( NEWLINE );
- writer.write( "Project:" );
- writeArtifactInfo( projectArtifact, writer, false );
- writer.write( NEWLINE );
- writer.write( NEWLINE );
- writer.write( "Extension:" );
- writeArtifactInfo( extensionArtifact, writer, false );
- writer.write( NEWLINE );
- writer.write( NEWLINE );
-
- List missingArtifacts = resolutionResult.getMissingArtifacts();
- if ( ( missingArtifacts != null ) && !missingArtifacts.isEmpty() )
- {
- writer.write( "The following artifacts were not found." );
- writer.write( NEWLINE );
- writer.write( "(Format is:
groupId:artifactId:version:type[:classifier])" );
- writer.write( NEWLINE );
-
- for ( Iterator it = missingArtifacts.iterator(); it.hasNext(); )
- {
- Artifact artifact = (Artifact) it.next();
- writer.write( NEWLINE );
- writeCompactArtifactCoordinate( "- ", artifact, writer );
- }
- writer.write( NEWLINE );
- writer.write( NEWLINE );
- }
-
- List circularDependencyExceptions =
resolutionResult.getCircularDependencyExceptions();
- if ( ( circularDependencyExceptions != null ) &&
!circularDependencyExceptions.isEmpty() )
- {
- writer.write( "The following dependency cycles were found." );
- writer.write( NEWLINE );
- writer.write( "(Format is:
groupId:artifactId:version:type[:classifier]), followed by the dependency trail
that included the offending artifact.)" );
- writer.write( NEWLINE );
-
- int i = 1;
- for ( Iterator it = circularDependencyExceptions.iterator();
it.hasNext(); )
- {
- CyclicDependencyException cde = (CyclicDependencyException)
it.next();
- Artifact artifact = cde.getArtifact();
- writer.write( NEWLINE );
- writeCompactArtifactCoordinate( i + ". ", artifact, writer );
-
- List trail = artifact.getDependencyTrail();
- for ( Iterator trailIt = trail.iterator(); trailIt.hasNext(); )
- {
- String id = (String) trailIt.next();
- writer.write( NEWLINE );
- writer.write( " - " );
- writer.write( id );
- }
-
- writer.write( NEWLINE );
- i++;
- }
-
- writer.write( NEWLINE );
- }
-
- Map mapOfLists = new LinkedHashMap();
-
- List metadataExceptions =
resolutionResult.getMetadataResolutionExceptions();
- if ( ( metadataExceptions != null ) && !metadataExceptions.isEmpty() )
- {
- mapOfLists.put( "The following metadata-resolution errors were
found.", metadataExceptions );
- }
-
- List errorArtifactExceptions =
resolutionResult.getErrorArtifactExceptions();
- if ( ( errorArtifactExceptions != null ) &&
!errorArtifactExceptions.isEmpty() )
- {
- mapOfLists.put( "The following artifact-resolution errors were
found.", errorArtifactExceptions );
- }
-
- List versionRangeViolations =
resolutionResult.getVersionRangeViolations();
- if ( ( versionRangeViolations != null ) &&
!versionRangeViolations.isEmpty() )
- {
- mapOfLists.put( "The following artifact version-range violations
were found.", versionRangeViolations );
- }
-
- for ( Iterator entryIt = mapOfLists.entrySet().iterator();
entryIt.hasNext(); )
- {
- Map.Entry entry = (Map.Entry) entryIt.next();
- String key = (String) entry.getKey();
- List exceptions = (List) entry.getValue();
-
- writer.write( key );
- writer.write( NEWLINE );
-
- int i = 1;
- for ( Iterator it = exceptions.iterator(); it.hasNext(); )
- {
- Exception e = (Exception) it.next();
- writer.write( NEWLINE );
- writer.write( i );
- writer.write( ". " );
- writer.write( e.getMessage() );
-
- Throwable t = getRootCause( e );
- if ( ( t != null ) && ( t != e ) )
- {
- writer.write( NEWLINE );
- writer.write( NEWLINE );
- writer.write( "Root error: " );
- writer.write( NEWLINE );
- writer.write( NEWLINE );
- writer.write( t.getMessage() );
- }
-
- writer.write( NEWLINE );
- i++;
- }
-
- writer.write( NEWLINE );
- }
-
- addTips( CoreErrorTips.getErrorResolvingExtensionArtifactsTips(
extensionArtifact, projectArtifact, resolutionResult ),
- writer );
-
- registerBuildError( err, writer.toString() );
- }
-
private void writeCompactArtifactCoordinate( String linePrefix,
Artifact artifact,
StringWriter writer )
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java?rev=700226&r1=700225&r2=700226&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java
Mon Sep 29 12:51:10 2008
@@ -21,7 +21,6 @@
import org.apache.maven.project.ProjectBuilderConfiguration;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
import org.apache.maven.project.ModelAndFile;
-import org.apache.maven.extension.ModelInterpolationException;
import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -416,23 +415,6 @@
registerBuildError( cause, writer.toString() );
}
- public void reportErrorInterpolatingModel( MavenProject project,
- File pomFile,
- ModelInterpolationException
cause )
- {
- StringWriter writer = new StringWriter();
-
- writer.write( NEWLINE );
- writer.write( "You have an invalid expression in your POM
(interpolation failed):" );
- writer.write( NEWLINE );
- writer.write( cause.getMessage() );
-
- addStandardInfo( project.getId(), pomFile, writer );
- addTips( ProjectErrorTips.getTipsForProjectInterpolationError(
project, pomFile, cause ),
- writer );
-
- registerBuildError( cause, writer.toString() );
- }
public void reportProjectValidationFailure( MavenProject project,
File pomFile,
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java?rev=700226&r1=700225&r2=700226&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java
Mon Sep 29 12:51:10 2008
@@ -18,7 +18,6 @@
import org.apache.maven.project.ProjectBuilderConfiguration;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
import org.apache.maven.project.ModelAndFile;
-import org.apache.maven.extension.ModelInterpolationException;
import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -190,25 +189,6 @@
* --> DefaultMavenProjectBuilder.buildFromSourceFileInternal(..)
(private)
* --> DefaultMavenProjectBuilder.buildInternal(..) (private)
* --> DefaultMavenProjectBuilder.processProjectLogic(..)
(private)
- * --> ModelInterpolator.interpolate(..)
- * <-- ModelInterpolationException
- * <---------- ProjectBuildingException
- * </pre>
- */
- void reportErrorInterpolatingModel( MavenProject project,
- File pomFile,
- ModelInterpolationException cause );
-
- /**
- * <b>Call Stack:</b>
- * <br/>
- * <pre>
- * ...
- * --> DefaultMavenProjectBuilder.buildFromRepository(..)
- * DefaultMavenProjectBuilder.build(..)
- * --> DefaultMavenProjectBuilder.buildFromSourceFileInternal(..)
(private)
- * --> DefaultMavenProjectBuilder.buildInternal(..) (private)
- * --> DefaultMavenProjectBuilder.processProjectLogic(..)
(private)
* --> DefaultMavenProjectBuilder.createPluginArtifacts(..)
* --> DefaultMavenProjectBuilder.createReportArtifacts(..)
* -->
DefaultMavenProjectBuilder.createExtensionArtifacts(..)
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java?rev=700226&r1=700225&r2=700226&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java
Mon Sep 29 12:51:10 2008
@@ -11,7 +11,6 @@
import org.apache.maven.execution.DuplicateProjectException;
import org.apache.maven.project.InvalidProjectVersionException;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.extension.ModelInterpolationException;
import org.apache.maven.project.validation.ModelValidationResult;
import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -126,14 +125,6 @@
return null;
}
- public static List getTipsForProjectInterpolationError( MavenProject
project,
- File
pomFile,
-
ModelInterpolationException cause )
- {
- // TODO Auto-generated method stub
- return null;
- }
-
public static List getTipsForPomParsingError( String projectId,
File pomFile,
Exception cause )
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/reactor/MavenExecutionException.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/reactor/MavenExecutionException.java?rev=700226&r1=700225&r2=700226&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/reactor/MavenExecutionException.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/reactor/MavenExecutionException.java
Mon Sep 29 12:51:10 2008
@@ -19,7 +19,6 @@
* under the License.
*/
-import org.apache.maven.extension.ExtensionScanningException;
import org.apache.maven.project.ProjectBuildingException;
import java.io.File;
@@ -51,11 +50,6 @@
super( message, cause );
}
- public MavenExecutionException( String message, ExtensionScanningException
cause )
- {
- super( message, cause );
- }
-
public MavenExecutionException( String message,
ProjectBuildingException cause )
{
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=700226&r1=700225&r2=700226&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
Mon Sep 29 12:51:10 2008
@@ -184,24 +184,6 @@
</component>
<component>
- <role>org.apache.maven.extension.BuildExtensionScanner</role>
- <role-hint>default</role-hint>
-
<implementation>org.apache.maven.extension.DefaultBuildExtensionScanner</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.extension.ExtensionManager</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.extension.lineage.ModelLineageBuilder</role>
- <role-hint>default</role-hint>
- </requirement>
- <requirement>
- <role>org.apache.maven.project.MavenProjectBuilder</role>
- </requirement>
- </requirements>
- </component>
-
- <component>
<role>org.apache.maven.extension.lineage.ModelLineageBuilder</role>
<role-hint>default</role-hint>
<implementation>org.apache.maven.extension.lineage.DefaultModelLineageBuilder</implementation>
@@ -315,10 +297,6 @@
<implementation>org.apache.maven.DefaultMaven</implementation>
<requirements>
<requirement>
- <role>org.apache.maven.extension.BuildExtensionScanner</role>
- <role-hint>default</role-hint>
- </requirement>
- <requirement>
<role>org.apache.maven.project.MavenProjectBuilder</role>
</requirement>
<requirement>
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=700226&r1=700225&r2=700226&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
Mon Sep 29 12:51:10 2008
@@ -34,8 +34,6 @@
import org.apache.maven.errors.CoreErrorReporter;
import org.apache.maven.errors.CoreReporterManager;
import org.apache.maven.execution.*;
-import org.apache.maven.extension.BuildExtensionScanner;
-import org.apache.maven.extension.ExtensionScanningException;
import org.apache.maven.lifecycle.LifecycleException;
import org.apache.maven.lifecycle.LifecycleUtils;
import org.apache.maven.lifecycle.plan.BuildPlan;
@@ -135,8 +133,6 @@
private MavenProjectBuilder mavenProjectBuilder;
- private BuildExtensionScanner extensionScanner;
-
private MavenXpp3Reader modelReader;
private MavenXpp3Writer modelWriter;
@@ -345,7 +341,7 @@
// ----------------------------------------------------------------------
public MavenProject readProject( File mavenProject )
- throws ProjectBuildingException, ExtensionScanningException,
MavenExecutionException
+ throws ProjectBuildingException, MavenExecutionException
{
CoreErrorReporter errorReporter = request.getErrorReporter();
errorReporter.clearErrors();
@@ -356,12 +352,8 @@
}
private MavenProject readProject( File mavenProject, MavenExecutionRequest
request )
- throws ProjectBuildingException, ExtensionScanningException,
MissingModuleException
+ throws ProjectBuildingException, MissingModuleException
{
- getLogger().debug( "Scanning for extensions: " + mavenProject );
-
- extensionScanner.scanForBuildExtensions( mavenProject, request, true );
-
getLogger().debug( "Building MavenProject instance: " + mavenProject );
return mavenProjectBuilder.build( mavenProject,
request.getProjectBuildingConfiguration() );
@@ -416,10 +408,6 @@
{
return result.addException( e );
}
- catch ( ExtensionScanningException e )
- {
- return result.addException( e );
- }
catch ( MissingModuleException e )
{
return result.addException( e );
@@ -676,8 +664,6 @@
mavenProjectBuilder = (MavenProjectBuilder) container.lookup(
MavenProjectBuilder.ROLE );
- extensionScanner = (BuildExtensionScanner) container.lookup(
BuildExtensionScanner.ROLE );
-
//
----------------------------------------------------------------------
// Artifact related components
//
----------------------------------------------------------------------
