Author: sisbell
Date: Thu Dec 18 15:35:31 2008
New Revision: 727855
URL: http://svn.apache.org/viewvc?rev=727855&view=rev
Log:
Fix: there was a problem with pom construction if there were two or more
plugins with dependencies elements.
Added:
maven/components/trunk/maven-project/src/test/resources-project-builder/single-test-poms/
maven/components/trunk/maven-project/src/test/resources-project-builder/single-test-poms/pluginDependencies.xml
Modified:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
Modified:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java?rev=727855&r1=727854&r2=727855&view=diff
==============================================================================
---
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
(original)
+++
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
Thu Dec 18 15:35:31 2008
@@ -38,10 +38,11 @@
ProjectUri.DependencyManagement.Dependencies.Dependency.xUri,
ProjectUri.Dependencies.Dependency.xUri,
ProjectUri.Reporting.Plugins.Plugin.xUri,
ProjectUri.Build.PluginManagement.Plugins.Plugin.xUri,
-
ProjectUri.Build.PluginManagement.Plugins.Plugin.Dependencies.Dependency.xUri,
+
//ProjectUri.Build.PluginManagement.Plugins.Plugin.Dependencies.Dependency.xUri,
- ProjectUri.Build.Plugins.Plugin.xUri,
ProjectUri.Build.Plugins.Plugin.Dependencies.Dependency.xUri,
-
ProjectUri.Build.Plugins.Plugin.Dependencies.Dependency.Exclusions.Exclusion.xUri,
+ ProjectUri.Build.Plugins.Plugin.xUri,
+ //ProjectUri.Build.Plugins.Plugin.Dependencies.Dependency.xUri,
+ //
ProjectUri.Build.Plugins.Plugin.Dependencies.Dependency.Exclusions.Exclusion.xUri,
ProjectUri.Build.Extensions.Extension.xUri
) );
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java?rev=727855&r1=727854&r2=727855&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
Thu Dec 18 15:35:31 2008
@@ -67,6 +67,17 @@
assertModelEquals( tester, "child-descriptor",
"build/plugins[1]/executions[1]/goals[1]" );
}
+ public void testTwoPluginsWithDependencies()
+ throws Exception
+ {
+ File pomFile = new File( testDirectory,
"single-test-poms/pluginDependencies.xml" );
+ PomArtifactResolver resolver = artifactResolver( "single-test-poms"
);
+ PomClassicDomainModel model = projectBuilder.buildModel( pomFile,
null, resolver );
+ PomTestWrapper pom = new PomTestWrapper( model );
+ List dependencies = (List) pom.getValue(
"build/plugins[1]/dependencies" );
+ assertEquals( 1, dependencies.size() );
+ }
+
private PomArtifactResolver artifactResolver( String basedir )
{
PomArtifactResolver resolver = new FileBasedPomArtifactResolver( new
File( BASE_POM_DIR, basedir ) );
Added:
maven/components/trunk/maven-project/src/test/resources-project-builder/single-test-poms/pluginDependencies.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/single-test-poms/pluginDependencies.xml?rev=727855&view=auto
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources-project-builder/single-test-poms/pluginDependencies.xml
(added)
+++
maven/components/trunk/maven-project/src/test/resources-project-builder/single-test-poms/pluginDependencies.xml
Thu Dec 18 15:35:31 2008
@@ -0,0 +1,33 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.sonatype.nexus</groupId>
+ <artifactId>nexus-configuration</artifactId>
+ <version>1.0</version>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-maven-plugin</artifactId>
+ <dependencies>
+ <dependency>
+
<groupId>commons-collections</groupId>
+
<artifactId>commons-collections</artifactId>
+ <version>3.2</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>modello-plugin-upgrade</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <dependencies>
+ <dependency>
+
<groupId>commons-collections</groupId>
+
<artifactId>commons-collections</artifactId>
+ <version>3.2</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+</project>
