Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 30584 invoked from network); 21 Aug 2007 20:30:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 21 Aug 2007 20:30:13 -0000 Received: (qmail 55082 invoked by uid 500); 21 Aug 2007 20:30:10 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 55026 invoked by uid 500); 21 Aug 2007 20:30:10 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 55013 invoked by uid 99); 21 Aug 2007 20:30:10 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Aug 2007 13:30:10 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Aug 2007 20:30:12 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6E5711A981A; Tue, 21 Aug 2007 13:29:52 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r568258 - /maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DependencyNode.java Date: Tue, 21 Aug 2007 20:29:52 -0000 To: commits@maven.apache.org From: carlos@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070821202952.6E5711A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: carlos Date: Tue Aug 21 13:29:51 2007 New Revision: 568258 URL: http://svn.apache.org/viewvc?rev=568258&view=rev Log: Solve problem when artifact has version range Modified: maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DependencyNode.java Modified: maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DependencyNode.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DependencyNode.java?rev=568258&r1=568257&r2=568258&view=diff ============================================================================== --- maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DependencyNode.java (original) +++ maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DependencyNode.java Tue Aug 21 13:29:51 2007 @@ -552,7 +552,20 @@ this.relatedArtifact = relatedArtifact; - boolean duplicate = getArtifact().getVersion().equals( relatedArtifact.getVersion() ); + boolean duplicate = false; + if ( getArtifact().getVersion() != null ) + { + duplicate = getArtifact().getVersion().equals( relatedArtifact.getVersion() ); + } + else if ( getArtifact().getVersionRange() != null ) + { + duplicate = getArtifact().getVersionRange().equals( relatedArtifact.getVersionRange() ); + } + else + { + throw new RuntimeException( "Artifact version and version range is null: " + getArtifact() ); + } + state = duplicate ? OMITTED_FOR_DUPLICATE : OMITTED_FOR_CONFLICT; removeAllChildren();