From 6acb03bdd0f2bc29de31ce779547414a1e264d97 Mon Sep 17 00:00:00 2001
From: XenoAmess <xenoamess@gmail.com>
Date: Fri, 15 Apr 2022 03:30:58 +0800
Subject: [PATCH 1/3] version to 2.1.1.4x-SNAPSHOT;Fix idea 2022.1 Ultimate
 compatibility issue

---
 idea-plugin/README.md                                       | 2 +-
 idea-plugin/gradle.properties                               | 4 ++--
 idea-plugin/p3c-common/build.gradle                         | 5 ++++-
 idea-plugin/p3c-idea/src/main/resources/META-INF/plugin.xml | 3 +++
 p3c-pmd/README.md                                           | 2 +-
 p3c-pmd/pom.xml                                             | 2 +-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/idea-plugin/README.md b/idea-plugin/README.md
index eadf0df9f..7f3553569 100644
--- a/idea-plugin/README.md
+++ b/idea-plugin/README.md
@@ -21,7 +21,7 @@ cd p3c-idea
 
 ## <font color="green">Use p3c-common as your plugin dependency</font>
 ```groovy
-compile 'com.xenoamess.p3c.idea:p3c-common:2.1.1.3x'
+compile 'com.xenoamess.p3c.idea:p3c-common:2.1.1.4x-SNAPSHOT'
 ```
 ## [中文使用手册](README_cn.md)
 ## <font color="green">Install</font>
diff --git a/idea-plugin/gradle.properties b/idea-plugin/gradle.properties
index f154a19da..1daa4e96c 100644
--- a/idea-plugin/gradle.properties
+++ b/idea-plugin/gradle.properties
@@ -2,10 +2,10 @@
 # See https://www.jetbrains.org/intellij/sdk/docs/reference_guide/intellij_artifacts.html
 # See https://www.jetbrains.com/intellij-repository/releases/
 # See https://www.jetbrains.com/intellij-repository/snapshots/
-idea_version=201.7223.91
+idea_version=2022.1
 #idea_version=211-EAP-SNAPSHOT
 #idea_version=181.5540.23
 #idea_version=145.258.11
 plugin_name=Alibaba Java Coding Guidelines
 systemProp.file.encoding=UTF-8
