You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2009/01/09 14:42:38 UTC
svn commit: r733036 - in /maven/components/trunk:
maven-project-builder/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
Author: sisbell
Date: Fri Jan 9 05:42:37 2009
New Revision: 733036
URL: http://svn.apache.org/viewvc?rev=733036&view=rev
Log:
Fix: MNG-3943
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=733036&r1=733035&r2=733036&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 Fri Jan 9 05:42:37 2009
@@ -75,6 +75,8 @@
private String scope;
private String classifier;
+
+ private String uri;
private List<ModelProperty> properties;
@@ -95,7 +97,7 @@
{
this.properties = new ArrayList<ModelProperty>( properties );
this.properties = Collections.unmodifiableList( this.properties );
- String uri = findBaseUriFrom( this.properties );
+ uri = findBaseUriFrom( this.properties );
for ( ModelProperty mp : this.properties )
{
@@ -193,7 +195,8 @@
if ( c.groupId.equals( groupId ) && c.artifactId.equals( artifactId ) && c.type.equals( type )
&& c.classifier.equals( classifier ))
{
- if ( c.version.equals( version ) || version.equals("") || c.version.equals(""))
+ if ( uri.startsWith(ProjectUri.Build.Plugins.xUri) || c.version.equals( version )
+ || version.equals("") || c.version.equals(""))
{
return ModelContainerAction.JOIN;
}
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=733036&r1=733035&r2=733036&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 Fri Jan 9 05:42:37 2009
@@ -166,14 +166,14 @@
assertEquals( 4, ( (List<?>) pom.getValue( "build/plugins[1]/executions" ) ).size() );
}
- /* FIXME: cf. MNG-3943
+ /* FIXME: cf. MNG-3943*/
public void testMergeOfPluginExecutionsWhenChildAndParentUseDifferentPluginVersions()
throws Exception
{
PomTestWrapper pom = buildPom( "plugin-exec-merging-version-insensitive/sub" );
assertEquals( 4, ( (List<?>) pom.getValue( "build/plugins[1]/executions" ) ).size() );
}
- //*/
+
public void testInterpolationWithXmlMarkup()
throws Exception