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

o Cleaned up code 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@803816 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-08-13 09:32:14 +00:00
parent 6e302e26c9
commit 52d99a7ba9
2 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
View File

@ -87,8 +87,8 @@ public class DefaultProjectBuilder
return build( pomFile, true, configuration, false );
}
private DefaultProjectBuildingResult build( File pomFile, boolean localProject,
ProjectBuildingRequest configuration, boolean resolveDependencies )
private ProjectBuildingResult build( File pomFile, boolean localProject, ProjectBuildingRequest configuration,
boolean resolveDependencies )
throws ProjectBuildingException
{
ModelBuildingRequest request = getModelBuildingRequest( configuration, null );

24
maven-core/src/main/java/org/apache/maven/project/MavenProject.java
View File

@ -17,8 +17,6 @@ package org.apache.maven.project;
import java.io.File;
import java.io.IOException;
import java.io.StringReader;
import java.io.StringWriter;
import java.io.Writer;
import java.util.ArrayList;
import java.util.Collections;
@ -64,7 +62,7 @@ import org.apache.maven.model.Reporting;
import org.apache.maven.model.Repository;
import org.apache.maven.model.Resource;
import org.apache.maven.model.Scm;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.model.building.ModelUtils;
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.apache.maven.repository.RepositorySystem;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
@ -1840,27 +1838,9 @@ public class MavenProject
setScriptSourceRoots( ( new ArrayList<String>( project.getScriptSourceRoots() ) ) );
}
/*
* TODO: This is temporary solution for the failure of IT mng-0471. When StartForkedExecutionMojo clones the
* project it really needs a deep copy of the model to make sure manipulations to the project/model during the
* forked execution don't pollute the main execution. It's not clear to me right now whether manipulations to
* the model itself should just be prohibited (say be means of UnsupportedOperationExceptions) and only have the
* project be mutable. If we allow model updates like in 2.x, the code below should better be replaced with the
* original cloning code from ModelUtils.
*/
if ( project.getModel() != null )
{
try
{
StringWriter modelWriter = new StringWriter( 1024 * 10 );
project.writeModel( modelWriter );
MavenXpp3Reader parser = new MavenXpp3Reader();
setModel( parser.read( new StringReader( modelWriter.toString() ) ) );
}
catch ( Exception e )
{
throw new IllegalStateException( "in-memory cloning failed", e );
}
setModel( ModelUtils.cloneModel( project.getModel() ) );
}
if ( project.getOriginalModel() != null )