Repository: calcite-avatica Updated Branches: refs/heads/master ac26f81ee -> 5b96a8d20
[CALCITE-2272] Fix Javadoc generation Close apache/calcite-avatica#44 Signed-off-by: Kevin Risden <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/calcite-avatica/repo Commit: http://git-wip-us.apache.org/repos/asf/calcite-avatica/commit/5b96a8d2 Tree: http://git-wip-us.apache.org/repos/asf/calcite-avatica/tree/5b96a8d2 Diff: http://git-wip-us.apache.org/repos/asf/calcite-avatica/diff/5b96a8d2 Branch: refs/heads/master Commit: 5b96a8d2003b87b7d75d322e241104dc8ea79a4d Parents: ac26f81 Author: Kevin Risden <[email protected]> Authored: Sun Apr 29 10:17:40 2018 -0500 Committer: Kevin Risden <[email protected]> Committed: Sun Apr 29 10:39:47 2018 -0500 ---------------------------------------------------------------------- .travis.yml | 2 +- pom.xml | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/5b96a8d2/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 790af97..b7f40a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,7 +45,7 @@ install: script: # Print surefire output to the console instead of files - unset _JAVA_OPTIONS - - $DOCKERRUN $IMAGE mvn -Dsurefire.useFile=false verify + - $DOCKERRUN $IMAGE mvn -Dsurefire.useFile=false verify javadoc:javadoc javadoc:test-javadoc git: depth: 10000 sudo: required http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/5b96a8d2/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 2132ad5..f3dae40 100644 --- a/pom.xml +++ b/pom.xml @@ -59,6 +59,8 @@ limitations under the License. <bouncycastle.version>1.55</bouncycastle.version> <build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version> <checksum-maven-plugin.version>1.2</checksum-maven-plugin.version> + <!-- Needed for JDK 10 javadoc for [LANG-1365] --> + <commons-lang3.version>3.7</commons-lang3.version> <dropwizard-metrics3.version>3.1.2</dropwizard-metrics3.version> <forbiddenapis.version>2.3</forbiddenapis.version> <!-- We support guava versions as old as 14.0.1 (the version used by Hive) @@ -80,7 +82,7 @@ limitations under the License. <maven-checkstyle-plugin.version>2.12.1</maven-checkstyle-plugin.version> <maven-dependency-plugin.version>2.10</maven-dependency-plugin.version> <maven-enforcer-plugin.version>3.0.0-M1</maven-enforcer-plugin.version> - <!-- Apache 19 has 2.10.4, but need 3.0.0 for [LANG-1365]. --> + <!-- Apache 19 has 2.10.4, but need 3.0.0 for [MJAVADOC-524]. --> <maven-javadoc-plugin.version>3.0.0</maven-javadoc-plugin.version> <maven-scm-provider.version>1.9.4</maven-scm-provider.version> <maven-shade-plugin.version>2.1</maven-shade-plugin.version> @@ -401,8 +403,8 @@ limitations under the License. <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>1.7</source> - <target>1.7</target> + <source>1.8</source> + <target>1.8</target> <compilerArgument>-Xlint:deprecation</compilerArgument> </configuration> </plugin> @@ -458,12 +460,19 @@ limitations under the License. under "reporting", and is more lenient. --> <artifactId>maven-javadoc-plugin</artifactId> <configuration> - <additionalOptions>-html5</additionalOptions> + <additionalparam>-html5</additionalparam> <links> <link>https://docs.oracle.com/javase/8/docs/api/</link> </links> <show>private</show> </configuration> + <dependencies> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>${commons-lang3.version}</version> + </dependency> + </dependencies> </plugin> <plugin> <!-- Override apache parent POM's definition of release
