You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2013/03/22 23:41:20 UTC
svn commit: r1460038 - in /hbase/branches/0.95: pom.xml
src/docbkx/developer.xml
Author: stack
Date: Fri Mar 22 22:41:19 2013
New Revision: 1460038
URL: http://svn.apache.org/r1460038
Log:
HBASE-8186 Untether javadoc and site build
Modified:
hbase/branches/0.95/pom.xml
hbase/branches/0.95/src/docbkx/developer.xml
Modified: hbase/branches/0.95/pom.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/pom.xml?rev=1460038&r1=1460037&r2=1460038&view=diff
==============================================================================
--- hbase/branches/0.95/pom.xml (original)
+++ hbase/branches/0.95/pom.xml Fri Mar 22 22:41:19 2013
@@ -408,6 +408,14 @@
<pluginManagement>
<plugins>
<plugin>
+ <!--Intentionally, this is not bound to a phase because it is an
+ 'aggregating' plugin; it expects to be run from the top-level only; see
+ http://www.sonatype.com/books/mvnref-book/reference/assemblies-sect-basics.html.
+ When it was bound to pre-site, we were descending into modules expecting
+ dependencies like hbase-*.jar to be already built. It was messing us up,
+ particular on clean checkouts. To get javadoc into your site, you must
+ precede site build by invocation of javadoc:aggregate expplicitly.
+ -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${javadoc.version}</version>
@@ -417,7 +425,6 @@
<goals>
<goal>aggregate</goal>
</goals>
- <phase>pre-site</phase>
</execution>
</executions>
<configuration>
Modified: hbase/branches/0.95/src/docbkx/developer.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/src/docbkx/developer.xml?rev=1460038&r1=1460037&r2=1460038&view=diff
==============================================================================
--- hbase/branches/0.95/src/docbkx/developer.xml (original)
+++ hbase/branches/0.95/src/docbkx/developer.xml Fri Mar 22 22:41:19 2013
@@ -164,7 +164,7 @@ mvn clean package -DskipTests
<title>Building the HBase tarball</title>
<para>Do the following to build the HBase tarball.
Passing the -Prelease will generate javadoc and run the RAT plugin to verify licenses on source.
- <programlisting>% MAVEN_OPTS="-Xmx2g" mvn clean site install assembly:assembly -DskipTests -Prelease</programlisting>
+ <programlisting>% MAVEN_OPTS="-Xmx2g" mvn clean install javadoc:aggregate site assembly:assembly -DskipTests -Prelease</programlisting>
</para>
</section>
@@ -343,7 +343,7 @@ What is the new development version for
# 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
+ $ MAVEN_OPTS=" -Xmx3g" mvn clean -DskipTests 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
#