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

[MNG-3853] [regression] Distribution Management injected by profile is not reflected by MavenProject 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@738128 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-01-27 16:18:32 +00:00
parent 3e6bc31a03
commit 5888994149
1 changed files with 11 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
View File

@ -23,9 +23,7 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -309,6 +307,17 @@ public class DefaultMavenProjectBuilder
profileActivationContext = new DefaultProfileActivationContext( config.getExecutionProperties(), false ); profileActivationContext = new DefaultProfileActivationContext( config.getExecutionProperties(), false );
} }
List<Profile> projectProfiles = new ArrayList<Profile>();
projectProfiles.addAll( profileAdvisor.applyActivatedProfiles( model,
isReactorProject ? projectDescriptor : null,
isReactorProject, profileActivationContext ) );
projectProfiles.addAll( profileAdvisor.applyActivatedExternalProfiles( model,
isReactorProject ? projectDescriptor
: null,
externalProfileManager ) );
MavenProject project; MavenProject project;
try try
@ -328,35 +337,9 @@ public class DefaultMavenProjectBuilder
{ {
throw new InvalidProjectModelException( projectId, e.getMessage(), projectDescriptor, e ); throw new InvalidProjectModelException( projectId, e.getMessage(), projectDescriptor, e );
} }
List<Profile> projectProfiles = new ArrayList<Profile>();
projectProfiles.addAll( profileAdvisor.applyActivatedProfiles( project.getModel(),
isReactorProject ? projectDescriptor : null,
isReactorProject, profileActivationContext ) );
projectProfiles.addAll( profileAdvisor.applyActivatedExternalProfiles( project.getModel(), project.getFile(), externalProfileManager ) );
project.setActiveProfiles( projectProfiles ); project.setActiveProfiles( projectProfiles );
try
{
LinkedHashSet repoSet = new LinkedHashSet();
if ( ( model.getRepositories() != null ) && !model.getRepositories().isEmpty() )
{
repoSet.addAll( model.getRepositories() );
}
if ( ( model.getPluginRepositories() != null ) && !model.getPluginRepositories().isEmpty() )
{
repoSet.addAll( model.getPluginRepositories() );
}
project.setRemoteArtifactRepositories( mavenTools.buildArtifactRepositories( new ArrayList( repoSet ) ) );
}
catch ( Exception e )
{
e.printStackTrace();
}
return project; return project;
} }