From 679721e3f45e454314ab4359545c278edaa587c1 Mon Sep 17 00:00:00 2001 From: Tim Liu Date: Fri, 1 Apr 2022 09:10:38 +0800 Subject: [PATCH] Update for the public release [skip ci] (#5069) * Update for the public release To fix issue #5050 1, Add JAVA_HOME for maven opt `-P source-javadoc` 2, Change to use maven opt `-P release311` instead of `-P release301` 3, Add configuration `` for maven-javadoc-plugin: Not detecting the links for all modules defined in the project: https://maven.apache.org/plugins/maven-javadoc-plugin/javadoc-no-fork-mojo.html#detectOfflineLinks To [ERROR] `The specified file '/home/jenkins/agent/workspace/jenkins-tim-rapids-release-11/dist/target/rapids-4-spark_2.12-22.04.0.jar' not exists` Signed-off-by: Tim Liu * Update 'integration-tests/pom.xml' to keep links for all modules defined in the project Signed-off-by: Tim Liu --- integration_tests/pom.xml | 17 +++++++++++++++++ jenkins/Dockerfile-blossom.ubuntu | 3 +++ jenkins/spark-nightly-build.sh | 2 +- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/integration_tests/pom.xml b/integration_tests/pom.xml index cd994ffda17..88f05eafa0f 100644 --- a/integration_tests/pom.xml +++ b/integration_tests/pom.xml @@ -344,6 +344,23 @@ + + org.apache.maven.plugins + maven-javadoc-plugin + 3.0.0 + + + attach-javadoc + + jar + + + + + none + false + + diff --git a/jenkins/Dockerfile-blossom.ubuntu b/jenkins/Dockerfile-blossom.ubuntu index 0d3d7fe62a5..0ef9f8a7cca 100644 --- a/jenkins/Dockerfile-blossom.ubuntu +++ b/jenkins/Dockerfile-blossom.ubuntu @@ -56,3 +56,6 @@ RUN mkdir -p /tmp/ucx && \ wget https://github.com/openucx/ucx/releases/download/v${UCX_VER}/ucx-v${UCX_VER}-ubuntu${UBUNTU_VER}-mofed5.x-cuda${CUDA_VER}.deb && \ dpkg -i *.deb && \ rm -rf /tmp/ucx + +# export JAVA_HOME for mvn option 'source-javadoc' +ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 diff --git a/jenkins/spark-nightly-build.sh b/jenkins/spark-nightly-build.sh index 73742bc667c..c50368c76ef 100755 --- a/jenkins/spark-nightly-build.sh +++ b/jenkins/spark-nightly-build.sh @@ -24,7 +24,7 @@ export M2DIR="$WORKSPACE/.m2" DIST_PL="dist" function mvnEval { - mvn help:evaluate -q -pl $DIST_PL $MVN_URM_MIRROR -Prelease301 -Dmaven.repo.local=$M2DIR -Dcuda.version=$CUDA_CLASSIFIER -DforceStdout -Dexpression=$1 + mvn help:evaluate -q -pl $DIST_PL $MVN_URM_MIRROR -Prelease311 -Dmaven.repo.local=$M2DIR -Dcuda.version=$CUDA_CLASSIFIER -DforceStdout -Dexpression=$1 } ART_ID=$(mvnEval project.artifactId)