Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-8186 Untether javadoc and site build 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1460037 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2013-03-22 22:39:42 +00:00
parent 9066302dcd
commit 4817f9df91
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev-support/test-patch.sh
View File

@ -695,9 +695,9 @@ checkSiteXml () {
echo ""
echo ""
echo "$MVN compile site -N -DskipTests -D${PROJECT_NAME}PatchProcess > $PATCH_DIR/patchSiteOutput.txt 2>&1"
echo "$MVN compile site -DskipTests -D${PROJECT_NAME}PatchProcess > $PATCH_DIR/patchSiteOutput.txt 2>&1"
export MAVEN_OPTS="${MAVEN_OPTS}"
$MVN compile site -N -DskipTests -D${PROJECT_NAME}PatchProcess > $PATCH_DIR/patchSiteOutput.txt 2>&1
$MVN compile site -DskipTests -D${PROJECT_NAME}PatchProcess > $PATCH_DIR/patchSiteOutput.txt 2>&1
if [[ $? != 0 ]] ; then
JIRA_COMMENT="$JIRA_COMMENT

9
pom.xml
View File

@ -418,6 +418,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>
@ -427,7 +435,6 @@
<goals>
<goal>aggregate</goal>
</goals>
<phase>pre-site</phase>
</execution>
</executions>
<configuration>

4
src/docbkx/developer.xml
View File

@ -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 "HBase"? (org.apache.hbase:hbase) 0.92.3
# 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
#