svn commit: r1725157 - in /maven/plugins/trunk/maven-site-plugin/src: it/site-skip/skip-site/ main/java/org/apache/maven/plugins/site/ main/java/org/apache/maven/plugins/site/deploy/ main/java/org/apache/maven/plugins/site/render/

[hboutemy]

Author: hboutemy
Date: Mon Jan 18 00:09:28 2016
New Revision: 1725157

URL: http://svn.apache.org/viewvc?rev=1725157&view=rev
Log:
[MSITE-696] automatically skip deploy when maven.site.skip=true, ie site 
generation is skipped

Modified:
    maven/plugins/trunk/maven-site-plugin/src/it/site-skip/skip-site/pom.xml
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java

Modified: 
maven/plugins/trunk/maven-site-plugin/src/it/site-skip/skip-site/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-skip/skip-site/pom.xml?rev=1725157&r1=1725156&r2=1725157&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-skip/skip-site/pom.xml 
(original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-skip/skip-site/pom.xml 
Mon Jan 18 00:09:28 2016
@@ -38,9 +38,8 @@ under the License.
       <plugin>
         <artifactId>maven-site-plugin</artifactId>
         <configuration>
-          <!-- when site is skipped, deploy needs to be skipped too -->
+          <!-- when site is skipped, deploy needs is automatically skipped 
too: MSITE-696 -->
           <skip>true</skip>
-          <skipDeploy>true</skipDeploy>
         </configuration>
       </plugin>
     </plugins>

Modified: 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java?rev=1725157&r1=1725156&r2=1725157&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
 Mon Jan 18 00:09:28 2016
@@ -53,6 +53,14 @@ public abstract class AbstractSiteMojo
     private String locales;
 
     /**
+     * Set this to 'true' to skip site generation and staging.
+     *
+     * @since 3.0
+     */
+    @Parameter( property = "maven.site.skip", defaultValue = "false" )
+    protected boolean skip;
+
+    /**
      * SiteTool.
      */
     @Component

Modified: 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java?rev=1725157&r1=1725156&r2=1725157&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java
 Mon Jan 18 00:09:28 2016
@@ -157,6 +157,12 @@ public abstract class AbstractDeployMojo
     public void execute()
         throws MojoExecutionException
     {
+        if ( skip && isDeploy() )
+        {
+            getLog().info( "maven.site.skip = true: Skipping site deployment" 
);
+            return;
+        }
+
         if ( skipDeploy && isDeploy() )
         {
             getLog().info( "maven.site.deploy.skip = true: Skipping site 
deployment" );

Modified: 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java?rev=1725157&r1=1725156&r2=1725157&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java
 Mon Jan 18 00:09:28 2016
@@ -88,14 +88,6 @@ public class SiteMojo
     private boolean validate;
 
     /**
-     * Set this to 'true' to skip site generation and staging.
-     *
-     * @since 3.0
-     */
-    @Parameter( property = "maven.site.skip", defaultValue = "false" )
-    private boolean skip;
-
-    /**
      * {@inheritDoc}
      *
      * Generate the project site