Skip to content

Commit 3baeb99

Browse files
[INFRA] Move checkstyle config files to one location (#3056)
<!-- Thanks for sending a pull request! Here are some tips for you: 1. If this is your first time, please read our contributor guidelines: https://github.com/delta-io/delta/blob/master/CONTRIBUTING.md 2. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP] Your PR title ...'. 3. Be sure to keep the PR description updated to reflect all changes. 4. Please write your PR title to summarize what this PR proposes. 5. If possible, provide a concise example to reproduce the issue for a faster review. 6. If applicable, include the corresponding issue number in the PR title and link it in the body. --> #### Which Delta project/connector is this regarding? <!-- Please add the component selected below to the beginning of the pull request title For example: [Spark] Title of my pull request --> - [ ] Spark - [ ] Standalone - [ ] Flink - [ ] Kernel - [X] Other (INFRA) ## Description Currently the java checkstyle config files are shared by some projects and stored in different locations nested under those projects. Moves the checkstyle config files to a common location. This will make it easier to compare our configs in the future and keep track of the different settings for the different projects. ## How was this patch tested? Locally ran `checkstyle` for all the affected projects. Also modified one file and checked that the checks failed.
1 parent 8827d75 commit 3baeb99

File tree

6 files changed

+5
-67
lines changed

6 files changed

+5
-67
lines changed

build.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ lazy val kernelApi = (project in file("kernel/kernel-api"))
368368
|""".stripMargin)
369369
Seq(file)
370370
},
371-
javaCheckstyleSettings("kernel/dev/checkstyle.xml"),
371+
javaCheckstyleSettings("dev/kernel-checkstyle.xml"),
372372
// Unidoc settings
373373
unidocSourceFilePatterns := Seq(SourceFilePattern("io/delta/kernel/")),
374374
).configureUnidoc(docTitle = "Delta Kernel")
@@ -406,7 +406,7 @@ lazy val kernelDefaults = (project in file("kernel/kernel-defaults"))
406406
"org.apache.spark" %% "spark-core" % defaultSparkVersion % "test" classifier "tests",
407407
"org.apache.spark" %% "spark-catalyst" % defaultSparkVersion % "test" classifier "tests",
408408
),
409-
javaCheckstyleSettings("kernel/dev/checkstyle.xml"),
409+
javaCheckstyleSettings("dev/kernel-checkstyle.xml"),
410410
// Unidoc settings
411411
unidocSourceFilePatterns += SourceFilePattern("io/delta/kernel/"),
412412
).configureUnidoc(docTitle = "Delta Kernel Defaults")
@@ -1066,7 +1066,7 @@ lazy val standalone = (project in file("connectors/standalone"))
10661066

10671067
// Unidoc setting
10681068
unidocSourceFilePatterns += SourceFilePattern("io/delta/standalone/"),
1069-
javaCheckstyleSettings("connectors/dev/checkstyle.xml")
1069+
javaCheckstyleSettings("dev/connectors-checkstyle.xml")
10701070
).configureUnidoc()
10711071

10721072

@@ -1251,7 +1251,7 @@ lazy val flink = (project in file("connectors/flink"))
12511251
unidocSourceFilePatterns += SourceFilePattern("io/delta/flink/"),
12521252
// TODO: this is the config that was used before archiving connectors but it has
12531253
// standalone-specific import orders
1254-
javaCheckstyleSettings("connectors/dev/checkstyle.xml")
1254+
javaCheckstyleSettings("dev/connectors-checkstyle.xml")
12551255
).configureUnidoc()
12561256

12571257
/**

connectors/dev/checkstyle-suppressions.xml

Lines changed: 0 additions & 31 deletions
This file was deleted.
File renamed without changes.
File renamed without changes.

kernel/dev/checkstyle.xml renamed to dev/kernel-checkstyle.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<module name="NewlineAtEndOfFile"/>
7373

7474
<module name="RegexpHeader">
75-
<property name="headerFile" value="kernel/dev/copyrightHeader"/>
75+
<property name="headerFile" value="dev/copyrightHeader"/>
7676
</module>
7777

7878
<module name="TreeWalker">

kernel/dev/checkstyle-suppressions.xml

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)