Skip to content

[SPARK-40996][BUILD] Upgrade sbt-checkstyle-plugin to 4.0.0 to resolve dev/sbt-checkstyle run failed with sbt 1.7.3 #38481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
LuciferYang wants to merge 5 commits into from
Closed

[SPARK-40996][BUILD] Upgrade sbt-checkstyle-plugin to 4.0.0 to resolve dev/sbt-checkstyle run failed with sbt 1.7.3 #38481

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ad8829b
upgrade checkstyle plugin
LuciferYang Nov 2, 2022
a53f2d8
re update sbt
LuciferYang Nov 2, 2022
a49ee64
revert to Error
LuciferYang Nov 2, 2022
fdc2067
revert to 1.7.2
LuciferYang Nov 3, 2022
72ef4e9
Merge branch 'upmaster' into 173-pass-checkstyle
LuciferYang Nov 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dev/appveyor-install-dependencies.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ if (!(Test-Path $tools)) {
# ========================== SBT
Push-Location $tools

$sbtVer = "1.7.2"

@LuciferYang LuciferYang Nov 2, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it will be revert later

$sbtVer = "1.7.3"
Start-FileDownload "https://github.com/sbt/sbt/releases/download/v$sbtVer/sbt-$sbtVer.zip" "sbt.zip"

# extract
Expand Down
8 changes: 8 additions & 0 deletions dev/checkstyle-suppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,14 @@
files="connector/spark-ganglia-lgpl/src/main/java/com/codahale/metrics/ganglia/GangliaReporter.java"/>
<suppress checks=".*"
files="sql/core/src/main/java/org/apache/spark/sql/api/java/*"/>
<suppress checks=".*"
files="antlr4/org/apache/spark/sql/catalyst/parser/*"/>
<suppress checks=".*"
files="org/apache/spark/connect/proto/*"/>
<suppress checks=".*"
files="test/gen-java/org/apache/spark/sql/execution/datasources/parquet/test/avro/*"/>
<suppress checks=".*"
files="generated-test-sources/org/apache/spark/sql/protobuf/*"/>
<suppress checks="LineLength"
files="src/test/java/org/apache/spark/sql/hive/test/Complex.java"/>
<suppress checks="LineLength"
Expand Down
2 changes: 1 addition & 1 deletion project/SparkBuild.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1269,7 +1269,7 @@ object Unidoc {

object Checkstyle {
lazy val settings = Seq(
checkstyleSeverityLevel := Some(CheckstyleSeverityLevel.Error),
checkstyleSeverityLevel := CheckstyleSeverityLevel.Info,
Comment thread
LuciferYang marked this conversation as resolved.
Outdated
(Compile / checkstyle / javaSource) := baseDirectory.value / "src/main/java",
(Test / checkstyle / javaSource) := baseDirectory.value / "src/test/java",
checkstyleConfigLocation := CheckstyleConfigLocation.File("dev/checkstyle.xml"),
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# limitations under the License.
#
# Please update the version in appveyor-install-dependencies.ps1 together.
sbt.version=1.7.2

@LuciferYang LuciferYang Nov 2, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the convenience of others manual check, it will be revert later

@LuciferYang LuciferYang Nov 3, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fdc2067 revert sbt version to 1.7.2, will another pr for re upgrade. Please manually modify project/build.properties when you double check @linhongliu-db

sbt.version=1.7.3
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

addSbtPlugin("com.etsy" % "sbt-checkstyle-plugin" % "3.1.1")
addSbtPlugin("software.purpledragon" % "sbt-checkstyle-plugin" % "4.0.0")

// sbt-checkstyle-plugin uses an old version of checkstyle. Match it to Maven's.
// If you are changing the dependency setting for checkstyle plugin,
Expand Down