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

svn commit: r1417567 - /maven/plugins/trunk/maven-scm-publish-plugin/src/site/apt/examples/one-module-configuration.apt.vm

Author: hboutemy
Date: Wed Dec  5 18:26:25 2012
New Revision: 1417567

URL: http://svn.apache.org/viewvc?rev=1417567&view=rev
Log:
simplified mono-module configuration and added comments

Modified:
    maven/plugins/trunk/maven-scm-publish-plugin/src/site/apt/examples/one-module-configuration.apt.vm

Modified: maven/plugins/trunk/maven-scm-publish-plugin/src/site/apt/examples/one-module-configuration.apt.vm
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-scm-publish-plugin/src/site/apt/examples/one-module-configuration.apt.vm?rev=1417567&r1=1417566&r2=1417567&view=diff
==============================================================================
--- maven/plugins/trunk/maven-scm-publish-plugin/src/site/apt/examples/one-module-configuration.apt.vm (original)
+++ maven/plugins/trunk/maven-scm-publish-plugin/src/site/apt/examples/one-module-configuration.apt.vm Wed Dec  5 18:26:25 2012
@@ -2,8 +2,9 @@
  Maven Mono Module Configuration
  ------
  Olivier Lamy
+ Hervé Boutemy
  ------
- 2012-09-04
+ 2012-12-05
  ------
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -33,45 +34,31 @@ Maven Mono Module Configuration
   With this configuration you can simply run: <<<mvn site-deploy>>>
 
 +-----------------------
-
     <plugin>
       <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-scm-publish-plugin</artifactId>
-      <version>${project.version}</version>
+      <artifactId>maven-site-plugin</artifactId>
       <configuration>
-        <checkinComment>You can configure your checkin message</checkinComment>
+        <skipDeploy>true</skipDeploy><!-- don't deploy with maven-site-plugin -->
       </configuration>
-      <executions>
-        <execution>
-          <id>scm-publish</id>
-          <phase>site-deploy</phase>
-          <goals>
-            <goal>publish-scm</goal>
-          </goals>
-        </execution>
-      </executions>
     </plugin>
     <plugin>
       <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-site-plugin</artifactId>
-      <version>3.1</version>
+      <artifactId>maven-scm-publish-plugin</artifactId>
+      <version>${project.version}</version>
       <configuration>
-        <skipDeploy>true</skipDeploy>
+        <checkinComment>You can configure your checkin message</checkinComment>
+        <content>${project.build.directory}/site</content>
       </configuration>
       <executions>
         <execution>
-          <id>stage-for-scm-publish</id>
-          <phase>post-site</phase>
+          <id>scm-publish</id>
+          <phase>site-deploy</phase><!-- deploy with maven-scm-publish-plugin -->
           <goals>
-            <goal>stage</goal>
+            <goal>publish-scm</goal>
           </goals>
-          <configuration>
-            <skipDeploy>false</skipDeploy>
-          </configuration>
         </execution>
       </executions>
     </plugin>
-
 +-----------------------