Author: sisbell
Date: Wed Sep 3 17:04:33 2008
New Revision: 691836
URL: http://svn.apache.org/viewvc?rev=691836&view=rev
Log:
Cleaned out the model lineage references in builder.
Modified:
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultRepositoryHelper.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/resources/META-INF/plexus/components.xml
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
Modified:
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=691836&r1=691835&r2=691836&view=diff
==============================================================================
---
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Wed Sep 3 17:04:33 2008
@@ -39,10 +39,8 @@
import org.apache.maven.profiles.activation.ProfileActivationException;
import org.apache.maven.profiles.build.ProfileAdvisor;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
-import org.apache.maven.project.build.model.ModelLineageBuilder;
import org.apache.maven.project.builder.PomArtifactResolver;
import org.apache.maven.project.builder.ProjectBuilder;
-import org.apache.maven.project.inheritance.ModelInheritanceAssembler;
import org.apache.maven.project.injection.ModelDefaultsInjector;
import org.apache.maven.project.interpolation.ModelInterpolationException;
import org.apache.maven.project.interpolation.ModelInterpolator;
@@ -111,8 +109,6 @@
private ArtifactFactory artifactFactory;
- private ModelInheritanceAssembler modelInheritanceAssembler;
-
private ModelValidator validator;
// TODO: make it a component
@@ -124,8 +120,6 @@
private ModelInterpolator modelInterpolator;
- private ModelLineageBuilder modelLineageBuilder;
-
private ProfileAdvisor profileAdvisor;
private MavenTools mavenTools;
Modified:
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultRepositoryHelper.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultRepositoryHelper.java?rev=691836&r1=691835&r2=691836&view=diff
==============================================================================
---
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultRepositoryHelper.java
(original)
+++
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultRepositoryHelper.java
Wed Sep 3 17:04:33 2008
@@ -83,7 +83,7 @@
File file = projectArtifact.getFile();
artifact.setFile(file);
- legacy_model = readModelLegacy(projectId, file, true);
+ legacy_model = readModelLegacy(projectId, file, false);
String downloadUrl = null;
Modified:
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/resources/META-INF/plexus/components.xml?rev=691836&r1=691835&r2=691836&view=diff
==============================================================================
---
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/resources/META-INF/plexus/components.xml
(original)
+++
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/resources/META-INF/plexus/components.xml
Wed Sep 3 17:04:33 2008
@@ -144,9 +144,6 @@
<role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
</requirement>
<requirement>
- <role>org.apache.maven.project.build.model.ModelLineageBuilder</role>
- </requirement>
- <requirement>
<role>org.apache.maven.profiles.build.ProfileAdvisor</role>
</requirement>
<requirement>
@@ -159,9 +156,6 @@
<role>org.apache.maven.project.interpolation.ModelInterpolator</role>
</requirement>
<requirement>
-
<role>org.apache.maven.project.inheritance.ModelInheritanceAssembler</role>
- </requirement>
- <requirement>
<role>org.apache.maven.project.validation.ModelValidator</role>
</requirement>
<requirement>
Modified:
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml?rev=691836&r1=691835&r2=691836&view=diff
==============================================================================
---
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
(original)
+++
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
Wed Sep 3 17:04:33 2008
@@ -127,10 +127,6 @@
<role>org.apache.maven.project.workspace.ProjectWorkspace</role>
</requirement>
<requirement>
- <role>org.apache.maven.project.build.model.ModelLineageBuilder</role>
- <role-hint>default</role-hint>
- </requirement>
- <requirement>
<role>org.apache.maven.profiles.build.ProfileAdvisor</role>
<role-hint>default</role-hint>
</requirement>
@@ -144,9 +140,6 @@
<role>org.apache.maven.project.interpolation.ModelInterpolator</role>
</requirement>
<requirement>
-
<role>org.apache.maven.project.inheritance.ModelInheritanceAssembler</role>
- </requirement>
- <requirement>
<role>org.apache.maven.project.validation.ModelValidator</role>
</requirement>
<requirement>
Modified:
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml?rev=691836&r1=691835&r2=691836&view=diff
==============================================================================
---
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
(original)
+++
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
Wed Sep 3 17:04:33 2008
@@ -124,10 +124,6 @@
<role>org.apache.maven.project.workspace.ProjectWorkspace</role>
</requirement>
<requirement>
- <role>org.apache.maven.project.build.model.ModelLineageBuilder</role>
- <role-hint>default</role-hint>
- </requirement>
- <requirement>
<role>org.apache.maven.profiles.build.ProfileAdvisor</role>
<role-hint>default</role-hint>
</requirement>
@@ -141,9 +137,6 @@
<role>org.apache.maven.project.interpolation.ModelInterpolator</role>
</requirement>
<requirement>
-
<role>org.apache.maven.project.inheritance.ModelInheritanceAssembler</role>
- </requirement>
- <requirement>
<role>org.apache.maven.project.validation.ModelValidator</role>
</requirement>
<requirement>