-plugin_version=2.1.1.3x
+plugin_version=2.1.1.4x-SNAPSHOT
diff --git a/idea-plugin/p3c-common/build.gradle b/idea-plugin/p3c-common/build.gradle
index a90726a74..5aec84fad 100644
--- a/idea-plugin/p3c-common/build.gradle
+++ b/idea-plugin/p3c-common/build.gradle
@@ -60,7 +60,10 @@ ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
 
 dependencies {
     implementation group: 'org.freemarker', name: 'freemarker', version: '2.3.31'
-    implementation "com.xenoamess.p3c:p3c-pmd:$plugin_version"
+    implementation("com.xenoamess.p3c:p3c-pmd:$plugin_version") {
+        exclude group: 'org.apache.logging.log4j'
+        exclude group: 'org.slf4j'
+    }
     implementation group: 'org.javassist', name: 'javassist', version: '3.28.0-GA'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$project.kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$project.kotlin_version"
diff --git a/idea-plugin/p3c-idea/src/main/resources/META-INF/plugin.xml b/idea-plugin/p3c-idea/src/main/resources/META-INF/plugin.xml
index 06abc9e79..0af98bbb6 100644
--- a/idea-plugin/p3c-idea/src/main/resources/META-INF/plugin.xml
+++ b/idea-plugin/p3c-idea/src/main/resources/META-INF/plugin.xml
@@ -29,6 +29,9 @@
     ]]></description>
 
     <change-notes><![CDATA[
+        <ul>2.1.1.4x-SNAPSHOT
+            <li>Fix idea 2022.1 Ultimate compatibility issue</li>
+        </ul>
         <ul>2.1.1.3x
             <li>pmd upgrade to 6.44.0</li>
             <li>fix bugs of SneakyThrowsWithoutExceptionTypeRule</li>
diff --git a/p3c-pmd/README.md b/p3c-pmd/README.md
index 047e2c96b..931446e81 100644
--- a/p3c-pmd/README.md
+++ b/p3c-pmd/README.md
@@ -11,7 +11,7 @@
 <dependency>
     <groupId>com.xenoamess.p3c</groupId>
     <artifactId>p3c-pmd</artifactId>
-    <version>2.1.1.3x</version>
+    <version>2.1.1.4x-SNAPSHOT</version>
 </dependency>
 ```
 ### <font color="green">Gradle</font>
diff --git a/p3c-pmd/pom.xml b/p3c-pmd/pom.xml
index 19438be5e..30664c46c 100644
--- a/p3c-pmd/pom.xml
+++ b/p3c-pmd/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.xenoamess.p3c</groupId>
     <artifactId>p3c-pmd</artifactId>
-    <version>2.1.1.3x</version>
+    <version>2.1.1.4x-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>p3c-pmd</name>
     <properties>

From 4f086ec0b8b023c670d755750f2ad5505fc808f9 Mon Sep 17 00:00:00 2001
From: XenoAmess <xenoamess@gmail.com>
Date: Fri, 15 Apr 2022 03:38:48 +0800
Subject: [PATCH 2/3] fix `java.lang.ArrayIndexOutOfBoundsException: Index 0
 out of bounds for length 0` in idea 2022.1

---
 .../standalone/AliMissingOverrideAnnotationInspection.kt  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/idea-plugin/p3c-common/src/main/kotlin/com/alibaba/p3c/idea/inspection/standalone/AliMissingOverrideAnnotationInspection.kt b/idea-plugin/p3c-common/src/main/kotlin/com/alibaba/p3c/idea/inspection/standalone/AliMissingOverrideAnnotationInspection.kt
index 8062a87df..57c917b94 100644
--- a/idea-plugin/p3c-common/src/main/kotlin/com/alibaba/p3c/idea/inspection/standalone/AliMissingOverrideAnnotationInspection.kt
+++ b/idea-plugin/p3c-common/src/main/kotlin/com/alibaba/p3c/idea/inspection/standalone/AliMissingOverrideAnnotationInspection.kt
@@ -29,6 +29,7 @@ import com.intellij.psi.PsiMethod
 import com.intellij.psi.PsiModifier
 import com.intellij.psi.PsiModifierListOwner
 import com.intellij.psi.util.InheritanceUtil
+import com.jetbrains.rd.util.catch
 import com.siyeh.ig.BaseInspectionVisitor
 import com.siyeh.ig.InspectionGadgetsFix
 import com.siyeh.ig.inheritance.MissingOverrideAnnotationInspection
@@ -66,7 +67,12 @@ class AliMissingOverrideAnnotationInspection : MissingOverrideAnnotationInspecti
     override fun createOptionsPanel(): JComponent? = null
 
     override fun buildFix(vararg infos: Any): InspectionGadgetsFix? {
-        val fix = super.buildFix(*infos) ?: return null
+        val fix : InspectionGadgetsFix
+        try {
+            fix = super.buildFix(*infos) ?: return null
+        } catch (e: Exception){
+            return null;
+        }
         return DecorateInspectionGadgetsFix(
                 fix,
                 P3cBundle.getMessage("com.alibaba.p3c.idea.quickfix.standalone.AliMissingOverrideAnnotationInspection")

From 9d0351c236f68b60a2d2d9e2156dfac5dfab7490 Mon Sep 17 00:00:00 2001
From: XenoAmess <xenoamess@gmail.com>
Date: Fri, 15 Apr 2022 03:42:28 +0800
Subject: [PATCH 3/3] version to 2.1.1.4x

---
 idea-plugin/README.md                                       | 2 +-
 idea-plugin/gradle.properties                               | 2 +-
 idea-plugin/p3c-idea/src/main/resources/META-INF/plugin.xml | 2 +-
 p3c-pmd/README.md                                           | 2 +-
 p3c-pmd/pom.xml                                             | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/idea-plugin/README.md b/idea-plugin/README.md
index 7f3553569..fdc8ca2ec 100644
--- a/idea-plugin/README.md
+++ b/idea-plugin/README.md
@@ -21,7 +21,7 @@ cd p3c-idea
 
 ## <font color="green">Use p3c-common as your plugin dependency</font>
 ```groovy
-compile 'com.xenoamess.p3c.idea:p3c-common:2.1.1.4x-SNAPSHOT'
+compile 'com.xenoamess.p3c.idea:p3c-common:2.1.1.4x'
 ```
 ## [中文使用手册](README_cn.md)
 ## <font color="green">Install</font>
diff --git a/idea-plugin/gradle.properties b/idea-plugin/gradle.properties
index 1daa4e96c..7c2b32014 100644
--- a/idea-plugin/gradle.properties
+++ b/idea-plugin/gradle.properties
@@ -8,4 +8,4 @@ idea_version=2022.1
 #idea_version=145.258.11
 plugin_name=Alibaba Java Coding Guidelines
 systemProp.file.encoding=UTF-8
-plugin_version=2.1.1.4x-SNAPSHOT
+plugin_version=2.1.1.4x
diff --git a/idea-plugin/p3c-idea/src/main/resources/META-INF/plugin.xml b/idea-plugin/p3c-idea/src/main/resources/META-INF/plugin.xml
index 0af98bbb6..5c54b7e20 100644
--- a/idea-plugin/p3c-idea/src/main/resources/META-INF/plugin.xml
+++ b/idea-plugin/p3c-idea/src/main/resources/META-INF/plugin.xml
@@ -29,7 +29,7 @@
     ]]></description>
 
     <change-notes><![CDATA[
-        <ul>2.1.1.4x-SNAPSHOT
+        <ul>2.1.1.4x
             <li>Fix idea 2022.1 Ultimate compatibility issue</li>
         </ul>
         <ul>2.1.1.3x
diff --git a/p3c-pmd/README.md b/p3c-pmd/README.md
index 931446e81..d8e327abb 100644
--- a/p3c-pmd/README.md
+++ b/p3c-pmd/README.md
@@ -11,7 +11,7 @@
 <dependency>
     <groupId>com.xenoamess.p3c</groupId>
     <artifactId>p3c-pmd</artifactId>
-    <version>2.1.1.4x-SNAPSHOT</version>
+    <version>2.1.1.4x</version>
 </dependency>
 ```
 ### <font color="green">Gradle</font>
diff --git a/p3c-pmd/pom.xml b/p3c-pmd/pom.xml
index 30664c46c..d15de313c 100644
--- a/p3c-pmd/pom.xml
+++ b/p3c-pmd/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.xenoamess.p3c</groupId>
     <artifactId>p3c-pmd</artifactId>
-    <version>2.1.1.4x-SNAPSHOT</version>
+    <version>2.1.1.4x</version>
     <packaging>jar</packaging>
     <name>p3c-pmd</name>
     <properties>