From e704b9e56b0cc862ebd5c95b9d023ab0a5ffdba7 Mon Sep 17 00:00:00 2001 From: panbingkun Date: Thu, 9 May 2024 16:42:58 -0700 Subject: [PATCH] [SPARK-48226][BUILD] Add `spark-ganglia-lgpl` to `lint-java` & `spark-ganglia-lgpl` and `jvm-profiler` to `sbt-checkstyle` ### What changes were proposed in this pull request? The pr aims to add - `spark-ganglia-lgpl` to `lint-java` - `spark-ganglia-lgpl` and `jvm-profiler` to `sbt-checkstyle` ### Why are the changes needed? 1.Because the module `spark-ganglia-lgpl` has `java` code 2.Because the module `spark-ganglia-lgpl` & `jvm-profiler` has `scala` code 3.Although these module codes currently comply with the specification, in order to avoid problems like https://github.com/apache/spark/pull/46376, they will occur again in future modifications. ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? - Manually test. - Pass GA. ### Was this patch authored or co-authored using generative AI tooling? No. Closes #46501 from panbingkun/minor_spark-ganglia-lgpl. Authored-by: panbingkun Signed-off-by: Dongjoon Hyun --- dev/lint-java | 2 +- dev/sbt-checkstyle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/lint-java b/dev/lint-java index ac5a2c869404f..ff431301773f3 100755 --- a/dev/lint-java +++ b/dev/lint-java @@ -20,7 +20,7 @@ SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )" SPARK_ROOT_DIR="$(dirname $SCRIPT_DIR)" -ERRORS=$($SCRIPT_DIR/../build/mvn -Pkinesis-asl -Pkubernetes -Pyarn -Phive -Phive-thriftserver checkstyle:check | grep ERROR) +ERRORS=$($SCRIPT_DIR/../build/mvn -Pkinesis-asl -Pspark-ganglia-lgpl -Pkubernetes -Pyarn -Phive -Phive-thriftserver checkstyle:check | grep ERROR) if test ! -z "$ERRORS"; then echo -e "Checkstyle checks failed at following occurrences:\n$ERRORS" diff --git a/dev/sbt-checkstyle b/dev/sbt-checkstyle index 99a46a3a0e38b..f2d5a0fa304ac 100755 --- a/dev/sbt-checkstyle +++ b/dev/sbt-checkstyle @@ -17,7 +17,7 @@ # limitations under the License. # -SPARK_PROFILES=${1:-"-Pkinesis-asl -Pkubernetes -Pyarn -Phive -Phive-thriftserver"} +SPARK_PROFILES=${1:-"-Pkinesis-asl -Pspark-ganglia-lgpl -Pkubernetes -Pyarn -Phive -Phive-thriftserver -Pjvm-profiler"} # NOTE: echo "q" is needed because SBT prompts the user for input on encountering a build file # with failure (either resolution or compilation); the "q" makes SBT quit.