From 1aad8aa39c1f2cc6d54d27522ca09199cefd8988 Mon Sep 17 00:00:00 2001 From: chaokunyang Date: Mon, 14 Sep 2020 17:44:45 +0800 Subject: [PATCH] [Java] Fix java doc building error (#10757) --- .travis.yml | 19 +++++++++++++++---- .../io/ray/api/call/BaseActorCreator.java | 2 +- .../ray/api/options/ActorCreationOptions.java | 2 +- java/build-jar-multiplatform.sh | 11 +++++++++++ java/pom.xml | 2 +- java/test.sh | 1 + streaming/java/pom.xml | 2 +- 7 files changed, 31 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index cde858639..698efbff7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -122,9 +122,11 @@ matrix: - os: linux env: - - JDK='Oracle JDK 8' + - JAVA_TESTS=1 - PYTHON=3.6 PYTHONWARNINGS=ignore - RAY_INSTALL_JAVA=1 + language: java + jdk: openjdk8 install: - . ./ci/travis/ci.sh init RAY_CI_JAVA_AFFECTED before_script: @@ -134,11 +136,12 @@ matrix: - os: linux env: - - TESTSUITE=streaming - - JDK='Oracle JDK 8' + - STREAMING_TESTS=1 - RAY_INSTALL_JAVA=1 - PYTHON=3.6 PYTHONWARNINGS=ignore - RAY_USE_RANDOM_PORTS=1 + language: java + jdk: openjdk8 install: - . ./ci/travis/ci.sh init RAY_CI_STREAMING_PYTHON_AFFECTED,RAY_CI_STREAMING_JAVA_AFFECTED before_script: @@ -171,17 +174,23 @@ matrix: install: - . ./ci/travis/ci.sh init RAY_CI_MACOS_WHEELS_AFFECTED,RAY_CI_JAVA_AFFECTED,RAY_CI_STREAMING_JAVA_AFFECTED before_script: + - brew tap adoptopenjdk/openjdk + - brew cask install adoptopenjdk8 + - export JAVA_HOME=/Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home + - java -version - . ./ci/travis/ci.sh build script: - . ./ci/travis/ci.sh test_wheels - bash ./java/build-jar-multiplatform.sh darwin - # Build Linux wheels and jars. + # Build Linux wheels and jars. - os: linux env: - LINUX_WHEELS=1 LINUX_JARS=1 - PYTHONWARNINGS=ignore - RAY_INSTALL_JAVA=1 + language: java + jdk: openjdk8 install: - . ./ci/travis/ci.sh init RAY_CI_LINUX_WHEELS_AFFECTED,RAY_CI_JAVA_AFFECTED,RAY_CI_STREAMING_JAVA_AFFECTED before_script: @@ -200,6 +209,8 @@ matrix: - RAY_INSTALL_JAVA=1 - secure: "Un2SGOCdD/RiqbO47vtkwn5dPbGbwHi/TKunyNJLKcGILwJc0sZL9uf8pkffyYGbt7ejnYwV9tPgoAlFxcuJYgbmkt84AxDF8oskJmFKYjkxOtEFkqskhTb0u9/usjq23OXrmGN4NqvzLEdbf7Z3wyMxXpzgDKPUgDAFUfB2Ya8OapXuPdt/5KDlDBS0Bj9sKqI+0keYovfRY8dO2/Vd0Ojqkmz1PWHTQP0TrC1X+juciDdoRnU1rO8mxhQW4HKICexwAr1rsAqALpuDlfyhG7I+aicVjK3uiQuviGJOoI813f00YlTOAoXW2YPpblExp0uoTQN2zaYvpp1zUx7V/rVaAoXmFI7ELQ+nr8oAJbImWe1bCNO3UsxpzGamGlTIx7hAiJ0CwFU6qW/+NKWIlhH1iBxUZHw/F8Ixsqtdwx3yhR/rj86sdItAM9CkK6URVdWk2U4VimyDzzJpUWWFsjUZ2V8jNxYPrWg52ciC4k7tp32qrKYrBa+mJduE68/xjFeeZdYUxzg1AT3Lh3rA0ebMIELT7OBz6DRjUmRgO6+VJIRfbPszHEG2X+aPHtSj+Fsc4AacVtiIUUpXMeUx9nxM7oD1lXr8I59vq5+6EhohKBmc4DkpkWLnsCMTnJ1HQ37zKxRSE5jDwyNTJ8x2l8bbK/pqTRZPWUeKL3Is8NE=" - secure: "IrNncc7RpiSnU/3fB72bG/Vyt/w50uTIVMIdgy64eNw0TgDf15/0IuwzCZDrjTAwq2meGAYFq1KNb7W538UDn+zJs6YIrcEF+2c53alCRASrafFEgAQmbvTpFtxAcHfTFK3c3neVXGiCeOSn64ymV5vQKjLCGvlEpmA10EUmdIE3wIgYRYMTzpzV9A4HmJbAgkBslhIw17BottFbfrL9Z4LlBJjOSP/t9cbGn8QVuM7V4dR+lo5j1Ns8XaVCkNvVqQdJEsp8xeMMn3pvFDxBBEn4zQ2xEGN4QvKquiACaVZLTnNCTkan5pRbswy25hOTnt/zNovJK8TBNuyWTBJNJo+f6vkuQXNR9iRkOQ+FAInjvEVYUWstuc6+opp8yV9cMdOsOMQRX/V6qo5pE2uERU0Fr6WtAhSvZDcGinpfoYkbMXxPdI8E7gmCJKrQ91hVU1ExokztbNesy7YWic/GZPzoBGMSPnNJ8chaydvmeq74P6F0cGI1LU/Tea7Ewf9MbJjWiVZ2C9G1Po3a6vu0ElE1NSIotBZFfpp2P8IeqP5/pZ84E93yRpT4Pt2kBsEjUqiNqLduXDPJnoBHHRzuNovT7sHJoZZAaBipuiNdj4ZQLgA+1WVysaHIDlzlcOMAxNNRMuT6+GATEvtsK8llh0qEzKShbOST54DDp1jST4w=" + language: java + jdk: openjdk8 install: - . ./ci/travis/ci.sh init RAY_CI_JAVA_AFFECTED,RAY_CI_STREAMING_JAVA_AFFECTED script: diff --git a/java/api/src/main/java/io/ray/api/call/BaseActorCreator.java b/java/api/src/main/java/io/ray/api/call/BaseActorCreator.java index 827eb0412..93d98ab65 100644 --- a/java/api/src/main/java/io/ray/api/call/BaseActorCreator.java +++ b/java/api/src/main/java/io/ray/api/call/BaseActorCreator.java @@ -89,7 +89,7 @@ public class BaseActorCreator { * Set the max number of concurrent calls to allow for this actor. *

* The max concurrency defaults to 1 for threaded execution. - * Note that the execution order is not guaranteed when max_concurrency > 1. + * Note that the execution order is not guaranteed when {@code max_concurrency > 1}. * * @param maxConcurrency The max number of concurrent calls to allow for this actor. * @return self diff --git a/java/api/src/main/java/io/ray/api/options/ActorCreationOptions.java b/java/api/src/main/java/io/ray/api/options/ActorCreationOptions.java index a33c10dbe..08fd77c45 100644 --- a/java/api/src/main/java/io/ray/api/options/ActorCreationOptions.java +++ b/java/api/src/main/java/io/ray/api/options/ActorCreationOptions.java @@ -129,7 +129,7 @@ public class ActorCreationOptions extends BaseTaskOptions { * Set the max number of concurrent calls to allow for this actor. *

* The max concurrency defaults to 1 for threaded execution. - * Note that the execution order is not guaranteed when max_concurrency > 1. + * Note that the execution order is not guaranteed when {@code max_concurrency > 1}. * * @param maxConcurrency The max number of concurrent calls to allow for this actor. * @return self diff --git a/java/build-jar-multiplatform.sh b/java/build-jar-multiplatform.sh index 12d0f9a6f..40d44f7a8 100755 --- a/java/build-jar-multiplatform.sh +++ b/java/build-jar-multiplatform.sh @@ -17,6 +17,15 @@ cd "$WORKSPACE_DIR/java" version=$(python -c "import xml.etree.ElementTree as ET; r = ET.parse('pom.xml').getroot(); print(r.find(r.tag.replace('project', 'version')).text);" | tail -n 1) cd - +check_java_version() { + local VERSION + VERSION=$(java -version 2>&1 | awk -F '"' '/version/ {print $2}') + if [[ ! $VERSION =~ 1.8 ]]; then + echo "Java version is $VERSION. Please install jkd8." + exit 1 + fi +} + build_jars() { local platform="$1" local bazel_build="${2:-true}" @@ -180,6 +189,8 @@ deploy_jars() { fi } +check_java_version + case "$1" in linux) # build jars that only contains Linux binaries. build_jars_linux diff --git a/java/pom.xml b/java/pom.xml index 1dcb34f7d..0909a2b9c 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -124,7 +124,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.10.4 + 3.1.0 attach-javadocs diff --git a/java/test.sh b/java/test.sh index 695333224..21102b112 100755 --- a/java/test.sh +++ b/java/test.sh @@ -6,6 +6,7 @@ set -e set -x ROOT_DIR=$(cd "$(dirname "${BASH_SOURCE:-$0}")"; pwd) +java -version run_testng() { local exit_code diff --git a/streaming/java/pom.xml b/streaming/java/pom.xml index 91c418681..1027844dd 100644 --- a/streaming/java/pom.xml +++ b/streaming/java/pom.xml @@ -153,7 +153,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.10.4 + 3.1.0 attach-javadocs