svn commit: r1672745 - in /maven/release/trunk/maven-release-plugin/src: main/java/org/apache/maven/plugins/release/ test/java/org/apache/maven/plugins/release/

[mf...@apache.org]

Author: mfriedenhagen
Date: Fri Apr 10 20:08:41 2015
New Revision: 1672745

URL: http://svn.apache.org/r1672745
Log:
MRELEASE-901: Goal stage should take parameter localCheckout as well.

Create a unit test for createGoals in StageReleaseMojo and lower visibility of
fields and in PerformReleaseMojo.

Modified:
    maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java
    maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/StageReleaseMojo.java
    maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/StageReleaseMojoTest.java

Modified: maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java?rev=1672745&r1=1672744&r2=1672745&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java (original)
+++ maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java Fri Apr 10 20:08:41 2015
@@ -50,7 +50,7 @@ public class PerformReleaseMojo
      * <code>deploy site-deploy</code>, if the project has a &lt;distributionManagement&gt;/&lt;site&gt; element.
      */
     @Parameter( property = "goals" )
-    protected String goals;
+    String goals;
 
     /**
      * Comma separated profiles to enable on deployment, in addition to active profiles for project execution.
@@ -180,12 +180,12 @@ public class PerformReleaseMojo
     }
 
     /** Just here so it may be overridden by StageReleaseMojo */
-    protected void setDeploymentRepository()
+    void setDeploymentRepository()
     {
     }
 
     /** Just here so it may be overridden by StageReleaseMojo */
-    protected void createGoals()
+    void createGoals()
     {
         if ( goals == null )
         {

Modified: maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/StageReleaseMojo.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/StageReleaseMojo.java?rev=1672745&r1=1672744&r2=1672745&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/StageReleaseMojo.java (original)
+++ maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/StageReleaseMojo.java Fri Apr 10 20:08:41 2015
@@ -56,7 +56,7 @@ public class StageReleaseMojo
     private String stagingRepository;
 
     @Override
-    protected void createGoals()
+    void createGoals()
     {
         if ( goals == null )
         {
@@ -74,7 +74,7 @@ public class StageReleaseMojo
     }
 
     @Override
-    protected void setDeploymentRepository()
+    void setDeploymentRepository()
     {
         addArgument( "-DaltDeploymentRepository=\"" + stagingRepository + "\"" );
     }

Modified: maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/StageReleaseMojoTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/StageReleaseMojoTest.java?rev=1672745&r1=1672744&r2=1672745&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/StageReleaseMojoTest.java (original)
+++ maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/StageReleaseMojoTest.java Fri Apr 10 20:08:41 2015
@@ -40,7 +40,7 @@ import org.apache.maven.shared.release.e
 import org.mockito.ArgumentCaptor;
 
 /**
- * Test release:perform.
+ * Test release:stage.
  *
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  */
@@ -83,6 +83,17 @@ public class StageReleaseMojoTest
         verifyNoMoreInteractions( mock );
     }
 
+    public void testCreateGoals()
+        throws Exception
+    {
+        StageReleaseMojo mojo = getMojoWithProjectSite( "stage.xml" );
+        mojo.createGoals();
+        assertEquals( "deploy site:stage-deploy", mojo.goals );
+        mojo.goals = "deploy site:deploy";
+        mojo.createGoals();
+        assertEquals( "deploy site:stage-deploy", mojo.goals );
+    }
+
     private StageReleaseMojo getMojoWithProjectSite( String fileName )
         throws Exception
     {