maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ltheu...@apache.org
Subject svn commit: r1145949 - in /maven/plugins/branches/maven-site-plugin-3.x: ./ src/it/site-skip/ src/it/site-skip/site/ src/it/site-skip/skip-site-deploy/ src/it/site-skip/skip-site/ src/main/java/org/apache/maven/plugins/site/
Date Wed, 13 Jul 2011 10:26:49 GMT
Author: ltheussl
Date: Wed Jul 13 10:26:49 2011
New Revision: 1145949

URL: http://svn.apache.org/viewvc?rev=1145949&view=rev
Log:
[MSITE-367] [MSITE-541] add skip and skipDeploy options. Merge r1145947 from trunk.

Added:
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-skip/
      - copied from r1145947, maven/plugins/trunk/maven-site-plugin/src/it/site-skip/
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-skip/invoker.properties
      - copied unchanged from r1145947, maven/plugins/trunk/maven-site-plugin/src/it/site-skip/invoker.properties
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-skip/pom.xml
      - copied unchanged from r1145947, maven/plugins/trunk/maven-site-plugin/src/it/site-skip/pom.xml
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-skip/site/
      - copied from r1145947, maven/plugins/trunk/maven-site-plugin/src/it/site-skip/site/
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-skip/site/pom.xml
      - copied unchanged from r1145947, maven/plugins/trunk/maven-site-plugin/src/it/site-skip/site/pom.xml
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-skip/skip-site/
      - copied from r1145947, maven/plugins/trunk/maven-site-plugin/src/it/site-skip/skip-site/
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-skip/skip-site-deploy/
      - copied from r1145947, maven/plugins/trunk/maven-site-plugin/src/it/site-skip/skip-site-deploy/
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-skip/skip-site-deploy/pom.xml
      - copied unchanged from r1145947, maven/plugins/trunk/maven-site-plugin/src/it/site-skip/skip-site-deploy/pom.xml
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-skip/skip-site/pom.xml
      - copied unchanged from r1145947, maven/plugins/trunk/maven-site-plugin/src/it/site-skip/skip-site/pom.xml
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-skip/verify.bsh
      - copied unchanged from r1145947, maven/plugins/trunk/maven-site-plugin/src/it/site-skip/verify.bsh
Modified:
    maven/plugins/branches/maven-site-plugin-3.x/   (props changed)
    maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
    maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteMojo.java

Propchange: maven/plugins/branches/maven-site-plugin-3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 13 10:26:49 2011
@@ -1 +1 @@
-/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1039748-1039749,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038,1067103,1067120,1070079-1070080,1070100,1070104,1074118,1075018,1075782,1075810,1075995,1076167,1076195,1077911,1077924,1078235,1079474,1079529,1079698,1080781,1081676,1081837,1081887,1082091,1082242,1082274,1082877,1083147,1083251,1083473,1084564,1086313,1086338-1086339,1086533,1087455,1088584,1089802,1089852,1091331,1098168,1098170,1099591,1126420,1126918-1126945,1132936,1145546,1145555
+/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1039748-1039749,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038,1067103,1067120,1070079-1070080,1070100,1070104,1074118,1075018,1075782,1075810,1075995,1076167,1076195,1077911,1077924,1078235,1079474,1079529,1079698,1080781,1081676,1081837,1081887,1082091,1082242,1082274,1082877,1083147,1083251,1083473,1084564,1086313,1086338-1086339,1086533,1087455,1088584,1089802,1089852,1091331,1098168,1098170,1099591,1126420,1126918-1126945,1132936,1145546,1145555,1145947

Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java?rev=1145949&r1=1145948&r2=1145949&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
(original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
Wed Jul 13 10:26:49 2011
@@ -115,6 +115,14 @@ public abstract class AbstractDeployMojo
     private String chmodOptions;
 
     /**
+     * Set this to 'true' to skip site deployment.
+     *
+     * @parameter expression="${maven.site.deploy.skip}" default-value="false"
+     * @since 3.0
+     */
+    private boolean skipDeploy;
+
+    /**
      * @component
      */
     private WagonManager wagonManager;
@@ -147,6 +155,12 @@ public abstract class AbstractDeployMojo
     public void execute()
         throws MojoExecutionException
     {
+        if ( skipDeploy )
+        {
+            getLog().info( "maven.site.deploy.skip = true: Skipping site deployment" );
+            return;
+        }
+
         deployTo( new org.apache.maven.plugins.site.wagon.repository.Repository(
             getDeployRepositoryID(),
             appendSlash( getDeployRepositoryURL() ) ) );
@@ -522,7 +536,7 @@ public abstract class AbstractDeployMojo
 
     /**
      * Get proxy information for Maven 3.
-     * 
+     *
      * @param repository
      * @param log
      * @param mavenSession

Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteMojo.java?rev=1145949&r1=1145948&r2=1145949&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
(original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
Wed Jul 13 10:26:49 2011
@@ -85,6 +85,14 @@ public class SiteMojo
     private boolean validate;
 
     /**
+     * Set this to 'true' to skip site generation.
+     *
+     * @parameter expression="${maven.site.skip}" default-value="false"
+     * @since 3.0
+     */
+    private boolean skip;
+
+    /**
      * {@inheritDoc}
      *
      * Generate the project site
@@ -96,6 +104,12 @@ public class SiteMojo
     public void execute()
         throws MojoExecutionException, MojoFailureException
     {
+        if ( skip )
+        {
+            getLog().info( "maven.site.skip = true: Skipping site generation" );
+            return;
+        }
+
         if ( getLog().isDebugEnabled() )
         {
             getLog().debug( "executing Site Mojo" );



Mime
View raw message