You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/01/27 17:18:32 UTC
svn commit: r738128 -
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Author: bentmann
Date: Tue Jan 27 16:18:32 2009
New Revision: 738128
URL: http://svn.apache.org/viewvc?rev=738128&view=rev
Log:
[MNG-3853] [regression] Distribution Management injected by profile is not reflected by MavenProject
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=738128&r1=738127&r2=738128&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Tue Jan 27 16:18:32 2009
@@ -23,9 +23,7 @@
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.HashMap;
-import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
@@ -309,6 +307,17 @@
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;
try
@@ -328,35 +337,9 @@
{
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 );
- 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;
}