Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 77236 invoked from network); 28 Jan 2009 05:44:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 28 Jan 2009 05:44:51 -0000 Received: (qmail 76287 invoked by uid 500); 28 Jan 2009 05:44:51 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 76225 invoked by uid 500); 28 Jan 2009 05:44:51 -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 76216 invoked by uid 99); 28 Jan 2009 05:44:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Jan 2009 21:44:50 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Jan 2009 05:44:50 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EDBC023888E6; Wed, 28 Jan 2009 05:44:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r738374 - in /maven/components/trunk/maven-project/src: main/java/org/apache/maven/project/MavenProject.java test/java/org/apache/maven/project/DefaultMavenProjectHelperTest.java Date: Wed, 28 Jan 2009 05:44:29 -0000 To: commits@maven.apache.org From: sisbell@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090128054429.EDBC023888E6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sisbell Date: Wed Jan 28 05:44:29 2009 New Revision: 738374 URL: http://svn.apache.org/viewvc?rev=738374&view=rev Log: MNG-4013: Identical plugin executions are allowed in pom. This can cause failure in Maven 3 (since there is no longer cloning of maven project) on duplicate attached artifacts. Removed: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectHelperTest.java Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=738374&r1=738373&r2=738374&view=diff ============================================================================== --- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java (original) +++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java Wed Jan 28 05:44:29 2009 @@ -114,7 +114,7 @@ private List collectedProjects = Collections.EMPTY_LIST; - private List attachedArtifacts; + private List attachedArtifacts; private MavenProject executionProject; @@ -1437,17 +1437,20 @@ if ( attachedArtifacts.contains( artifact ) ) { - throw new DuplicateArtifactAttachmentException( this, artifact ); + //should add logger to this class: + System.out.println("[Warning] Duplicate artifact: " + artifact.toString()); + return; + //throw new DuplicateArtifactAttachmentException( this, artifact ); } getAttachedArtifacts().add( artifact ); } - public List getAttachedArtifacts() + public List getAttachedArtifacts() { if ( attachedArtifacts == null ) { - attachedArtifacts = new ArrayList(); + attachedArtifacts = new ArrayList(); } return attachedArtifacts; }