You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2012/05/02 21:52:19 UTC

svn commit: r1333174 - in /maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release: AbstractReleaseMojo.java PrepareReleaseMojo.java UpdateVersionsMojo.java

Author: rfscholte
Date: Wed May  2 19:52:18 2012
New Revision: 1333174

URL: http://svn.apache.org/viewvc?rev=1333174&view=rev
Log:
Adjust usage default-value and expression
Remove MavenSession when it's already inherited from superclass

Modified:
    maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.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/AbstractReleaseMojo.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java?rev=1333174&r1=1333173&r2=1333174&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java (original)
+++ maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java Wed May  2 19:52:18 2012
@@ -93,21 +93,21 @@ public abstract class AbstractReleaseMoj
     private String tagBase;
 
     /**
-     * @parameter expression="${basedir}"
+     * @parameter default-value="${basedir}"
      * @required
      * @readonly
      */
     private File basedir;
 
     /**
-     * @parameter expression="${settings}"
+     * @parameter default-value="${settings}"
      * @required
      * @readonly
      */
     private Settings settings;
 
     /**
-     * @parameter expression="${project}"
+     * @parameter default-value="${project}"
      * @required
      * @readonly
      */
@@ -141,7 +141,7 @@ public abstract class AbstractReleaseMoj
     private String scmCommentPrefix;
 
     /**
-     * @parameter expression="${reactorProjects}"
+     * @parameter default-value="${reactorProjects}"
      * @required
      * @readonly
      */
@@ -217,7 +217,7 @@ public abstract class AbstractReleaseMoj
     private ScmManager scmManager;
 
     /**
-     * @parameter expression="${session}"
+     * @parameter default-value="${session}"
      * @readonly
      * @required
      * @since 2.0

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=1333174&r1=1333173&r2=1333174&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 Wed May  2 19:52:18 2012
@@ -19,7 +19,6 @@ package org.apache.maven.plugins.release
  * under the License.
  */
 
-import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.shared.release.ReleaseExecutionException;
@@ -234,14 +233,6 @@ public class PrepareReleaseMojo
     private int waitBeforeTagging;
 
     /**
-     * @parameter expression="${session}"
-     * @readonly
-     * @required
-     * @since 2.0
-     */
-    protected MavenSession session;
-
-    /**
      * {@inheritDoc}
      */
     public void execute()

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=1333174&r1=1333173&r2=1333174&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 Wed May  2 19:52:18 2012
@@ -73,14 +73,6 @@ public class UpdateVersionsMojo
     private String developmentVersion;
 
     /**
-     * @parameter expression="${session}"
-     * @readonly
-     * @required
-     * @since 2.0
-     */
-    protected MavenSession session;
-
-    /**
      * {@inheritDoc}
      */
     public void execute()