Merge pull request #168 from duemir/167-2023.3-compatiblity

Usages of Apache commons-lang2 are removed for IntelliJ compatibility reasons
jenkinsci · Oct 24, 2023 · 1f0f52a · 1f0f52a
2 parents d09b92b + b0696dd
commit 1f0f52a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -28,6 +28,7 @@ dependencies {
         exclude group: "commons-logging", module: "commons-logging"
     }
     implementation 'net.java.dev.textile-j:textile-j:2.2.864'
+    implementation 'org.apache.commons:commons-text:1.10.0'
 
     testImplementation 'junit:junit:4.13.2'
 }

diff --git a/src/main/java/org/kohsuke/stapler/idea/GotoViewAction.java b/src/main/java/org/kohsuke/stapler/idea/GotoViewAction.java
@@ -22,7 +22,7 @@
 import com.intellij.psi.PsiPackage;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiUtilBase;
-import org.apache.commons.lang.ArrayUtils;
+import com.intellij.util.ArrayUtil;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -145,7 +145,7 @@ public void saveInitialCheckBoxState(boolean state) {
             @Override
             @NotNull
             public String @NotNull [] getSeparators() {
-                return ArrayUtils.EMPTY_STRING_ARRAY;
+                return ArrayUtil.EMPTY_STRING_ARRAY;
             }
 
             @Override

diff --git a/src/main/java/org/kohsuke/stapler/idea/JellyTagLibReferenceProvider.java b/src/main/java/org/kohsuke/stapler/idea/JellyTagLibReferenceProvider.java
@@ -17,8 +17,8 @@
 import com.intellij.psi.xml.XmlAttribute;
 import com.intellij.psi.xml.XmlAttributeValue;
 import com.intellij.psi.xml.XmlTag;
+import com.intellij.util.ArrayUtil;
 import com.intellij.util.ProcessingContext;
-import org.apache.commons.lang.ArrayUtils;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -141,7 +141,7 @@ public PsiFile resolve() {
                 @Override
                 @NotNull
                 public Object @NotNull [] getVariants() {
-                    return ArrayUtils.EMPTY_OBJECT_ARRAY;
+                    return ArrayUtil.EMPTY_OBJECT_ARRAY;
                 }
             });
         }

diff --git a/src/main/java/org/kohsuke/stapler/idea/JexlInspection.java b/src/main/java/org/kohsuke/stapler/idea/JexlInspection.java
@@ -1,7 +1,5 @@
 package org.kohsuke.stapler.idea;
 
-import java.util.Arrays;
-
 import com.intellij.codeInspection.InspectionManager;
 import com.intellij.codeInspection.LocalQuickFix;
 import com.intellij.codeInspection.ProblemDescriptor;
@@ -13,9 +11,11 @@
 import com.intellij.psi.xml.XmlText;
 import org.apache.commons.jexl.ExpressionFactory;
 import org.apache.commons.jexl.parser.ParseException;
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
 import org.kohsuke.stapler.idea.psi.JellyFile;
 
+import java.util.Arrays;
+
 
 /**
  * @author Kohsuke Kawaguchi
@@ -265,7 +265,7 @@ private ProblemDescriptor parseJexl(InspectionManager manager, XmlElement psi, T
                 // OK
                 return null;
             } else {
-                ExpressionFactory.createExpression(StringEscapeUtils.unescapeHtml(expr));
+                ExpressionFactory.createExpression(StringEscapeUtils.unescapeHtml4(expr));
                 return null;
             }
         } catch (ParseException e) {