From ed4083c93fcace49d103b36f4eddee7b293686c0 Mon Sep 17 00:00:00 2001 From: Britton Isbell Date: Mon, 17 Nov 2008 20:59:05 +0000 Subject: [PATCH] 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. git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@718375 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/project/builder/ArtifactModelContainerFactory.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java b/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java index 31c1a7d73b..6eca640948 100644 --- a/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java +++ b/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java @@ -146,12 +146,12 @@ public final class ArtifactModelContainerFactory if ( type == null ) { - type = ""; + type = "jar"; } if ( scope == null ) { - scope = ""; + scope = "compile"; } }