Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 10793 invoked from network); 31 Jan 2007 06:08:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 31 Jan 2007 06:08:17 -0000 Received: (qmail 36167 invoked by uid 500); 31 Jan 2007 06:08:23 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 36148 invoked by uid 500); 31 Jan 2007 06:08:23 -0000 Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: continuum-dev@maven.apache.org Delivered-To: mailing list continuum-commits@maven.apache.org Received: (qmail 36135 invoked by uid 99); 31 Jan 2007 06:08:23 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Jan 2007 22:08:23 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME 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, 30 Jan 2007 22:08:16 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 5D9E11A981A; Tue, 30 Jan 2007 22:07:56 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r501741 - in /maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release: executors/PerformReleaseTaskExecutor.java phase/GenerateReactorProjectsPhase.java Date: Wed, 31 Jan 2007 06:07:56 -0000 To: continuum-commits@maven.apache.org From: epunzalan@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070131060756.5D9E11A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: epunzalan Date: Tue Jan 30 22:07:55 2007 New Revision: 501741 URL: http://svn.apache.org/viewvc?view=rev&rev=501741 Log: fixed bug that causes the release phase check-dependency-snapshots from seeing SNAPSHOT artifacts within the project to be released Modified: maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/GenerateReactorProjectsPhase.java Modified: maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java?view=diff&rev=501741&r1=501740&r2=501741 ============================================================================== --- maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java (original) +++ maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java Tue Jan 30 22:07:55 2007 @@ -162,12 +162,20 @@ try { - MavenProject reactorProject = projectBuilder.build( pomFile, getLocalRepository(), + MavenProject reactorProject = projectBuilder.buildWithDependencies( pomFile, getLocalRepository(), getProfileManager( settings ) ); reactorProjects.add( reactorProject ); } catch ( ProjectBuildingException e ) + { + throw new ContinuumReleaseException( "Failed to build project.", e ); + } + catch ( ArtifactNotFoundException e ) + { + throw new ContinuumReleaseException( "Failed to build project.", e ); + } + catch ( ArtifactResolutionException e ) { throw new ContinuumReleaseException( "Failed to build project.", e ); } Modified: maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/GenerateReactorProjectsPhase.java URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/GenerateReactorProjectsPhase.java?view=diff&rev=501741&r1=501740&r2=501741 ============================================================================== --- maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/GenerateReactorProjectsPhase.java (original) +++ maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/GenerateReactorProjectsPhase.java Tue Jan 30 22:07:55 2007 @@ -129,12 +129,20 @@ try { - MavenProject reactorProject = projectBuilder.build( pomFile, getLocalRepository(), + MavenProject reactorProject = projectBuilder.buildWithDependencies( pomFile, getLocalRepository(), getProfileManager( getSettings() ) ); reactorProjects.add( reactorProject ); } catch ( ProjectBuildingException e ) + { + throw new ContinuumReleaseException( "Failed to build project.", e ); + } + catch ( ArtifactNotFoundException e ) + { + throw new ContinuumReleaseException( "Failed to build project.", e ); + } + catch ( ArtifactResolutionException e ) { throw new ContinuumReleaseException( "Failed to build project.", e ); }