From 1ff6c1f6e3ccb02418920f1e0d847ce27bcc3394 Mon Sep 17 00:00:00 2001
From: Martin Wiesner <martin.wiesner@hs-heilbronn.de>
Date: Sun, 29 Oct 2023 20:53:20 +0100
Subject: [PATCH] #247 Update dependency commons-lang to version 3.x - gets rid
 of the old commons-lang 2.x dependency - updates / manages commons-lang3 to
 version 3.13.0

---
 dkpro-jwpl-deps/dkpro-jwpl-swc-engine-shade/pom.xml         | 1 -
 dkpro-jwpl-revisionmachine/pom.xml                          | 4 ----
 .../java/org/dkpro/jwpl/revisionmachine/api/Revision.java   | 4 ++--
 dkpro-jwpl-util/pom.xml                                     | 4 ++--
 .../main/java/org/dkpro/jwpl/util/templates/TextPair.java   | 2 +-
 pom.xml                                                     | 6 ++++++
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/dkpro-jwpl-deps/dkpro-jwpl-swc-engine-shade/pom.xml b/dkpro-jwpl-deps/dkpro-jwpl-swc-engine-shade/pom.xml
index 56120211..682a09a7 100644
--- a/dkpro-jwpl-deps/dkpro-jwpl-swc-engine-shade/pom.xml
+++ b/dkpro-jwpl-deps/dkpro-jwpl-swc-engine-shade/pom.xml
@@ -55,7 +55,6 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.4</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
diff --git a/dkpro-jwpl-revisionmachine/pom.xml b/dkpro-jwpl-revisionmachine/pom.xml
index eabf2024..29e35951 100644
--- a/dkpro-jwpl-revisionmachine/pom.xml
+++ b/dkpro-jwpl-revisionmachine/pom.xml
@@ -39,10 +39,6 @@
 		<groupId>org.apache.commons</groupId>
 		<artifactId>commons-compress</artifactId>
 	</dependency>
-  	<dependency>
-  		<groupId>commons-lang</groupId>
-  		<artifactId>commons-lang</artifactId>
-  	</dependency>
 	  <dependency>
 		  <groupId>org.slf4j</groupId>
 		  <artifactId>slf4j-api</artifactId>
diff --git a/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/api/Revision.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/api/Revision.java
index 8082c9a2..59b591d6 100644
--- a/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/api/Revision.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/api/Revision.java
@@ -23,7 +23,7 @@
 import java.sql.Timestamp;
 import java.util.Collection;
 
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
 
 import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.ISizeable;
 import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.content.DiffPart;
@@ -229,7 +229,7 @@ public String getRevisionText()
 		if (this.revisionText == null) {
 			revisionApi.setRevisionTextAndParts(this);
 		}
-		return StringEscapeUtils.unescapeHtml(this.revisionText);
+		return StringEscapeUtils.unescapeHtml4(this.revisionText);
 	}
 
 	/**
diff --git a/dkpro-jwpl-util/pom.xml b/dkpro-jwpl-util/pom.xml
index 7c387616..0d8e6e77 100644
--- a/dkpro-jwpl-util/pom.xml
+++ b/dkpro-jwpl-util/pom.xml
@@ -68,8 +68,8 @@
 			<artifactId>ptk-common</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>commons-lang</groupId>
-			<artifactId>commons-lang</artifactId>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.sweble.wikitext</groupId>
diff --git a/dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/TextPair.java b/dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/TextPair.java
index 991fbf92..8b98a544 100644
--- a/dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/TextPair.java
+++ b/dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/TextPair.java
@@ -24,7 +24,7 @@
 import java.util.Locale;
 import java.util.Map;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import difflib.Delta;
 import difflib.Delta.TYPE;
diff --git a/pom.xml b/pom.xml
index 6f8aa912..118ed910 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,7 @@
     <org.sweble.wikitext.version>3.1.9</org.sweble.wikitext.version>
 
     <spring.version>5.3.30</spring.version>
+    <commons.lang3.version>3.13.0</commons.lang3.version>
 
     <!-- DB specific dependency versions -->
     <hibernate.version>6.1.7.Final</hibernate.version>
@@ -171,6 +172,11 @@
         <artifactId>commons-compress</artifactId>
         <version>1.24.0</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-lang3</artifactId>
+        <version>${commons.lang3.version}</version>
+      </dependency>
       <dependency>
         <groupId>commons-logging</groupId>
         <artifactId>commons-logging</artifactId>