You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2010/01/09 11:45:46 UTC
svn commit: r897414 - in
/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release:
BranchReleaseMojo.java PrepareReleaseMojo.java UpdateVersionsMojo.java
Author: dennisl
Date: Sat Jan 9 10:45:46 2010
New Revision: 897414
URL: http://svn.apache.org/viewvc?rev=897414&view=rev
Log:
o 2.0-beta-10 has been renamed to 2.0
Modified:
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/UpdateVersionsMojo.java
Modified: maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java?rev=897414&r1=897413&r2=897414&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java (original)
+++ maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java Sat Jan 9 10:45:46 2010
@@ -43,17 +43,17 @@
* @required
*/
private String branchName;
-
+
/**
* The branch base directory in SVN, you must define it if you don't use the standard svn layout (trunk/tags/branches).
* For example, <code>http://svn.apache.org/repos/asf/maven/plugins/branches</code>. The URL is an SVN URL and does not
* include the SCM provider and protocol.
*
* @parameter expression="${branchBase}"
- * @since 2.0-beta-10
+ * @since 2.0
*/
private String branchBase;
-
+
/**
* Whether to update versions in the branch.
*
@@ -113,30 +113,30 @@
* @parameter expression="${addSchema}" default-value="true"
*/
private boolean addSchema;
-
+
/**
- * currently only implemented with svn scm. Enable a workaround to prevent issue
+ * currently only implemented with svn scm. Enable a workaround to prevent issue
* due to svn client > 1.5.0 (http://jira.codehaus.org/browse/SCM-406)
- *
- *
+ *
+ *
* @parameter expression="${remoteTagging}" default-value="true"
- * @since 2.0-beta-10
- */
- private boolean remoteTagging;
+ * @since 2.0
+ */
+ private boolean remoteTagging;
/**
* Default version to use when preparing a release or a branch.
- *
+ *
* @parameter expression="${releaseVersion}"
- * @since 2.0-beta-10
+ * @since 2.0
*/
private String releaseVersion;
/**
* Default version to use for new local working copy.
- *
+ *
* @parameter expression="${developmentVersion}"
- * @since 2.0-beta-10
+ * @since 2.0
*/
private String developmentVersion;
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=897414&r1=897413&r2=897414&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 9 10:45:46 2010
@@ -46,28 +46,28 @@
/**
* Resume a previous release attempt from the point where it was stopped.
- *
+ *
* @parameter expression="${resume}" default-value="true"
*/
private boolean resume;
/**
* Whether to generate <code>release-pom.xml</code> files that contain resolved information about the project.
- *
+ *
* @parameter default-value="false" expression="${generateReleasePoms}"
*/
private boolean generateReleasePoms;
/**
* Whether to use "edit" mode on the SCM, to lock the file for editing during SCM operations.
- *
+ *
* @parameter expression="${useEditMode}" default-value="false"
*/
private boolean useEditMode;
/**
* Whether to update dependencies version to the next development version.
- *
+ *
* @parameter expression="${updateDependencies}" default-value="true"
*/
private boolean updateDependencies;
@@ -75,7 +75,7 @@
/**
* Whether to automatically assign submodules the parent version. If set to false, the user will be prompted for the
* version of each submodules.
- *
+ *
* @parameter expression="${autoVersionSubmodules}" default-value="false"
*/
private boolean autoVersionSubmodules;
@@ -85,35 +85,35 @@
* <code>mvn -DdryRun=true release:prepare</code> is useful in order to check that modifications to poms and scm
* operations (only listed on the console) are working as expected. Modified POMs are written alongside the
* originals without modifying them.
- *
+ *
* @parameter expression="${dryRun}" default-value="false"
*/
private boolean dryRun;
/**
* Whether to add a schema to the POM if it was previously missing on release.
- *
+ *
* @parameter expression="${addSchema}" default-value="true"
*/
private boolean addSchema;
/**
* Goals to run as part of the preparation step, after transformation but before committing. Space delimited.
- *
+ *
* @parameter expression="${preparationGoals}" default-value="clean verify"
*/
private String preparationGoals;
/**
* Commits to do are atomic or by project.
- *
+ *
* @parameter expression="${commitByProject}" default-value="false"
*/
private boolean commitByProject;
/**
* Whether to allow timestamped SNAPSHOT dependencies. Default is to fail when finding any SNAPSHOT.
- *
+ *
* @parameter expression="${ignoreSnapshots}" default-value="false"
*/
private boolean allowTimestampedSnapshots;
@@ -121,7 +121,7 @@
/**
* 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
*/
@@ -129,36 +129,36 @@
/**
* Default version to use when preparing a release or a branch.
- *
+ *
* @parameter expression="${releaseVersion}"
*/
private String releaseVersion;
/**
* Default version to use for new local working copy.
- *
+ *
* @parameter expression="${developmentVersion}"
*/
private String developmentVersion;
-
+
/**
- * currently only implemented with svn scm. Enable a workaround to prevent issue
+ * currently only implemented with svn scm. Enable a workaround to prevent issue
* due to svn client > 1.5.0 (http://jira.codehaus.org/browse/SCM-406)
- *
- *
+ *
+ *
* @parameter expression="${remoteTagging}" default-value="true"
* @since 2.0-beta-9
- */
+ */
private boolean remoteTagging;
-
+
/**
* @parameter expression="${session}"
* @readonly
* @required
- * @since 2.0-beta-10
+ * @since 2.0
*/
- protected MavenSession session;
-
+ protected MavenSession session;
+
/**
* {@inheritDoc}
*/
@@ -203,7 +203,7 @@
/**
* This method takes some of the release configuration picked up from the command line system properties and copies
* it into the release config object.
- *
+ *
* @param config The release configuration to merge the system properties into, must not be <code>null</code>.
* @param sysPropertiesConfig The configuration from the system properties to merge in, must not be
* <code>null</code>.
Modified: maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/UpdateVersionsMojo.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/UpdateVersionsMojo.java?rev=897414&r1=897413&r2=897414&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/UpdateVersionsMojo.java (original)
+++ maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/UpdateVersionsMojo.java Sat Jan 9 10:45:46 2010
@@ -46,33 +46,33 @@
/**
* Whether to automatically assign submodules the parent version. If set to false, the user will be prompted for the
* version of each submodules.
- *
+ *
* @parameter expression="${autoVersionSubmodules}" default-value="false"
*/
private boolean autoVersionSubmodules;
/**
* Whether to add a schema to the POM if it was previously missing on release.
- *
+ *
* @parameter expression="${addSchema}" default-value="true"
*/
private boolean addSchema;
/**
* Default version to use for new local working copy.
- *
+ *
* @parameter expression="${developmentVersion}"
*/
private String developmentVersion;
-
+
/**
* @parameter expression="${session}"
* @readonly
* @required
- * @since 2.0-beta-10
+ * @since 2.0
*/
- protected MavenSession session;
-
+ protected MavenSession session;
+
/**
* {@inheritDoc}
*/
@@ -80,7 +80,7 @@
throws MojoExecutionException, MojoFailureException
{
super.execute();
-
+
ReleaseDescriptor config = createReleaseDescriptor();
config.setAddSchema( addSchema );
config.setAutoVersionSubmodules( autoVersionSubmodules );
@@ -112,7 +112,7 @@
/**
* This method takes some of the release configuration picked up from the command line system properties and copies
* it into the release config object.
- *
+ *
* @param config The release configuration to merge the system properties into, must not be <code>null</code>.
* @param sysPropertiesConfig The configuration from the system properties to merge in, must not be
* <code>null</code>.