Skip to content

Commit

Permalink
Replace skip with maven.scaladoc.skip
Browse files Browse the repository at this point in the history
Follow up to NVIDIA#9615

Signed-off-by: Gera Shegalov <gera@apache.org>
  • Loading branch information
gerashegalov committed Nov 14, 2023
1 parent 9cc11f2 commit 7ea535a
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/mvn-verify-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ env:
COMMON_MVN_FLAGS: >-
-Ddist.jar.compress=false
-DskipTests
-Dskip
-Dmaven.scaladoc.skip
jobs:
get-shim-versions-from-dist:
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ Before proceeding with importing spark-rapids into IDEA or switching to a differ
profile, execute the install phase with the corresponding `buildver`, e.g. for Spark 3.4.0:
```bash
mvn clean install -Dbuildver=340 -Dskip -DskipTests
mvn clean install -Dbuildver=340 -Dmaven.scaladoc.skip -DskipTests
```
##### Importing the project
Expand Down
4 changes: 2 additions & 2 deletions build/buildall
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ function build_single_shim() {
-DskipTests \
-Dbuildver="$BUILD_VER" \
-Drat.skip="$SKIP_CHECKS" \
-Dskip \
-Dmaven.scaladoc.skip \
-Dmaven.scalastyle.skip="$SKIP_CHECKS" \
-pl aggregator -am > "$LOG_FILE" 2>&1 || {
[[ "$LOG_FILE" != "/dev/tty" ]] && echo "$LOG_FILE:" && tail -20 "$LOG_FILE" || true
Expand Down Expand Up @@ -303,5 +303,5 @@ time (
echo "Resuming from $joinShimBuildFrom build only using $BASE_VER"
$MVN $FINAL_OP -rf $joinShimBuildFrom $MODULE_OPT $MVN_PROFILE_OPT $INCLUDED_BUILDVERS_OPT \
-Dbuildver="$BASE_VER" \
-DskipTests -Dskip
-DskipTests -Dmaven.scaladoc.skip
)
2 changes: 1 addition & 1 deletion jenkins/databricks/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ $MVN_CMD -B -Ddatabricks -Dbuildver=$BUILDVER clean package -DskipTests $MVN_OPT
if [[ "$WITH_DEFAULT_UPSTREAM_SHIM" != "0" ]]; then
echo "Building the default Spark shim and creating a two-shim dist jar"
UPSTREAM_BUILDVER=$($MVN_CMD help:evaluate -q -pl dist -Dexpression=buildver -DforceStdout)
$MVN_CMD -B package -pl dist -am -DskipTests -Dskip $MVN_OPT \
$MVN_CMD -B package -pl dist -am -DskipTests -Dmaven.scaladoc.skip $MVN_OPT \
-Dincluded_buildvers=$UPSTREAM_BUILDVER,$BUILDVER
fi

Expand Down
2 changes: 1 addition & 1 deletion jenkins/spark-premerge-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ fi

CUDA_CLASSIFIER=${CUDA_CLASSIFIER:-'cuda11'}
MVN_CMD="mvn -Dmaven.wagon.http.retryHandler.count=3"
MVN_BUILD_ARGS="-Drat.skip=true -Dskip -Dmaven.scalastyle.skip=true -Dcuda.version=$CUDA_CLASSIFIER"
MVN_BUILD_ARGS="-Drat.skip=true -Dmaven.scaladoc.skip -Dmaven.scalastyle.skip=true -Dcuda.version=$CUDA_CLASSIFIER"

mvn_verify() {
echo "Run mvn verify..."
Expand Down

0 comments on commit 7ea535a

Please sign in to comment.