Author: sisbell Date: Mon Jul 14 22:45:14 2008 New Revision: 676803 URL: http://svn.apache.org/viewvc?rev=676803&view=rev Log: Fix for dependency ordering.
Modified: maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java Modified: maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java URL: http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java?rev=676803&r1=676802&r2=676803&view=diff ============================================================================== --- maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java (original) +++ maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java Mon Jul 14 22:45:14 2008 @@ -47,6 +47,7 @@ ProjectUri.PluginRepositories.xUri, ProjectUri.Profiles.xUri, + ProjectUri.Profiles.Profile.Build.Plugins.xUri, ProjectUri.Profiles.Profile.Build.Plugins.Plugin.Dependencies.xUri, ProjectUri.Profiles.Profile.Build.Resources.xUri, ProjectUri.Profiles.Profile.Build.TestResources.xUri, @@ -54,6 +55,7 @@ ProjectUri.Profiles.Profile.Dependencies.Dependency.Exclusions.xUri, ProjectUri.Profiles.Profile.DependencyManagement.Dependencies.xUri, ProjectUri.Profiles.Profile.PluginRepositories.xUri, + ProjectUri.Profiles.Profile.Reporting.Plugins.xUri, ProjectUri.Profiles.Profile.Repositories.xUri, ProjectUri.Reporting.Plugins.xUri, @@ -66,10 +68,8 @@ "http://apache.org/maven/project/profiles/profile/build/pluginManagement/plugins/plugin/executions#collection", "http://apache.org/maven/project/profiles/profile/build/pluginManagement/plugins#collection", "http://apache.org/maven/project/profiles/profile/build/plugins/plugin/dependencies/dependency/exclusions#collection", - "http://apache.org/maven/project/profiles/profile/reporting/plugins#collection", "http://apache.org/maven/project/profiles/profile/dependencyManagement/dependencies/dependency/exclusions#collection", "http://apache.org/maven/project/profiles/profile/reporting/plugins/plugin/reportSets#collection", - "http://apache.org/maven/project/profiles/profile/build/plugins#collection", "http://apache.org/maven/project/profiles/profile/build/plugins/plugin/executions#collection", "http://apache.org/maven/project/build/plugins/plugin/dependencies/dependency/exclusions#collection", @@ -202,6 +202,20 @@ tmp.add(index, new ModelProperty(ProjectUri.Scm.developerConnection, scmDeveloperUrl.toString())); } + //Ordered Dependency Rule + if (domainModels.size() > 1) { + ModelDataSource source = new DefaultModelDataSource(); + source.init(tmp, Arrays.asList(new ArtifactModelContainerFactory(), new IdModelContainerFactory())); + List<ModelContainer> containers = source.queryFor(ProjectUri.Dependencies.Dependency.xUri); + int index = tmp.indexOf(getPropertyFor(ProjectUri.Dependencies.xUri, tmp)); + if (index > -1) { + for (ModelContainer container : containers) { + tmp.removeAll(container.getProperties()); + tmp.addAll(index + 1, container.getProperties()); + } + } + } + projectNames.add(0, getPropertyFor(ProjectUri.artifactId, tmp).getValue()); modelProperties.addAll(tmp); Modified: maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java URL: http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java?rev=676803&r1=676802&r2=676803&view=diff ============================================================================== --- maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java (original) +++ maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java Mon Jul 14 22:45:14 2008 @@ -107,7 +107,7 @@ if (parent == null) { return domainModels; } - logger.info("Parent: " + parent.getArtifactId()); + Artifact artifactParent = artifactFactory.createParentArtifact(parent.getGroupId(), parent.getArtifactId(), parent.getVersion()); Modified: maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java URL: http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java?rev=676803&r1=676802&r2=676803&view=diff ============================================================================== --- maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java (original) +++ maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java Mon Jul 14 22:45:14 2008 @@ -21,6 +21,7 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.project.MavenProject; +import org.apache.maven.project.builder.PomClassicDomainModel; import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase; import java.io.File; @@ -64,6 +65,7 @@ Set set = project1.getArtifacts(); assertNotNull("No artifacts", set); assertTrue("No Artifacts", set.size() > 0); + // System.out.println(new PomClassicDomainModel(project1.getModel()).asString()); Iterator iter = set.iterator(); assertTrue("Set size should be 3, is " + set.size(), set.size() == 3);