Skip to content

Commit 90dea83

Browse files
committed
Revert "[SPARK-30534][INFRA] Use mvn in dev/scalastyle"
This reverts commit ac54156.
1 parent ebaa6fe commit 90dea83

File tree

3 files changed

+17
-6
lines changed

3 files changed

+17
-6
lines changed

dev/scalastyle

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,21 @@
1717
# limitations under the License.
1818
#
1919

20-
SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
21-
22-
SPARK_PROFILES=${1:-"-Pmesos -Pkubernetes -Pyarn -Pspark-ganglia-lgpl -Pkinesis-asl -Phive-thriftserver -Phive -Pkafka-0-8 -Pflume -Pdocker-integration-tests -Pkubernetes-integration-tests"}
23-
ERRORS=$($SCRIPT_DIR/../build/mvn $SPARK_PROFILES scalastyle:check | grep "^error file")
20+
# NOTE: echo "q" is needed because SBT prompts the user for input on encountering a build file
21+
# with failure (either resolution or compilation); the "q" makes SBT quit.
22+
ERRORS=$(echo -e "q\n" \
23+
| build/sbt \
24+
-Pkinesis-asl \
25+
-Pmesos \
26+
-Pkafka-0-8 \
27+
-Pkubernetes \
28+
-Pyarn \
29+
-Pflume \
30+
-Phive \
31+
-Phive-thriftserver \
32+
scalastyle test:scalastyle \
33+
| awk '{if($1~/error/)print}' \
34+
)
2435

2536
if test ! -z "$ERRORS"; then
2637
echo -e "Scalastyle checks failed at following occurrences:\n$ERRORS"

external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ class OracleIntegrationSuite extends DockerJDBCIntegrationSuite with SharedSQLCo
154154
// A value with fractions from DECIMAL(3, 2) is correct:
155155
assert(row.getDecimal(1).compareTo(BigDecimal.valueOf(1.23)) == 0)
156156
// A value > Int.MaxValue from DECIMAL(10) is correct:
157-
assert(row.getDecimal(2).compareTo(BigDecimal.valueOf(9999999999L)) == 0)
157+
assert(row.getDecimal(2).compareTo(BigDecimal.valueOf(9999999999l)) == 0)
158158
}
159159

160160

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2558,7 +2558,7 @@
25582558
<configuration>
25592559
<verbose>false</verbose>
25602560
<failOnViolation>true</failOnViolation>
2561-
<includeTestSourceDirectory>true</includeTestSourceDirectory>
2561+
<includeTestSourceDirectory>false</includeTestSourceDirectory>
25622562
<failOnWarning>false</failOnWarning>
25632563
<sourceDirectory>${basedir}/src/main/scala</sourceDirectory>
25642564
<testSourceDirectory>${basedir}/src/test/scala</testSourceDirectory>

0 commit comments

Comments
 (0)