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

[MNG-4796] add a warning when profiles.xml is used (Maven 2) or detected (Maven 3) 

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@992683 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2010-09-04 21:28:53 +00:00
parent 69bbe9a862
commit 1abc9c1e9a
1 changed files with 47 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,8 +19,10 @@ import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.maven.RepositoryUtils;
@ -139,7 +141,7 @@ public class DefaultProjectBuilder
modelProblems = result.getProblems();
initProject( project, result );
initProject( project, result, new HashMap<File, Boolean>() );
}
else if ( configuration.isResolveDependencies() )
{
@ -309,7 +311,9 @@ public class DefaultProjectBuilder
try
{
noErrors = build( results, new ArrayList<MavenProject>(), interimResults, config ) && noErrors;
noErrors =
build( results, new ArrayList<MavenProject>(), interimResults, config, new HashMap<File, Boolean>() )
&& noErrors;
}
finally
{
@ -467,7 +471,7 @@ public class DefaultProjectBuilder
}
private boolean build( List<ProjectBuildingResult> results, List<MavenProject> projects,
List<InterimResult> interimResults, ProjectBuildingRequest config )
List<InterimResult> interimResults, ProjectBuildingRequest config, Map<File, Boolean> profilesXmls )
{
boolean noErrors = true;
@ -478,10 +482,10 @@ public class DefaultProjectBuilder
ModelBuildingResult result = modelBuilder.build( interimResult.request, interimResult.result );
MavenProject project = interimResult.listener.getProject();
initProject( project, result );
initProject( project, result, profilesXmls );
List<MavenProject> modules = new ArrayList<MavenProject>();
noErrors = build( results, modules, interimResult.modules, config ) && noErrors;
noErrors = build( results, modules, interimResult.modules, config, profilesXmls ) && noErrors;
projects.addAll( modules );
projects.add( project );
@ -502,7 +506,7 @@ public class DefaultProjectBuilder
return noErrors;
}
private void initProject( MavenProject project, ModelBuildingResult result )
private void initProject( MavenProject project, ModelBuildingResult result, Map<File, Boolean> profilesXmls )
{
Model model = result.getEffectiveModel();
@ -537,6 +541,43 @@ public class DefaultProjectBuilder
{
project.setInjectedProfileIds( modelId, getProfileIds( result.getActivePomProfiles( modelId ) ) );
}
String modelId = findProfilesXml( result, profilesXmls );
if ( modelId != null )
{
ModelProblem problem =
new DefaultModelProblem( "Detected profiles.xml alongside " + modelId
+ ", this file is no longer supported and was ignored" + ", please use the settings.xml instead",
ModelProblem.Severity.WARNING, model, -1, -1, null );
result.getProblems().add( problem );
}
}
private String findProfilesXml( ModelBuildingResult result, Map<File, Boolean> profilesXmls )
{
for ( String modelId : result.getModelIds() )
{
Model model = result.getRawModel( modelId );
File basedir = model.getProjectDirectory();
if ( basedir == null )
{
break;
}
Boolean profilesXml = profilesXmls.get( basedir );
if ( profilesXml == null )
{
profilesXml = Boolean.valueOf( new File( basedir, "profiles.xml" ).exists() );
profilesXmls.put( basedir, profilesXml );
}
if ( profilesXml.booleanValue() )
{
return modelId;
}
}
return null;
}
}