spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sro...@apache.org
Subject spark git commit: [HOT-FIX][BUILD] Use the new location of `checkstyle-suppressions.xml`
Date Tue, 08 Mar 2016 10:27:59 GMT
Repository: spark
Updated Branches:
  refs/heads/master e52e597db -> 7771c7314


[HOT-FIX][BUILD] Use the new location of `checkstyle-suppressions.xml`

## What changes were proposed in this pull request?

This PR fixes `dev/lint-java` and `mvn checkstyle:check` failures due the recent file location
change.
The following is the error message of current master.
```
Checkstyle checks failed at following occurrences:
[ERROR] Failed to execute goal org.apache.maven.plugins:maven-checkstyle-plugin:2.17:check
(default-cli) on project spark-parent_2.11: Failed during checkstyle configuration: cannot
initialize module SuppressionFilter - Cannot set property 'file' to 'checkstyle-suppressions.xml'
in module SuppressionFilter: InvocationTargetException: Unable to find: checkstyle-suppressions.xml
-> [Help 1]
```

## How was this patch tested?

Manual. The following command should run correctly.
```
./dev/lint-java
mvn checkstyle:check
```

Author: Dongjoon Hyun <dongjoon@apache.org>

Closes #11567 from dongjoon-hyun/hotfix_checkstyle_suppression.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/7771c731
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/7771c731
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/7771c731

Branch: refs/heads/master
Commit: 7771c7314ff01b666b36c97982f62c5ef26aca08
Parents: e52e597
Author: Dongjoon Hyun <dongjoon@apache.org>
Authored: Tue Mar 8 10:27:52 2016 +0000
Committer: Sean Owen <sowen@cloudera.com>
Committed: Tue Mar 8 10:27:52 2016 +0000

----------------------------------------------------------------------
 dev/checkstyle.xml | 2 +-
 pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/7771c731/dev/checkstyle.xml
----------------------------------------------------------------------
diff --git a/dev/checkstyle.xml b/dev/checkstyle.xml
index a165fee..2261cc9 100644
--- a/dev/checkstyle.xml
+++ b/dev/checkstyle.xml
@@ -49,7 +49,7 @@
     <property name="fileExtensions" value="java, properties, xml"/>
 
     <module name="SuppressionFilter">
-      <property name="file" value="checkstyle-suppressions.xml"/>
+      <property name="file" value="dev/checkstyle-suppressions.xml"/>
     </module>
 
     <!-- Checks for whitespace                               -->

http://git-wip-us.apache.org/repos/asf/spark/blob/7771c731/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e7f3442..dccfd10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2246,7 +2246,7 @@
           <failOnWarning>false</failOnWarning>
           <sourceDirectory>${basedir}/src/main/scala</sourceDirectory>
           <testSourceDirectory>${basedir}/src/test/scala</testSourceDirectory>
-          <configLocation>dev/scalastyle-config.xml</configLocation>
+          <configLocation>scalastyle-config.xml</configLocation>
           <outputFile>${basedir}/target/scalastyle-output.xml</outputFile>
           <inputEncoding>${project.build.sourceEncoding}</inputEncoding>
           <outputEncoding>${project.reporting.outputEncoding}</outputEncoding>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org


Mime
View raw message