From 398d162b8d1cf2532655cc05c83fffdd4ea08a8c Mon Sep 17 00:00:00 2001
From: Rick Ossendrijver <rick.ossendrijver@gmail.com>
Date: Mon, 4 Mar 2024 20:47:46 +0100
Subject: [PATCH] Exclude `error-prone-{experimental,guidelines}` checks from
 integration tests (#1060)

---
 integration-tests/checkstyle.sh | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/integration-tests/checkstyle.sh b/integration-tests/checkstyle.sh
index c5f41b9a00..98ba734089 100755
--- a/integration-tests/checkstyle.sh
+++ b/integration-tests/checkstyle.sh
@@ -61,22 +61,24 @@ 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 `ErrorProneRuntimeClasspath` exclusion once that check resides
-# in a separate Maven module.
 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" -print0 \
+  find "${error_prone_support_root}" \
+     -path "*/META-INF/services/com.google.errorprone.bugpatterns.BugChecker" \
+     -not -path "*/error-prone-experimental/*" \
+     -not -path "*/error-prone-guidelines/*" \
+     -print0 \
     | xargs -0 "${grep_command}" -hoP '[^.]+$' \
-    | "${grep_command}" -v ErrorProneRuntimeClasspath \
     | paste -s -d ',' -
 )"
 
-# XXX: Drop the `ErrorProneRuntimeClasspath` exclusion once that check resides
-# in a separate Maven module.
 error_prone_validation_flags="${error_prone_shared_flags} -XepDisableAllChecks $(
-  find "${error_prone_support_root}" -path "*/META-INF/services/com.google.errorprone.bugpatterns.BugChecker" -print0 \
+  find "${error_prone_support_root}" \
+     -path "*/META-INF/services/com.google.errorprone.bugpatterns.BugChecker" \
+     -not -path "*/error-prone-experimental/*" \
+     -not -path "*/error-prone-guidelines/*" \
+     -print0 \
     | xargs -0 "${grep_command}" -hoP '[^.]+$' \
     | "${sed_command}" -r 's,(.*),-Xep:\1:WARN,' \
-    | "${grep_command}" -v ErrorProneRuntimeClasspath \
     | paste -s -d ' ' -
 )"