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/09/07 13:11:24 UTC
svn commit: r812081 -
/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Author: bentmann
Date: Mon Sep 7 11:11:24 2009
New Revision: 812081
URL: http://svn.apache.org/viewvc?rev=812081&view=rev
Log:
o Fixed population of properties in legacy project builder
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=812081&r1=812080&r2=812081&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Mon Sep 7 11:11:24 2009
@@ -23,8 +23,10 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Repository;
import org.apache.maven.model.building.ModelBuildingRequest;
+import org.apache.maven.plugin.LegacySupport;
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.repository.RepositorySystem;
import org.codehaus.plexus.component.annotations.Component;
@@ -44,6 +46,9 @@
@Requirement
private RepositorySystem repositorySystem;
+ @Requirement
+ private LegacySupport legacySupport;
+
// ----------------------------------------------------------------------
// MavenProjectBuilder Implementation
// ----------------------------------------------------------------------
@@ -133,7 +138,18 @@
.setRemoteRepositories( remoteRepositories );
configuration.setProcessPlugins( false );
configuration.setValidationLevel( ModelBuildingRequest.VALIDATION_LEVEL_MINIMAL );
-
+
+ MavenSession session = legacySupport.getSession();
+ if ( session != null )
+ {
+ configuration.setSystemProperties( session.getSystemProperties() );
+ configuration.setUserProperties( session.getUserProperties() );
+ }
+ else
+ {
+ configuration.setSystemProperties( System.getProperties() );
+ }
+
return buildFromRepository( artifact, configuration );
}