Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 15054 invoked from network); 17 Jan 2009 20:43:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 17 Jan 2009 20:43:00 -0000 Received: (qmail 42036 invoked by uid 500); 17 Jan 2009 20:43:00 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 41965 invoked by uid 500); 17 Jan 2009 20:42:59 -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 41954 invoked by uid 99); 17 Jan 2009 20:42:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 17 Jan 2009 12:42:59 -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; Sat, 17 Jan 2009 20:42:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 035A32388986; Sat, 17 Jan 2009 12:42:36 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r735331 - in /maven/release/trunk: maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ maven-release-plugin/ maven-release-plugin/src/main/ja... Date: Sat, 17 Jan 2009 20:42:35 -0000 To: commits@maven.apache.org From: bentmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090117204236.035A32388986@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bentmann Date: Sat Jan 17 12:42:35 2009 New Revision: 735331 URL: http://svn.apache.org/viewvc?rev=735331&view=rev Log: o Added internal plugin parameter to ignore snapshot version of maven-release-plugin in batch mode (allowing proper integration testing of the plugin itself) Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java maven/release/trunk/maven-release-plugin/pom.xml maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java?rev=735331&r1=735330&r2=735331&view=diff ============================================================================== --- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java (original) +++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java Sat Jan 17 12:42:35 2009 @@ -83,6 +83,7 @@ mergeInto.setUpdateWorkingCopyVersions( toBeMerged.isUpdateWorkingCopyVersions() ); mergeInto.setUpdateVersionsToSnapshot( toBeMerged.isUpdateVersionsToSnapshot() ); mergeInto.setAllowTimestampedSnapshots( toBeMerged.isAllowTimestampedSnapshots() ); + mergeInto.setSnapshotReleasePluginAllowed( toBeMerged.isSnapshotReleasePluginAllowed() ); mergeInto.setAutoVersionSubmodules( toBeMerged.isAutoVersionSubmodules() ); mergeInto.setDefaultReleaseVersion( mergeOverride( mergeInto.getDefaultReleaseVersion(), toBeMerged.getDefaultReleaseVersion() ) ); Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java?rev=735331&r1=735330&r2=735331&view=diff ============================================================================== --- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java (original) +++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java Sat Jan 17 12:42:35 2009 @@ -190,6 +190,10 @@ throw new ReleaseExecutionException( e.getMessage(), e ); } } + else if ( releaseDescriptor.isSnapshotReleasePluginAllowed() ) + { + addToFailures = false; + } } if ( addToFailures ) Modified: maven/release/trunk/maven-release-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/pom.xml?rev=735331&r1=735330&r2=735331&view=diff ============================================================================== --- maven/release/trunk/maven-release-plugin/pom.xml (original) +++ maven/release/trunk/maven-release-plugin/pom.xml Sat Jan 17 12:42:35 2009 @@ -176,7 +176,7 @@ src/it ${project.build.directory}/it - maven-scm-provider-dummy/pom.xml + maven-scm-provider-*/pom.xml project/** @@ -186,6 +186,7 @@ src/it/settings.xml true + true true Modified: maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java?rev=735331&r1=735330&r2=735331&view=diff ============================================================================== --- maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java (original) +++ maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java Sat Jan 17 12:42:35 2009 @@ -118,6 +118,15 @@ private boolean allowTimestampedSnapshots; /** + * Whether to allow usage of a SNAPSHOT version of the Release Plugin. This in an internal property used to support + * testing of the plugin itself in batch mode. + * + * @parameter expression="${allowReleasePluginSnapshot}" default-value="false" + * @readonly + */ + private boolean allowReleasePluginSnapshot; + + /** * Default version to use when preparing a release or a branch. * * @parameter expression="${releaseVersion}" @@ -148,6 +157,7 @@ config.setUpdateDependencies( updateDependencies ); config.setAutoVersionSubmodules( autoVersionSubmodules ); config.setAllowTimestampedSnapshots( allowTimestampedSnapshots ); + config.setSnapshotReleasePluginAllowed( allowReleasePluginSnapshot ); config.setDefaultReleaseVersion( releaseVersion ); config.setDefaultDevelopmentVersion( developmentVersion );