svn commit: r1421796 - in /maven/plugins/trunk/maven-plugins: pom.xml site-pom.xml

[hb...@apache.org]

Author: hboutemy
Date: Fri Dec 14 10:51:02 2012
New Revision: 1421796

URL: http://svn.apache.org/viewvc?rev=1421796&view=rev
Log:
prepared site deployment with svnpubsub for every Maven plugin

Modified:
    maven/plugins/trunk/maven-plugins/pom.xml
    maven/plugins/trunk/maven-plugins/site-pom.xml

Modified: maven/plugins/trunk/maven-plugins/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-plugins/pom.xml?rev=1421796&r1=1421795&r2=1421796&view=diff
==============================================================================
--- maven/plugins/trunk/maven-plugins/pom.xml (original)
+++ maven/plugins/trunk/maven-plugins/pom.xml Fri Dec 14 10:51:02 2012
@@ -54,7 +54,7 @@ under the License.
   </distributionManagement>
 
   <properties>
-    <maven.site.cache>${user.home}/maven-sites</maven.site.cache>
+    <maven.site.cache>${user.home}/maven-sites</maven.site.cache><!-- TODO remove when upgrading parent to 23 -->
     <maven.site.path>plugins-archives/${project.artifactId}-${project.version}</maven.site.path>
   </properties>
 
@@ -116,7 +116,7 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
-          <version>3.2</version>
+          <version>3.2</version><!-- TODO remove when upgrading parent to 23 -->
           <configuration>
             <skipDeploy>true</skipDeploy><!-- don't deploy site with maven-site-plugin -->
           </configuration>
@@ -127,9 +127,8 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-scm-publish-plugin</artifactId>
-        <version>1.0-beta-2</version>
         <configuration>
-          <content>${project.build.directory}/site</content>
+          <content>${project.reporting.outputDirectory}</content>
           <scmPubUrl>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path}</scmPubUrl>
           <checkoutDirectory>${maven.site.cache}/${maven.site.path}</checkoutDirectory>
           <tryUpdate>true</tryUpdate>

Modified: maven/plugins/trunk/maven-plugins/site-pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-plugins/site-pom.xml?rev=1421796&r1=1421795&r2=1421796&view=diff
==============================================================================
--- maven/plugins/trunk/maven-plugins/site-pom.xml (original)
+++ maven/plugins/trunk/maven-plugins/site-pom.xml Fri Dec 14 10:51:02 2012
@@ -52,19 +52,52 @@ under the License.
   <distributionManagement>
     <site>
       <id>apache.website</id>
-      <url>scp://people.apache.org/www/maven.apache.org/pom/maven-plugins/</url>
+      <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path}</url>
     </site>
   </distributionManagement>
 
+  <properties>
+    <maven.site.path>pom-archives/maven-plugins-${project.version}</maven.site.path>
+  </properties>
+
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
         <configuration>
           <siteDirectory>${basedir}/src/site-docs</siteDirectory>
-          <stagingSiteURL>scp://people.apache.org/www/maven.apache.org/pom/maven-plugins-${project.version}/</stagingSiteURL>
+          <skipDeploy>true</skipDeploy><!-- don't deploy site with maven-site-plugin -->
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-scm-publish-plugin</artifactId>
+        <version>1.0-beta-2</version>
+        <configuration>
+          <content>${project.reporting.outputDirectory}</content>
+          <checkoutDirectory>${maven.site.cache}/${maven.site.path}</checkoutDirectory>
+          <tryUpdate>true</tryUpdate>
         </configuration>
+        <executions>
+          <execution>
+            <id>scm-publish</id>
+            <phase>site-deploy</phase><!-- deploy site with maven-scm-publish-plugin -->
+            <goals>
+              <goal>publish-scm</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>
+
+  <profiles>
+    <profile>
+      <id>site-release</id>
+      <properties>
+        <maven.site.path>pom/maven-plugins</maven.site.path>
+      </properties>
+    </profile>
+  </profiles>
 </project>