hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmhs...@apache.org
Subject svn commit: r1522748 - in /hbase/trunk: pom.xml src/main/site/site.xml
Date Fri, 13 Sep 2013 00:04:23 GMT
Author: jmhsieh
Date: Fri Sep 13 00:04:22 2013
New Revision: 1522748

URL: http://svn.apache.org/r1522748
Log:
HBASE-9517 Include only InterfaceAudience.Public elements in generated Javadoc

Modified:
    hbase/trunk/pom.xml
    hbase/trunk/src/main/site/site.xml

Modified: hbase/trunk/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/pom.xml?rev=1522748&r1=1522747&r2=1522748&view=diff
==============================================================================
--- hbase/trunk/pom.xml (original)
+++ hbase/trunk/pom.xml Fri Sep 13 00:04:22 2013
@@ -451,34 +451,6 @@
     <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.
-           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>
-          <executions>
-            <execution>
-              <id>javadoc</id>
-              <goals>
-                <goal>aggregate</goal>
-              </goals>
-            </execution>
-          </executions>
-          <configuration>
-            <!--Pass -DskipJavadoc=true or -DskipJavadoc on command-line to skip javadoc
building-->
-            <skip>${skipJavadoc}</skip>
-            <docfilessubdirs>true</docfilessubdirs>
-            <excludePackageNames>org.junit.*:org.apache.hadoop.metrics2.*:org.apache.hadoop.hbase.protobuf.generated.*:org.apache.hadoop.hbase.thrift.generated:org.apache.hadoop.hbase.rest.generated</excludePackageNames>
-            <debug>true</debug>
-            <maxmemory>2g</maxmemory>
-            <verbose>true</verbose>
-            <reportOutputDirectory>target/apidocs</reportOutputDirectory>
-          </configuration>
-        </plugin>
-        <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-release-plugin</artifactId>
           <version>2.4.1</version>
@@ -1957,6 +1929,39 @@
           </excludes>
         </configuration>
       </plugin>
+
+      <plugin>
+	<groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.9.1</version>
+	<reportSets>
+	  <reportSet>
+	    <id>devapi</id> <!-- full internal hbase api -->
+	    <reports> <report>aggregate</report></reports>
+	    <configuration>
+	      <destDir>devapidocs</destDir>
+	    </configuration>
+	  </reportSet>
+	  
+	  <reportSet>
+	    <id>userapi</id> <!-- public user hbase api; limited but has stronger
compat/deprecation guarantees -->
+	    <reports> <report>aggregate</report></reports>
+	    <configuration>
+	      <doclet>org.apache.hadoop.classification.tools.IncludePublicAnnotationsStandardDoclet</doclet>
+	      <docletArtifact>
+		<groupId>org.apache.hadoop</groupId>
+		<!-- doclet lives in hadoop 2's hadoop-common module -->
+		<artifactId>hadoop-common</artifactId>
+		<version>2.1.0-beta</version>
+	      </docletArtifact>
+	      <destDir>apidocs</destDir>
+	      <name>User API</name>
+	      <description>The HBase Application Programmer's API</description>
+	    </configuration>
+	  </reportSet>
+	</reportSets>	
+      </plugin>
+
     </plugins>
   </reporting>
   <distributionManagement>

Modified: hbase/trunk/src/main/site/site.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/site/site.xml?rev=1522748&r1=1522747&r2=1522748&view=diff
==============================================================================
Binary files - no diff available.



Mime
View raw message