From ca39e39db9d11bc9813e68dc8204033e5e6cbff3 Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Wed, 16 Jan 2013 23:20:04 +0000
Subject: [PATCH] HBASE-7593 [site] Adjustments to suit our new publishing
 process

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1434481 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml                  | 14 ++++++++------
 src/docbkx/developer.xml |  7 +++++--
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 14b5b26f6a7..fc9943d48cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>8</version>
+    <version>12</version>
     <relativePath/>
     <!-- no parent resolution -->
   </parent>
@@ -747,6 +747,7 @@
         </executions>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
         <version>${maven.resources.plugin.version}</version>
         <!--$NO-MVN-MAN-VER$ -->
@@ -886,7 +887,7 @@
     <findbugs-annotations>1.3.9-1</findbugs-annotations>
     <maven.site.version>3.1</maven.site.version>
     <javadoc.version>2.9</javadoc.version>
-    <maven.resources.plugin.version>2.5</maven.resources.plugin.version>
+    <maven.resources.plugin.version>2.6</maven.resources.plugin.version>
     <!-- General Packaging -->
     <package.prefix>/usr</package.prefix>
     <package.conf.dir>/etc/hbase</package.conf.dir>
@@ -1701,9 +1702,10 @@
     </plugins>
   </reporting>
   <distributionManagement>
-    <site>
-      <id>apache.website</id>
-      <url>scp://people.apache.org/www/hbase.apache.org/</url>
-    </site>
+      <site>
+          <id>hbase.apache.org</id>
+          <name>HBase Website at hbase.apache.org</name>
+          <url>file:///tmp</url>
+      </site>
   </distributionManagement>
 </project>
diff --git a/src/docbkx/developer.xml b/src/docbkx/developer.xml
index 44953365248..3c65dc16d75 100644
--- a/src/docbkx/developer.xml
+++ b/src/docbkx/developer.xml
@@ -335,12 +335,15 @@ What is the new development version for "HBase"? (org.apache.hbase:hbase) 0.92.3
       <title>Publishing hbase.apache.org</title>
       <para>As of <link xlink:href="https://issues.apache.org/jira/browse/INFRA-5680">INFRA-5680 Migrate apache hbase website</link>,
           to publish the website, build it, and then deploy it over a checkout of <filename>https://svn.apache.org/repos/asf/hbase/hbase.apache.org/trunk</filename>,
-          and then check it in.  For example, if trunk is checkout out at <filename>/Users/stack/checkouts/hbase</filename>
+          and then check it in.  For example, if trunk is checked out out at <filename>/Users/stack/checkouts/trunk</filename>
           and hbase.apache.org is checked out at <filename>/Users/stack/checkouts/hbase.apache.org/trunk</filename>, to update
           the site, do the following:
           <programlisting>
               # Build the site and deploy it to the checked out directory
-              $ MAVEN_OPTS=" -Xmx3g" mvn site site:stage -DskipTests -DstagingDirectory="/Users/stack/checkouts/hbase.apache.org/trunk"
+              # Getting the javadoc into site is a little tricky.  You have to build it independent, then
+              # 'aggregate' it at top-level so the pre-site site lifecycle step can find it; that is
+              # what the javadoc:javadoc and javadoc:aggregate is about.
+              $ MAVEN_OPTS=" -Xmx3g" mvn clean -DskipTests javadoc:javadoc javadoc:aggregate site  site:stage -DstagingDirectory=/Users/stack/checkouts/hbase.apache.org/trunk
               # Check the deployed site by viewing in a brower.
               # If all is good, commit it and it will show up at http://hbase.apache.org
               #