From 6b962ef4ff1e0061a46491a5cfde490435b24b63 Mon Sep 17 00:00:00 2001
From: Mark Vieira <portugee@gmail.com>
Date: Mon, 22 Aug 2022 10:00:57 -0700
Subject: [PATCH] Update checkstyle config for newest plugin version (#88919)

---
 .../src/main/resources/checkstyle-idea.xml    | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/build-tools-internal/src/main/resources/checkstyle-idea.xml b/build-tools-internal/src/main/resources/checkstyle-idea.xml
index c164c578a73a9..607116560cd80 100644
--- a/build-tools-internal/src/main/resources/checkstyle-idea.xml
+++ b/build-tools-internal/src/main/resources/checkstyle-idea.xml
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="CheckStyle-IDEA">
-    <option name="configuration">
-      <map>
-        <entry key="active-configuration" value="PROJECT_RELATIVE:$PROJECT_DIR$/checkstyle_ide.xml:Elasticsearch" />
-        <entry key="checkstyle-version" value="10.3" />
-        <entry key="copy-libs" value="false" />
-        <entry key="location-0" value="BUNDLED:(bundled):Sun Checks" />
-        <entry key="location-1" value="BUNDLED:(bundled):Google Checks" />
-        <entry key="location-2" value="PROJECT_RELATIVE:$PROJECT_DIR$/checkstyle_ide.xml:Elasticsearch" />
-        <entry key="scan-before-checkin" value="false" />
-        <entry key="scanscope" value="JavaOnlyWithTests" />
-        <entry key="suppress-errors" value="false" />
-        <entry key="thirdparty-classpath" value="$PROJECT_DIR$/build-conventions/build/libs/build-conventions.jar" />
-      </map>
-    </option>
-  </component>
+    <component name="CheckStyle-IDEA" serialisationVersion="2">
+        <checkstyleVersion>10.3.1</checkstyleVersion>
+        <scanScope>JavaOnlyWithTests</scanScope>
+        <option name="thirdPartyClasspath">
+            <option value="$PROJECT_DIR$/build-conventions/build/libs/build-conventions.jar" />
+        </option>
+        <option name="activeLocationIds">
+            <option value="dfb90780-ced3-4152-a4df-3cc9be08e3d8" />
+        </option>
+        <option name="locations">
+            <list>
+                <ConfigurationLocation id="bundled-sun-checks" type="BUNDLED" scope="All" description="Sun Checks">(bundled)</ConfigurationLocation>
+                <ConfigurationLocation id="bundled-google-checks" type="BUNDLED" scope="All" description="Google Checks">(bundled)</ConfigurationLocation>
+                <ConfigurationLocation id="dfb90780-ced3-4152-a4df-3cc9be08e3d8" type="PROJECT_RELATIVE" scope="All" description="Elasticsearch">$PROJECT_DIR$/checkstyle_ide.xml</ConfigurationLocation>
+            </list>
+        </option>
+    </component>
 </project>