From commits-return-6557-apmail-continuum-commits-archive=continuum.apache.org@continuum.apache.org Mon Aug 13 01:42:39 2012 Return-Path: X-Original-To: apmail-continuum-commits-archive@www.apache.org Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CD52DD574 for ; Mon, 13 Aug 2012 01:42:39 +0000 (UTC) Received: (qmail 10435 invoked by uid 500); 13 Aug 2012 01:42:39 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 10407 invoked by uid 500); 13 Aug 2012 01:42:39 -0000 Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@continuum.apache.org Delivered-To: mailing list commits@continuum.apache.org Received: (qmail 10400 invoked by uid 99); 13 Aug 2012 01:42:39 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Aug 2012 01:42:39 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Mon, 13 Aug 2012 01:42:38 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 80E02238897F for ; Mon, 13 Aug 2012 01:41:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1372237 - in /continuum/trunk/continuum-release/src: main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java test/java/org/apache/maven/continuum/release/phase/UpdateWorkingCopyPhaseTest.java Date: Mon, 13 Aug 2012 01:41:55 -0000 To: commits@continuum.apache.org From: brett@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120813014155.80E02238897F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: brett Date: Mon Aug 13 01:41:55 2012 New Revision: 1372237 URL: http://svn.apache.org/viewvc?rev=1372237&view=rev Log: [CONTINUUM-2538] (regression) unable to release using provided parameters Pass a dummy project instead of null to the release manager Modified: continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java continuum/trunk/continuum-release/src/test/java/org/apache/maven/continuum/release/phase/UpdateWorkingCopyPhaseTest.java Modified: continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java?rev=1372237&r1=1372236&r2=1372237&view=diff ============================================================================== --- continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java (original) +++ continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java Mon Aug 13 01:41:55 2012 @@ -49,6 +49,7 @@ import org.codehaus.plexus.util.dag.Cycl import java.io.File; import java.util.ArrayList; +import java.util.Collections; import java.util.List; /** @@ -84,16 +85,28 @@ public class PerformReleaseTaskExecutor repository = performTask.getLocalRepository(); - List reactorProjects = null; - MavenProject mavenProject = null; + List reactorProjects; try { - mavenProject = getMavenProject( performTask ); - if ( mavenProject != null ) + if ( !StringUtils.isEmpty( descriptor.getWorkingDirectory() ) ) { + MavenProject mavenProject = getMavenProject( performTask ); reactorProjects = getReactorProjects( descriptor, mavenProject ); } + else + { + //Perform with provided release parameters (CONTINUUM-1541) + descriptor.setCheckoutDirectory( performTask.getBuildDirectory().getAbsolutePath() ); + + // Workaround bugs in maven-release-manager 2.1 that require a project even though it will ultimately + // not be used. TODO: check if upgrading will fix, and return to being an empty list + // The project is fake and won't exist in this location + MavenProject project = new MavenProject(); + project.setFile( new File( descriptor.getCheckoutDirectory(), "pom.xml" ) ); + reactorProjects = Collections.singletonList( project ); +// reactorProjects = Collections.emptyList(); + } } catch ( ContinuumReleaseException e ) { @@ -224,13 +237,6 @@ public class PerformReleaseTaskExecutor { ReleaseDescriptor descriptor = releaseTask.getDescriptor(); - if ( StringUtils.isEmpty( descriptor.getWorkingDirectory() ) ) - { - //Perform with provided release parameters (CONTINUUM-1541) - descriptor.setCheckoutDirectory( releaseTask.getBuildDirectory().getAbsolutePath() ); - return null; - } - MavenProject project; try { Modified: continuum/trunk/continuum-release/src/test/java/org/apache/maven/continuum/release/phase/UpdateWorkingCopyPhaseTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-release/src/test/java/org/apache/maven/continuum/release/phase/UpdateWorkingCopyPhaseTest.java?rev=1372237&r1=1372236&r2=1372237&view=diff ============================================================================== --- continuum/trunk/continuum-release/src/test/java/org/apache/maven/continuum/release/phase/UpdateWorkingCopyPhaseTest.java (original) +++ continuum/trunk/continuum-release/src/test/java/org/apache/maven/continuum/release/phase/UpdateWorkingCopyPhaseTest.java Mon Aug 13 01:41:55 2012 @@ -54,7 +54,7 @@ public class UpdateWorkingCopyPhaseTest File workingDirectory = new File( releaseDescriptor.getWorkingDirectory() ); - // assert no working directory yet + FileUtils.deleteDirectory( workingDirectory ); assertFalse( workingDirectory.exists() ); phase.execute( releaseDescriptor, new Settings(), null );