Tweaks

PicnicSupermarket · Mar 1, 2024 · 7dab604 · 7dab604
1 parent e2e9f94
commit 7dab604
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/integration-tests/checkstyle.sh b/integration-tests/checkstyle.sh
@@ -61,22 +61,18 @@ format_goal='com.spotify.fmt:fmt-maven-plugin:2.21.1:format'
 
 error_prone_shared_flags='-XepExcludedPaths:(\Q${project.basedir}${file.separator}src${file.separator}\E(it|test|xdocs-examples)\Q${file.separator}resources\E|\Q${project.build.directory}${file.separator}\E).*'
 
-# XXX: Drop the exclusions once we know how to improve this.
 error_prone_patch_flags="${error_prone_shared_flags} -XepPatchLocation:IN_PLACE -XepPatchChecks:$(
   find "${error_prone_support_root}" -path "*/META-INF/services/com.google.errorprone.bugpatterns.BugChecker" \
-     -not -path "*/error-prone-guidelines/*" \
-     -not -path "*/error-prone-experimental/*" \
+     -not -path "*/error-prone-{experimental,guidelines}/*" \
      -print0 \
     | xargs -0 "${grep_command}" -hoP '[^.]+$' \
     | "${grep_command}" -v ErrorProneRuntimeClasspath \
     | paste -s -d ',' -
 )"
 
-# XXX: Drop the exclusions once we know how to improve this.
 error_prone_validation_flags="${error_prone_shared_flags} -XepDisableAllChecks $(
   find "${error_prone_support_root}" -path "*/META-INF/services/com.google.errorprone.bugpatterns.BugChecker" \
-     -not -path "*/error-prone-guidelines/*" \
-     -not -path "*/error-prone-experimental/*" \
+     -not -path "*/error-prone-{experimental,guidelines}/*" \
      -print0 \
     | xargs -0 "${grep_command}" -hoP '[^.]+$' \
     | "${sed_command}" -r 's,(.*),-Xep:\1:WARN,' \