Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing compilation errors. 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@613035 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
John Dennis Casey 2008-01-18 01:38:37 +00:00
parent 89f482ac37
commit facb56d1eb
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
maven-core/src/test/java/org/apache/maven/extension/DefaultBuildExtensionScannerTest.java
View File

@ -15,6 +15,7 @@
import org.apache.maven.project.build.model.ModelLineageBuilder;
import org.apache.maven.project.interpolation.ModelInterpolationException;
import org.apache.maven.project.interpolation.ModelInterpolator;
import org.apache.maven.reactor.MissingModuleException;
import org.apache.maven.shared.tools.easymock.MockManager;
import org.apache.maven.shared.tools.easymock.TestFileManager;
import org.codehaus.plexus.logging.Logger;
@ -87,7 +88,7 @@ public void tearDown()
public void testIncludePluginWhenExtensionsFlagDirectlySet()
throws ExtensionScanningException, ProjectBuildingException, ModelInterpolationException,
ExtensionManagerException
ExtensionManagerException, MissingModuleException
{
MavenExecutionRequest request = new DefaultMavenExecutionRequest();
File pomFile = new File( "pom" );
@ -140,7 +141,7 @@ modelInterpolator, new ConsoleLogger( Logger.LEVEL_DEBUG,
public void testIncludePluginWhenExtensionsFlagSetInPluginManagement()
throws ExtensionScanningException, ProjectBuildingException, ModelInterpolationException,
ExtensionManagerException
ExtensionManagerException, MissingModuleException
{
MavenExecutionRequest request = new DefaultMavenExecutionRequest();
File pomFile = new File( "pom" );
@ -219,7 +220,7 @@ modelInterpolator, new ConsoleLogger( Logger.LEVEL_DEBUG,
public void testIncludePluginWithExtensionsFlagDeclaredInParentPluginManagementReferencedFromModule()
throws ModelInterpolationException, ProjectBuildingException, ExtensionManagerException,
ExtensionScanningException, IOException
ExtensionScanningException, IOException, MissingModuleException
{
MavenExecutionRequest request = new DefaultMavenExecutionRequest();
File projectDir = fileManager.createTempDir();

10
maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
View File

@ -59,6 +59,8 @@
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.MavenProjectBuildingResult;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.reactor.MavenExecutionException;
import org.apache.maven.reactor.MissingModuleException;
import org.apache.maven.settings.Settings;
import org.apache.maven.settings.SettingsConfigurationException;
import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
@ -330,7 +332,7 @@ protected void verifyPlugin( Plugin plugin,
// ----------------------------------------------------------------------
public MavenProject readProject( File mavenProject )
throws ProjectBuildingException, ExtensionScanningException
throws ProjectBuildingException, ExtensionScanningException, MavenExecutionException
{
CoreErrorReporter errorReporter = request.getErrorReporter();
errorReporter.clearErrors();
@ -341,7 +343,7 @@ public MavenProject readProject( File mavenProject )
}
private MavenProject readProject( File mavenProject, MavenExecutionRequest request )
throws ProjectBuildingException, ExtensionScanningException
throws ProjectBuildingException, ExtensionScanningException, MissingModuleException
{
getLogger().debug( "Scanning for extensions: " + mavenProject );
@ -405,6 +407,10 @@ public MavenExecutionResult readProjectWithDependencies( MavenExecutionRequest r
{
return result.addException( e );
}
catch ( MissingModuleException e )
{
return result.addException( e );
}
ReactorManager reactorManager = maven.createReactorManager( request, result );