#6814 Task to bump common lang version from 2.x to 3.20.x

Author: Piyush Asopa

assemblies/static/src/main/resources/LICENSE

@@ -658,9 +658,6 @@ This product bundles commons-exec 1.5.0, which is available under a
 This product bundles commons-io 2.21.0, which is available under a
 "Apache 2.0" license. For details, see LICENSE.
 
-This product bundles commons-lang 2.6, which is available under a
-"Apache 2.0" license. For details, see LICENSE.
-
 This product bundles commons-lang3 3.20.0, which is available under a
 "Apache 2.0" license. For details, see LICENSE.
 

core/pom.xml

@@ -84,16 +84,6 @@
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
@@ -118,6 +108,14 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-vfs2</artifactId>

core/src/main/java/org/apache/hop/core/Condition.java

@@ -32,7 +32,7 @@
 import java.util.regex.Pattern;
 import lombok.Getter;
 import lombok.Setter;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.hop.core.exception.HopException;
 import org.apache.hop.core.exception.HopPluginException;
 import org.apache.hop.core.exception.HopValueException;

core/src/main/java/org/apache/hop/core/Const.java

@@ -49,11 +49,11 @@
 import java.util.TimeZone;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.exception.ExceptionUtils;
-import org.apache.commons.lang.text.StrBuilder;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.apache.commons.lang3.text.StrBuilder;
 import org.apache.hop.core.exception.HopException;
 import org.apache.hop.core.row.IValueMeta;
 import org.apache.hop.core.util.EnvUtil;
@@ -2732,7 +2732,7 @@ public static String escapeHtml(String content) {
     if (Utils.isEmpty(content)) {
       return content;
     }
-    return StringEscapeUtils.escapeHtml(content);
+    return StringEscapeUtils.escapeHtml4(content);
   }
 
   /**
@@ -2745,7 +2745,7 @@ public static String unEscapeHtml(String content) {
     if (Utils.isEmpty(content)) {
       return content;
     }
-    return StringEscapeUtils.unescapeHtml(content);
+    return StringEscapeUtils.unescapeHtml4(content);
   }
 
   /**
@@ -2771,7 +2771,7 @@ public static String escapeSql(String content) {
     if (Utils.isEmpty(content)) {
       return content;
     }
-    return StringEscapeUtils.escapeSql(content);
+    return content.replace("'", "''");
   }
 
   /**
@@ -2968,7 +2968,7 @@ public static String escapeXml(String content) {
     if (Utils.isEmpty(content)) {
       return content;
     }
-    return StringEscapeUtils.escapeXml(content);
+    return StringEscapeUtils.escapeXml10(content);
   }
 
   /**

core/src/main/java/org/apache/hop/core/Props.java

@@ -19,7 +19,7 @@
 
 import java.util.Iterator;
 import java.util.Map;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.hop.core.config.HopConfig;
 import org.apache.hop.core.exception.HopException;
 import org.apache.hop.core.logging.ILogChannel;

core/src/main/java/org/apache/hop/core/database/Database.java

@@ -45,7 +45,7 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.vfs2.FileObject;
 import org.apache.hop.core.Const;
 import org.apache.hop.core.Counter;

core/src/main/java/org/apache/hop/core/database/DatabaseMeta.java

@@ -28,7 +28,7 @@
 import java.util.Properties;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.hop.core.Const;
 import org.apache.hop.core.RowMetaAndData;
 import org.apache.hop.core.exception.HopDatabaseException;

core/src/main/java/org/apache/hop/core/database/DatabasePluginType.java

@@ -18,7 +18,7 @@
 package org.apache.hop.core.database;
 
 import java.util.Map;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.hop.core.Const;
 import org.apache.hop.core.plugins.BasePluginType;
 

core/src/main/java/org/apache/hop/core/database/SqlScriptParser.java

@@ -20,7 +20,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * This class represents a splitter of SQL script into separate statements. It respects the notion

core/src/main/java/org/apache/hop/core/fileinput/NonAccessibleFileObject.java

@@ -21,7 +21,7 @@
 import java.net.URL;
 import java.util.Iterator;
 import java.util.List;
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.vfs2.FileContent;
 import org.apache.commons.vfs2.FileName;
 import org.apache.commons.vfs2.FileObject;