From commits-return-9262-archive-asf-public=cust-asf.ponee.io@hudi.apache.org Wed Jan 8 18:38:20 2020 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 6213B180607 for ; Wed, 8 Jan 2020 19:38:20 +0100 (CET) Received: (qmail 20468 invoked by uid 500); 8 Jan 2020 18:38:19 -0000 Mailing-List: contact commits-help@hudi.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hudi.apache.org Delivered-To: mailing list commits@hudi.apache.org Received: (qmail 20459 invoked by uid 99); 8 Jan 2020 18:38:19 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Jan 2020 18:38:19 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 99ACA8D80D; Wed, 8 Jan 2020 18:38:19 +0000 (UTC) Date: Wed, 08 Jan 2020 18:38:19 +0000 To: "commits@hudi.apache.org" Subject: [incubator-hudi] branch master updated: [HUDI-319] Add a new maven profile to generate unified Javadoc for all Java and Scala classes (#1195) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <157850869950.32298.8993677376414162064@gitbox.apache.org> From: vinoth@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: incubator-hudi X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: aba83876e7c20e8c2402c74c2465ef3ebc93ef85 X-Git-Newrev: 480fc7869d4d69e1219bf278fd9a37f27ac260f6 X-Git-Rev: 480fc7869d4d69e1219bf278fd9a37f27ac260f6 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. vinoth pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-hudi.git The following commit(s) were added to refs/heads/master by this push: new 480fc78 [HUDI-319] Add a new maven profile to generate unified Javadoc for all Java and Scala classes (#1195) 480fc78 is described below commit 480fc7869d4d69e1219bf278fd9a37f27ac260f6 Author: Y Ethan Guo AuthorDate: Wed Jan 8 10:38:10 2020 -0800 [HUDI-319] Add a new maven profile to generate unified Javadoc for all Java and Scala classes (#1195) * Add javadoc build command in README, links to javadoc plugin and rename profile. * Make java version configurable in one place. --- README.md | 6 ++ .../org/apache/hudi/IncrementalRelation.scala | 2 +- pom.xml | 118 ++++++++++++++++++++- 3 files changed, 121 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 179a671..9284bbb 100644 --- a/README.md +++ b/README.md @@ -57,6 +57,12 @@ git clone https://github.com/apache/incubator-hudi.git && cd incubator-hudi mvn clean package -DskipTests -DskipITs ``` +To build the Javadoc for all Java and Scala classes: +``` +# Javadoc generated under target/site/apidocs +mvn clean javadoc:aggregate -Pjavadocs +``` + ## Quickstart Please visit [https://hudi.apache.org/quickstart.html](https://hudi.apache.org/quickstart.html) to quickly explore Hudi's capabilities using spark-shell. diff --git a/hudi-spark/src/main/scala/org/apache/hudi/IncrementalRelation.scala b/hudi-spark/src/main/scala/org/apache/hudi/IncrementalRelation.scala index 394f3cb..f70655b 100644 --- a/hudi-spark/src/main/scala/org/apache/hudi/IncrementalRelation.scala +++ b/hudi-spark/src/main/scala/org/apache/hudi/IncrementalRelation.scala @@ -53,7 +53,7 @@ class IncrementalRelation(val sqlContext: SQLContext, throw new HoodieException("Incremental view not implemented yet, for merge-on-read tables") } // TODO : Figure out a valid HoodieWriteConfig - val hoodieTable = HoodieTable.getHoodieTable(metaClient, HoodieWriteConfig.newBuilder().withPath(basePath).build(), + private val hoodieTable = HoodieTable.getHoodieTable(metaClient, HoodieWriteConfig.newBuilder().withPath(basePath).build(), sqlContext.sparkContext) val commitTimeline = hoodieTable.getMetaClient.getCommitTimeline.filterCompletedInstants() if (commitTimeline.empty()) { diff --git a/pom.xml b/pom.xml index 36401fa..f3f51c2 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,10 @@ 2.6 2.19.1 3.1.1 + 3.1.1 + 0.15 + 1.8 2.6.7 2.17 1.8.1 @@ -208,8 +211,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.8 - 1.8 + ${java.version} + ${java.version} @@ -890,7 +893,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.9.1 + ${maven-javadoc-plugin.version} attach-javadocs @@ -900,7 +903,7 @@ - -Xdoclint:none + none @@ -938,6 +941,113 @@ org.apache.hudi. + + javadocs + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${java.version} + ${java.version} + + + + net.alchim31.maven + scala-maven-plugin + ${scala-maven-plugin.version} + + + doc + generate-sources + + compile + + + + ${project.basedir}/src/main/scala + + + + + + + -P:genjavadoc:out=${project.build.directory}/genjavadoc + + + + com.typesafe.genjavadoc + genjavadoc-plugin_${scala.version} + ${genjavadoc-plugin.version} + + + + **/*.scala + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + generate-sources + + add-source + + + + ${project.build.directory}/genjavadoc + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-javadoc-plugin.version} + + + aggregate + + aggregate + + + + + + none + true + + https://avro.apache.org/docs/${avro.version}/api/java + https://docs.spring.io/spring-shell/docs/1.2.0.RELEASE + https://fasterxml.github.io/jackson-databind/javadoc/2.6 + https://hadoop.apache.org/docs/r${hadoop.version}/api + https://hbase.apache.org/1.2/apidocs + https://hive.apache.org/javadocs/r2.3.6/api + https://javadoc.io/static/io.javalin/javalin/2.3.0 + https://javadoc.io/doc/org.apache.parquet/parquet-avro/${parquet.version} + https://javadoc.io/static/org.apache.parquet/parquet-hadoop/${parquet.version} + https://logging.apache.org/log4j/1.2/apidocs + https://metrics.dropwizard.io/4.1.0/apidocs + https://spark.apache.org/docs/${spark.version}/api/java + + + + **/*$.java + + + + + +