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 2008/11/17 21:59:05 UTC
svn commit: r718375 -
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
Author: sisbell
Date: Mon Nov 17 12:59:05 2008
New Revision: 718375
URL: http://svn.apache.org/viewvc?rev=718375&view=rev
Log:
Problem in merging artifact containers, where one container specified a default type value (jar) and the other did not. They were treated as different types. Fixed this.
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java?rev=718375&r1=718374&r2=718375&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java Mon Nov 17 12:59:05 2008
@@ -146,12 +146,12 @@
if ( type == null )
{
- type = "";
+ type = "jar";
}
if ( scope == null )
{
- scope = "";
+ scope = "compile";
}
}