Skip to content

Commit d91962d

Browse files
committed
try a different idea with narrower scope
1 parent 3707a9d commit d91962d

3 files changed

Lines changed: 5 additions & 21 deletions

File tree

buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1504,12 +1504,8 @@ class BeamModulePlugin implements Plugin<Project> {
15041504
java {
15051505
licenseHeader javaLicenseHeader
15061506
googleJavaFormat('1.17.0')
1507-
target project.fileTree(project.projectDir) {
1508-
include 'src/*/java/**/*.java'
1509-
exclude '**/build/**'
1510-
exclude '**/.gradle/**'
1511-
exclude '**/DefaultPackageTest.java'
1512-
}
1507+
target 'src/main/java/**/*.java', 'src/test/java/**/*.java'
1508+
targetExclude '**/DefaultPackageTest.java'
15131509
// For spotless:off and spotless:on
15141510
toggleOffOn()
15151511
}
@@ -2434,11 +2430,7 @@ class BeamModulePlugin implements Plugin<Project> {
24342430
def grEclipseConfig = project.project(":").file("buildSrc/greclipse.properties")
24352431
groovy {
24362432
greclipse().configFile(grEclipseConfig)
2437-
target project.fileTree(project.projectDir) {
2438-
include '**/*.groovy'
2439-
exclude '**/build/**'
2440-
exclude '**/.gradle/**'
2441-
}
2433+
target 'src/main/groovy/**/*.groovy', 'src/test/groovy/**/*.groovy'
24422434
}
24432435
groovyGradle { greclipse().configFile(grEclipseConfig) }
24442436
}

runners/flink/build.gradle

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@ spotless {
3535
java {
3636
licenseHeader org.apache.beam.gradle.BeamModulePlugin.javaLicenseHeader
3737
googleJavaFormat('1.17.0')
38-
target project.fileTree(project.projectDir) {
39-
include 'src/*/java/**/*.java'
40-
exclude '**/build/**'
41-
exclude '**/.gradle/**'
42-
}
38+
target 'src/main/java/**/*.java', 'src/test/java/**/*.java'
4339
}
4440
}

runners/spark/build.gradle

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@ spotless {
3535
java {
3636
licenseHeader org.apache.beam.gradle.BeamModulePlugin.javaLicenseHeader
3737
googleJavaFormat('1.17.0')
38-
target project.fileTree(project.projectDir) {
39-
include 'src/*/java/**/*.java'
40-
exclude '**/build/**'
41-
exclude '**/.gradle/**'
42-
}
38+
target 'src/main/java/**/*.java', 'src/test/java/**/*.java'
4339
}
4440
}

0 commit comments

Comments
 (0)