svn commit: r1001236 - in /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project: DefaultProjectBuildingRequest.java MavenProject.java

[bentmann]

Author: bentmann
Date: Sat Sep 25 15:17:39 2010
New Revision: 1001236

URL: http://svn.apache.org/viewvc?rev=1001236&view=rev
Log:
[MNG-4834] [regression] MavenProject.getParent() ignores configured repositories

Modified:
    
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
    
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java

Modified: 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java?rev=1001236&r1=1001235&r2=1001236&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
 (original)
+++ 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
 Sat Sep 25 15:17:39 2010
@@ -27,7 +27,6 @@ import java.util.Properties;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.model.Profile;
 import org.apache.maven.model.building.ModelBuildingRequest;
-import org.apache.maven.repository.ArtifactTransferListener;
 import org.sonatype.aether.RepositorySystemSession;
 
 public class DefaultProjectBuildingRequest
@@ -62,8 +61,6 @@ public class DefaultProjectBuildingReque
 
     private boolean resolveDependencies;
 
-    private ArtifactTransferListener transferListener;
-
     public DefaultProjectBuildingRequest()
     {
         processPlugins = true;
@@ -76,6 +73,25 @@ public class DefaultProjectBuildingReque
         pluginArtifactRepositories = new ArrayList<ArtifactRepository>();
     }
 
+    public DefaultProjectBuildingRequest( ProjectBuildingRequest request )
+    {
+        this();
+        setProcessPlugins( request.isProcessPlugins() );
+        setProfiles( request.getProfiles() );
+        setActiveProfileIds( request.getActiveProfileIds() );
+        setInactiveProfileIds( request.getInactiveProfileIds() );
+        setSystemProperties( request.getSystemProperties() );
+        setUserProperties( request.getUserProperties() );
+        setRemoteRepositories( request.getRemoteRepositories() );
+        setPluginArtifactRepositories( request.getPluginArtifactRepositories() 
);
+        setRepositorySession( request.getRepositorySession() );
+        setLocalRepository( request.getLocalRepository() );
+        setBuildStartTime( request.getBuildStartTime() );
+        setProject( request.getProject() );
+        setResolveDependencies( request.isResolveDependencies() );
+        setValidationLevel( request.getValidationLevel() );
+    }
+
     public MavenProject getProject()
     {
         return project;
@@ -274,16 +290,6 @@ public class DefaultProjectBuildingReque
         this.buildStartTime = buildStartTime;
     }
 
-    public ArtifactTransferListener getTransferListener()
-    {
-        return transferListener;
-    }
-
-    public void setTransferListener( ArtifactTransferListener transferListener 
)
-    {
-        this.transferListener = transferListener;
-    }
-
     public RepositorySystemSession getRepositorySession()
     {
         return repositorySession;

Modified: 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java?rev=1001236&r1=1001235&r2=1001236&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
 (original)
+++ 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
 Sat Sep 25 15:17:39 2010
@@ -346,9 +346,12 @@ public class MavenProject
              */
             if ( parentFile != null )
             {
+                ProjectBuildingRequest request = new 
DefaultProjectBuildingRequest( projectBuilderConfiguration );
+                request.setRemoteRepositories( getRemoteArtifactRepositories() 
);
+
                 try
                 {
-                    parent = mavenProjectBuilder.build( parentFile, 
projectBuilderConfiguration ).getProject();
+                    parent = mavenProjectBuilder.build( parentFile, request 
).getProject();
                 }
                 catch ( ProjectBuildingException e )
                 {
@@ -360,9 +363,12 @@ public class MavenProject
             }
             else if ( model.getParent() != null )
             {
+                ProjectBuildingRequest request = new 
DefaultProjectBuildingRequest( projectBuilderConfiguration );
+                request.setRemoteRepositories( getRemoteArtifactRepositories() 
);
+
                 try
                 {
-                    parent = mavenProjectBuilder.build( getParentArtifact(), 
projectBuilderConfiguration ).getProject();
+                    parent = mavenProjectBuilder.build( getParentArtifact(), 
request ).getProject();
                 }
                 catch ( ProjectBuildingException e )
                 {