Revert "[SPARK-30534][INFRA] Use mvn in dev/scalastyle
"
This reverts commit 384899944b
.
This commit is contained in:
parent
a94a4fcf90
commit
e170422f74
|
@ -17,10 +17,18 @@
|
|||
# limitations under the License.
|
||||
#
|
||||
|
||||
SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
|
||||
SPARK_PROFILES=${1:-"-Pmesos -Pkubernetes -Pyarn -Pspark-ganglia-lgpl -Pkinesis-asl -Phive-thriftserver -Phive"}
|
||||
|
||||
SPARK_PROFILES=${1:-"-Pmesos -Pkubernetes -Pyarn -Pspark-ganglia-lgpl -Pkinesis-asl -Phive-thriftserver -Phive -Pdocker-integration-tests -Pkubernetes-integration-tests"}
|
||||
ERRORS=$($SCRIPT_DIR/../build/mvn $SPARK_PROFILES scalastyle:check | grep "^error file")
|
||||
# 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.
|
||||
ERRORS=$(echo -e "q\n" \
|
||||
| build/sbt \
|
||||
${SPARK_PROFILES} \
|
||||
-Pdocker-integration-tests \
|
||||
-Pkubernetes-integration-tests \
|
||||
scalastyle test:scalastyle \
|
||||
| awk '{if($1~/error/)print}' \
|
||||
)
|
||||
|
||||
if test ! -z "$ERRORS"; then
|
||||
echo -e "Scalastyle checks failed at following occurrences:\n$ERRORS"
|
||||
|
|
2
pom.xml
2
pom.xml
|
@ -2776,7 +2776,7 @@
|
|||
<configuration>
|
||||
<verbose>false</verbose>
|
||||
<failOnViolation>true</failOnViolation>
|
||||
<includeTestSourceDirectory>true</includeTestSourceDirectory>
|
||||
<includeTestSourceDirectory>false</includeTestSourceDirectory>
|
||||
<failOnWarning>false</failOnWarning>
|
||||
<sourceDirectory>${basedir}/src/main/scala</sourceDirectory>
|
||||
<testSourceDirectory>${basedir}/src/test/scala</testSourceDirectory>
|
||||
|
|
Loading…
Reference in a new issue