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 @@
<projectsDirectory>src/it</projectsDirectory>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
<setupIncludes>
- <setupInclude>maven-scm-provider-dummy/pom.xml</setupInclude>
+ <setupInclude>maven-scm-provider-*/pom.xml</setupInclude>
</setupIncludes>
<pomExcludes>
<pomExclude>project/**</pomExclude>
@@ -186,6 +186,7 @@
<settingsFile>src/it/settings.xml</settingsFile>
<debug>true</debug>
<properties>
+ <allowReleasePluginSnapshot>true</allowReleasePluginSnapshot>
<dryRun>true</dryRun>
</properties>
<goals>
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 );
