From ede47e834b073cf189c673abbc5e61ed312a1c02 Mon Sep 17 00:00:00 2001
From: Jeremy Wood <jeremy.wood@7factor.io>
Date: Mon, 11 Sep 2023 22:17:47 -0400
Subject: [PATCH] Fix import order check.

---
 config/mv_checks.xml | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/config/mv_checks.xml b/config/mv_checks.xml
index 966d1e49..94c3c715 100644
--- a/config/mv_checks.xml
+++ b/config/mv_checks.xml
@@ -222,17 +222,21 @@
 
         <!-- Imports -->
         <module name="AvoidStarImport"/>
-        <module name="CustomImportOrder">
-            <property name="sortImportsInGroupAlphabetically" value="true"/>
-            <property name="separateLineBetweenGroups" value="true"/>
-            <property name="customImportOrderRules"
-                      value="STANDARD_JAVA_PACKAGE###THIRD_PARTY_PACKAGE###STATIC"/>
-            <property name="tokens" value="IMPORT, STATIC_IMPORT, PACKAGE_DEF"/>
-        </module>
         <module name="IllegalImport">
             <property name="illegalPkgs" value="sun"/>
         </module>
-        <!--        <module name="ImportOrder"/>-->
+        <module name="ImportOrder">
+            <property name="option" value="bottom"/>
+            <property name="ordered" value="true"/>
+            <property name="separated" value="true"/>
+            <property name="separatedStaticGroups" value="true"/>
+            <property name="caseSensitive" value="true"/>
+            <property name="sortStaticImportsAlphabetically" value="true"/>
+            <property name="groups"
+                      value="java,javax,*,org.mvplugins"/>
+            <property name="staticGroups"
+                      value="/^.*$/"/>
+        </module>
         <module name="RedundantImport"/>
         <module name="UnusedImports"/>